diff --git a/.gitattributes b/.gitattributes
index 176a458f9..a461a3e3f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,10 @@
 * text=auto
+/.github/ export-ignore
+/build/ export-ignore
+/tests/ export-ignore
+/travis/ export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/CHANGELOG.md export-ignore
+/phpunit.xml.dist export-ignore
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 000000000..dc4ccd96e
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: terrafrost
+patreon: phpseclib
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: "packagist/phpseclib/phpseclib"
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000000000..cae81f4ee
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,95 @@
+name: CI
+on: [push, pull_request]
+
+permissions:
+  contents: read #  to fetch code (actions/checkout)
+
+jobs:
+    lint:
+        name: Lint
+        timeout-minutes: 5
+        runs-on: ubuntu-latest
+        steps:
+            -   name: Checkout
+                uses: actions/checkout@v3
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: ${{ matrix.php-version }}
+                env:
+                    update: true
+            -   name: Composer Install
+                run: composer install --classmap-authoritative --no-interaction --no-cache
+            -   name: Lint
+                run: vendor/bin/parallel-lint --show-deprecated build phpseclib tests
+        strategy:
+            fail-fast: false
+            matrix:
+                php-version: ['8.1', '8.2', '8.3', '8.4']
+    quality_tools:
+        name: Quality Tools
+        timeout-minutes: 5
+        runs-on: ubuntu-latest
+        steps:
+            -   name: Checkout
+                uses: actions/checkout@v3
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: '8.1'
+                env:
+                    update: true
+            -   name: Composer Install
+                run: composer install --classmap-authoritative --no-interaction --no-cache
+            -   name: PHP_CodeSniffer
+                run: vendor/bin/phpcs --standard=build/php_codesniffer.xml
+            -   name: PHP CS Fixer
+                run: vendor/bin/php-cs-fixer fix --config=build/php-cs-fixer.php --diff --dry-run --using-cache=no
+            -   name: Psalm
+                run: vendor/bin/psalm --config=build/psalm.xml --no-cache --long-progress --report-show-info=false
+        strategy:
+            fail-fast: false
+    tests:
+        name: Tests
+        timeout-minutes: 10
+        runs-on: ${{ matrix.os }}
+        steps:
+            -   name: Checkout
+                uses: actions/checkout@v3
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: ${{ matrix.php-version }}
+                env:
+                    update: true
+            -   name: Composer Install
+                run: composer install --classmap-authoritative --no-interaction --no-cache --ignore-platform-req=php
+            -   name: Setup Secure Shell Functional Tests
+                if: matrix.os == 'ubuntu-latest'
+                run: |
+                    PHPSECLIB_SSH_USERNAME='phpseclib'
+                    PHPSECLIB_SSH_PASSWORD='EePoov8po1aethu2kied1ne0'
+                    
+                    sudo useradd --create-home --base-dir /home "$PHPSECLIB_SSH_USERNAME"
+                    echo "$PHPSECLIB_SSH_USERNAME:$PHPSECLIB_SSH_PASSWORD" | sudo chpasswd
+                    ssh-keygen -t rsa -b 1024 -f "$HOME/.ssh/id_rsa" -q -N ""
+                    eval `ssh-agent -s`
+                    ssh-add "$HOME/.ssh/id_rsa"
+                    sudo mkdir -p "/home/$PHPSECLIB_SSH_USERNAME/.ssh/"
+                    sudo cp "$HOME/.ssh/id_rsa.pub" "/home/$PHPSECLIB_SSH_USERNAME/.ssh/authorized_keys"
+                    sudo ssh-keyscan -t rsa localhost > "/tmp/known_hosts"
+                    sudo cp "/tmp/known_hosts" "/home/$PHPSECLIB_SSH_USERNAME/.ssh/known_hosts"
+                    sudo chown "$PHPSECLIB_SSH_USERNAME:$PHPSECLIB_SSH_USERNAME" "/home/$PHPSECLIB_SSH_USERNAME/.ssh/" -R
+                    
+                    echo "PHPSECLIB_SSH_HOSTNAME=localhost" >> $GITHUB_ENV
+                    echo "PHPSECLIB_SSH_USERNAME=$PHPSECLIB_SSH_USERNAME" >> $GITHUB_ENV
+                    echo "PHPSECLIB_SSH_PASSWORD=$PHPSECLIB_SSH_PASSWORD" >> $GITHUB_ENV
+                    echo "PHPSECLIB_SSH_HOME=/home/phpseclib" >> $GITHUB_ENV
+                    echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK" >> $GITHUB_ENV
+            -   name: PHPUnit
+                run: vendor/bin/paratest --verbose --configuration=tests/phpunit.xml --runner=WrapperRunner
+        strategy:
+            fail-fast: false
+            matrix:
+                os: [ubuntu-latest, windows-latest, macos-latest]
+                php-version: ['8.1', '8.2', '8.3', '8.4']
diff --git a/.gitignore b/.gitignore
index 1469fe601..59556f6b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,7 @@
-/vendor
+/.idea/
+/build/php-cs-fixer.cache
+/composer.lock
 /composer.phar
+/tests/.phpunit.result.cache
+/vendor/
+.gitignore
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 9ae12b4a9..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-language: php
-
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5.9
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-
-env:
-  global:
-    # Defines CODE_COVERAGE_PASSPHRASE which is the passphrase for unlocking
-    # the travis/code_coverage_id_rsa RSA private key.
-    - secure: "jtQTZKQBnzUlp/jz7NlM6470ZDnLGVAs53sgvIm4tcYqf9TWSXSXjIYvFsrS\nKPR2eyZaAevYysUkIGRFTUXTlG6tC36YngMp9+6FPxASl8mnGXsTbKcm613B\n59vD3242pgIgqhhmgFQ0c8gbvnE8PuF2aS4/hluP3r+AxhWN56E="
-
-before_install: true
-
-install:
-  - wget http://ftp.gnu.org/gnu/parallel/parallel-20120522.tar.bz2
-  - tar -xvjf parallel*
-  - cd parallel*
-  - ./configure
-  - make
-  - sudo make install
-  - cd ..
-  - eval `ssh-agent -s`
-  - travis/setup-secure-shell.sh
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' -a '$TRAVIS_PHP_VERSION' != '7.0' ]; then travis/install-php-extensions.sh; fi"
-  - travis/setup-composer.sh
-
-script:
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' ]; then vendor/bin/phing -f build/build.xml sniff; fi"
-  - travis/run-phpunit.sh
-
-after_success:
-  - sh -c "if $TRAVIS_SECURE_ENV_VARS; then travis/upload-code-coverage-html.sh; fi"
diff --git a/AUTHORS b/AUTHORS
index a08b3099c..88378c15d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,3 +4,4 @@ phpseclib Developers:      monnerat (Patrick Monnerat)
                            bantu (Andreas Fischer)
                            petrich (Hans-Jürgen Petrich)
                            GrahamCampbell (Graham Campbell)
+                           jack-worman (Jack Worman)
diff --git a/BACKERS.md b/BACKERS.md
new file mode 100644
index 000000000..cafcf60a2
--- /dev/null
+++ b/BACKERS.md
@@ -0,0 +1,19 @@
+# Backers
+
+phpseclib ongoing development is made possible by [Tidelift](https://tidelift.com/subscription/pkg/packagist-phpseclib-phpseclib?utm_source=packagist-phpseclib-phpseclib&utm_medium=referral&utm_campaign=readme) and by contributions by users like you. Thank you.
+
+## Backers
+
+- Allan Simon
+- [ChargeOver](https://chargeover.com/)
+- Raghu Veer Dendukuri
+- Zane Hooper
+- [Setasign](https://www.setasign.com/)
+- [Charles Severance](https://github.com/csev)
+- [Rachel Fish](https://github.com/itsrachelfish)
+- Tharyrok
+- [cjhaas](https://github.com/cjhaas)
+- [istiak-tridip](https://github.com/istiak-tridip)
+- [Anna Filina](https://github.com/afilina)
+- [blakemckeeby](https://github.com/blakemckeeby)
+- [ssddanbrown](https://github.com/ssddanbrown)
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0b03dc7c..eea5b5391 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,970 @@
 # Changelog
 
+## 3.0.43 - 2024-12-14
+
+- fix PHP 8.4 deprecations
+- BigInteger: workaround for regression in GMP that PHP introduced
+- BigInteger: speed up Barrett reductions
+- X509: make the attributes section of new CSRs be blank (#1522)
+- X509: add getRequestedCertificateExtensions()
+- X509: algorithmidentifier parameters could get incorrectly set (#2051)
+- SSH2: ignore kex-strict-s-v00@openssh.com in key re-exchanges (#2050)
+- SSH2: make it so phpseclib initiates key re-exchange after 1GB (#2050)
+- SSH2: if string is passed to setPreferredAlgorithms treat as array
+- SSH2: update setPreferredAlgorithms() to accept csv's
+
+## 3.0.42 - 2024-09-15
+
+- X509: CRL version number wasn't correctly being saved (#2037)
+- Hash: significantly speed up umac algorithms
+- SSH2: fix possible infinite loop on packet timeout (#2031)
+- SSH2: logging enhancements
+- SSH2: identification strings > 255 bytes didnt get parsed correctly
+- SSH2: if string is passed to setPreferredAlgorithms() treat it as array
+- SSH2: update error message for people not connecting to SSH servers
+- SFTP: add getSupportedExtensions(), statvfs() and posix_rename() methods (#2024)
+
+## 3.0.41 - 2024-08-11
+
+- SFTP: fix deprecation warning (#2027)
+
+## 3.0.40 - 2024-08-11
+
+- SSH2: fix for setTimeout(0) (#2023)
+- SSH2: fix possible infinite loop on packet timeout
+- SSH2/Agent: make it so identities include key comments (#2022)
+- SSH2/Agent: add findIdentityByPublicKey() (#2022)
+- EC: fix for IEEE signatures (#2019)
+- BigInteger/BCMath: bitwise_or() was doing XOR (#2025)
+
+## 3.0.39 - 2024-06-24
+
+- SSH2: fix when keep alive packets are sent (#2009)
+- SSH2: fix for undefined variable when logging is enabled (#2010 / #2011)
+
+## 3.0.38 - 2024-06-17
+
+- BigInteger: EvalBarrett / Barrett could sometimes slow to a crawl (#1994)
+- SSH2: fix bug that prevented RC4 and ChaCha20 from ever being used
+- SSH2: SSH_MSG_EXT_INFO didn't work during key re-exchange (#2001, #2002)
+- SSH2: improvements to timeout handling (#2006)
+- System/SSH/Agent: reset supported_private_key_algorithms for every key (#1995)
+- Composer: use paragonie/constant_time_encoding (#1998)
+- Crypt/EC/Formats/PKCS8: fix Ed448 keys (#2003)
+
+## 3.0.37 - 2024-03-02
+
+- SSH2: don't set stream timeout if timeout is 0 (#1986)
+
+## 3.0.36 - 2024-02-25
+
+- BigInteger: put guardrails on isPrime() and randomPrime() (CVE-2024-27354)
+- ASN1: limit OID length (CVE-2024-27355)
+- EC: when using openssl to do signing use unencrypted key (#1979)
+- SSH2: add different options to isConnected() (#1983)
+
+## 3.0.35 - 2023-12-18
+
+- SSH2: implement terrapin attack countermeasures (#1972)
+- SSH2: only capture login info once (#1970)
+- Crypt/AsymmetricKey: loading hidden custom key plugins didn't work (#1971)
+
+## 3.0.34 - 2023-11-27
+
+- SSH2: add support for RFC8308 (#1960)
+- SSH2: don't use AES GCM for TurboFTP Server (#1957)
+- SSH2: reset more internal variables when connection is reset (#1961)
+- PKCS8: PBES1 / RC2 and PBES2 / DES keys didn't work (#1958)
+- EC/Signature/Format: add new IEEE format (#1956)
+- Math/BigInteger/Engines/PHP: PHP 8.2.13+ fixes Windows JIT issue
+- Math/BinaryField: fix for excessively large degrees (CVE-2023-49316)
+- Math/PrimeField: fix occasional error with squareRoot method
+
+## 3.0.33 - 2023-10-21
+
+- SSH2: fix for PHP 7.3 (#1953)
+- Crypt: improve ARM detection code (#1949)
+- Rijndael: fix for PHP 8.3+ compatability (#1944)
+- X509: fix for weird characters in subjaltname (#1943)
+- move JIT check to BigInteger (#1942)
+
+## 3.0.23 - 2023-09-18
+
+- fix "Undefined index: jit" error on Windows (#1940)
+
+## 3.0.22 - 2023-09-15
+
+- SFTP: make it so SFTP::RESUME also sets offset of local file (#1921)
+- SFTP: RESUME_START didn't work as described (#1921)
+- SFTP: fix SFTPv2 errors when logging errors (#1933)
+- SFTP: fix issue with get() downloading to files / streams (#1934)
+- BigInteger: use GMP if available (#1928)
+- Rijndael: fix E_DEPRECATED (#1935)
+- improve PHP32 compatibility (#1931)
+
+## 3.0.21 - 2023-07-09
+
+- BigInteger: speed up powMod() method (#1919)
+- SSH2: fix stream_select(): Unable to select [4]: Interrupted system call (max_fd=29) error (#1851)
+- SSH2: add EOF test isConnected() (#1926)
+- SFTP: make it so SFTP::RESUME also sets offset of local file (#1921)
+- SFTP: SFTP::RESUME_START didn't work as described (#1921)
+
+## 3.0.20 - 2023-06-13
+
+- SSH2: better support for multiple interactive channels & expose shell functions (#1888)
+- SFTP: add optional $recursive parameter to filesize() (#1782)
+- SFTP: fix NET_SFTP_ATTR_EXTENDED (#1907)
+- ASN1: speed up decodeBER (#1894)
+- X509: add support for EV DN's (#1916)
+- X509: getChain() should always return array of X509 objects (#1914)
+- RSA: setting sig padding broke enc padding and vice versa
+
+## 3.0.19 - 2023-03-05
+
+- AsymmetricKey: error out on unsupported operations (#1879)
+- Blowfish: fix issues on 32-bit PHP installs
+- BigInteger: fix for hex numbers with new lines in them
+- SFTP: fix "Creating default object from empty value" error (#1876)
+- SSH2: add getTimeout() method (#1889)
+- PrimeField: prevent infinite loop with composite primefields (CVE-2023-27560)
+
+## 3.0.18 - 2022-12-17
+
+- fix for PHP 8.2 deprecations (#1869, #1873)
+- SSH2: if logging in with rsa-sha2-256/512 fails, try ssh-rsa (#1865)
+- SSH/Agent: add support for named pipes on windows (for pageant) (#1866)
+- Crypt/Base: add a function to check continuous buffer status (#1870)
+- OpenSSL 3.0.1+ deprecated some algorithms (RC2, RC4, DES, Blowfish)
+
+## 3.0.17 - 2022-10-24
+
+- X509: make it so CRLs, CSRs and SPKACs can support PSS keys (#1837)
+- X509: make it so PKCS1 X509 certs can create PSS sigs (#1837)
+- SFTP: fix deprecated implicit float to int on 32-bit PHP 8.1 (#1841)
+- SFTP: restore orig behavior when deleting non-existant folder (#1847)
+- Random: fix fallback on PHP 8.1+
+
+## 3.0.16 - 2022-09-05
+
+- SSH2: fix type hinting for keyboard_interactive_process (#1836)
+
+## 3.0.15 - 2022-09-02
+
+- PublicKeyLoader: add support for OpenSSH encrypted keys (#1737, #1733, #1531, #1490)
+- PublicKeyLoader: add support for JSON Web Keys (#1817)
+- SSH2: make login method return false under rare situation (#1790)
+- SSH2: fix possibly undefined variable error (#1802)
+- SFTP: fix enableDatePreservation bug w.r.t. mtime (#1670)
+- SFTP: try to delete dir even if it can't be opened (#1791)
+- SFTP: try without path canonicalization if initial realpath() fails (#1796)
+- SFTP: detect if stream metadata has wrapper_type set for put() method (#1792)
+- BigInteger: tweak to the phpinfo checks (#1726)
+- BigInteger: fix behavior on 32-bit PHP installs (#1820)
+- EC/PKCS8: OpenSSL didn't like phpseclib formed Ed25519 public keys (#1819)
+- don't use dynamic properties, which are deprecated in PHP 8.2 (#1808, #1822)
+- fix deprecated implicit float to int on 32-bit PHP 8.1
+
+## 3.0.14 - 2022-04-04
+
+- RSA: add support for loading PuTTY v3 keys
+- Crypt/Base: fix CTR mode with continuous buffer with non-eval PHP
+- Crypt/Base: use sodium_increment in _increment_str
+- Crypt/Base: fix deprecation notice (#1770)
+- SSH2/Agent: rm unused parameter (#1757)
+- BigInteger: add precision to __debugInfo
+- BigInteger: fix random engine issues
+- call useBestEngine() when getEngine() is called
+
+## 3.0.13 - 2022-01-30
+
+- SSH2: make login() return false if no valid auth methods are found (#1744)
+- SSH2: show a more helpful error message when logging in with pubkey (#1718)
+- SSH2: rsa-sha2-256 and rsa-sha2-512 sigs weren't verifying (#1743)
+- SFTP: fix chgrp() for version < 4 (#1730)
+- Crypt/Base: add OFB8 as a new mode (phpseclib/mcrypt_compat#33)
+- Crypt/Salsa20: fix PHP 5.6 error (#1717)
+- RSA & BigInteger: check phpinfo() available before using it (#1726)
+- Fixed psalm level 6 errors in phpseclib/Net/ (#1746)
+
+## 3.0.12 - 2021-11-28
+
+- SSH2: add "smart multi factor" login mode (enabled by default) (#1648)
+- SSH2: error out when no data is received from the server (#1647)
+- SFTP: don't attempt to parse unsupported attributes (#1708)
+- SFTP: getSupportedVersions() call didn't work
+- EC: error out when scalar is out of range (#1712)
+- RSA: add support for raw private keys (#1711)
+- SymmetricKey: add getMode()
+
+## 3.0.11 - 2021-10-26
+
+- SSH2: add support for zlib and zlib@openssh.com compression
+- SFTP: add support for SFTPv4/5/6
+- SFTP: add option to allow arbitrary length packets (#1691)
+- SFTP: errors weren't being logged (#1702)
+- RSA: ssh-keygen -yf private.key fails if \r is present (#1698)
+
+## 3.0.10 - 2021-08-15
+
+- SFTP: don't check SFTP packet size after SFTP initialization (#1606)
+- SFTP: timeout during SFTP init should return false (#1684)
+- SFTP: return false if get_channel_packet returns false (#1678)
+- ASN1: return false when not enough bytes are available (#1676)
+- BigInteger: Serializable is being deprecated in PHP 8.1 (#1680)
+- explicitly define methods as being static (#1689)
+- plug memory leaks (#1672)
+
+## 3.0.9 - 2021-06-13
+
+- SSH2: add getAuthMethodsToContinue() method (#1648)
+- SSH2: timeout would occasionally infinitely loop
+- SSH2: fix PHP7.4 errors about accessing bool as string (#1656)
+- SSH2: fix issue with key re-exchange (#1644)
+- SFTP: reopen channel on channel closure (#1654)
+- X509: extra characters before cert weren't being removed (#1659)
+- X509: signing with pw protected PSS keys yielded errors (#1657)
+- ASN1: fix timezone issue when non-utc time is given (#1562)
+- ASN1: change how default values are processed for ints and enums (#1665)
+- RSA: OAEP decryption didn't check labels correctly (#1669)
+
+## 3.0.8 - 2021-04-20
+
+- AsymetrticKey: add getComment() method (#1638)
+- SymmetricKey: cipher_name_openssl_ecb shouldn't be static because of AES (#1636)
+- X509: don't filter basicConstraints on unique values (#1639)
+- X509: make it so extensions can be set as critical (#1640)
+
+## 3.0.7 - 2021-04-06
+
+- X509: always parse the first cert of a bundle (#1568)
+- SSH2: behave like putty with broken publickey auth (#1572)
+- SSH2: don't close channel on unexpected response to channel request (#1631)
+- RSA: cleanup RSA PKCS#1 v1.5 signature verification (CVE-2021-30130)
+- Crypt: use a custom error handler for mcrypt to avoid deprecation errors
+
+## 3.0.6 - 2021-03-13
+
+- SFTP/Stream: make it so you can write past the end of a file (#1618)
+- SFTP/Stream: fix undefined index notice in stream touch() (#1615)
+- SFTP/Stream: mkdir didn't work (#1617)
+- BigInteger: fix issue with toBits on 32-bit PHP 8 installs
+- SFTP: digit only filenames were converted to integers by php (#1623)
+
+## 3.0.5 - 2021-02-12
+
+- X509: add getCurrentCert method (since $currentCert is now private) (#1602)
+- PublicKeyLoader: add loadPrivateKey() and loadPublicKey() methods (#1603)
+- Rijndael: calling setIV() after setBlockLength() can result in err (#1599)
+- RSA: use OpenSSL for generating private keys (#1596)
+- BigInteger: big speedups for when OpenSSL is used (#1596)
+
+## 3.0.4 - 2021-01-25
+
+- Random: use v9.99.99 of random_compat if appropriate (#1585, #1571)
+- SSH/Agent: EC keys didn't work with agent (#1593)
+- X509: fix niche issue with computeKeyIdentifier (#1586)
+
+## 3.0.3 - 2021-01-16
+
+- X509: passing DateTime objects to setEndDate produced errors (#1578)
+- X509: always parse the first cert of a bundle (#1568)
+- X509: streamline the management of custom extensions (#1573)
+- EC: fix case sensitivity errors when using Symfony autoloader (#1570)
+- RSA: improve identification of public / private PKCS1 / PKCS8 keys (#1579)
+- RSA: add support for PSS keys that don't have parameters present (#1583)
+- RSA: tweaks to how the salt length works
+- RSA: throw exceptions instead of returning false
+- SSH2: behave like putty with broken publickey auth (#1572)
+
+## 3.0.2 - 2020-12-24
+
+- EC/PKCS1: throw exception when trying to load non-strings (#1559)
+- X509: make date methods accept DateTimeInterface instead of DateTime (#1562)
+- SSH2: suppress errors on stream_select calls (#1560)
+
+## 3.0.1 - 2020-12-19
+
+- PKCS8: fix E_WARNING (#1551)
+- SSH2/Stream: stream_select needs to be able to access $fsock (#1552)
+- SFTP: resuming uploads didn't work (#1553)
+
+## 3.0.0 - 2020-12-16
+
+- drop SSH1 and SCP support
+- add support for the following crypto algorithms:
+  - Ed25519 / Ed449 / Curve25519 / Curve449
+  - ECDSA / ECDH (66 curves)
+  - DSA / DH
+  - GCM / Poly1305
+  - Salsa20 / ChaCha20
+- namespace changed from `phpseclib\` to `\phpseclib3` to facilitate phpseclib 2 shim (phpseclib2_compat)
+
+## 2.0.48 - 2024-12-14
+
+- BigInteger: workaround for regression in GMP that PHP introduced
+- X509: make the attributes section of new CSRs be blank (#1522)
+- X509: CRL version number wasn't correctly being saved (#2037)
+- SSH2: ignore kex-strict-s-v00@openssh.com in key re-exchanges (#2050)
+- SSH2: make it so phpseclib initiates key re-exchange after 1GB (#2050)
+- SSH2: if string is passed to setPreferredAlgorithms treat as array
+- SSH2: identification strings > 255 bytes didn't get parsed correctly
+- SSH2: fix possible infinite loop on packet timeout
+- SSH2: handle SSH2_MSG_EXT_INFO out of login (#2001, #2002)
+- SSH2/Agent: reset supported_private_key_algorithms for every key (#1995)
+
+## 2.0.47 - 2024-02-25
+
+- BigInteger: add getLength() and getLengthInBytes() methods
+- BigInteger: put guardrails on isPrime() and randomPrime() (CVE-2024-27354)
+- ASN1: limit OID length (CVE-2024-27355)
+
+## 2.0.46 - 2023-12-28
+
+- SSH2: implement terrapin attack countermeasures (#1972)
+- SSH2: only capture login info once (#1970)
+- SSH2: add support for RFC8308 (#1960)
+- Rijndael: fix for PHP 8.3+ compatability (#1944)
+- Crypt/Base: improve ARM detection code (#1949)
+- X509: fix for weird characters in subjaltname (#1943)
+
+## 2.0.45 - 2023-09-15
+
+- SFTP: make it so SFTP::RESUME also sets offset of local file (#1921)
+- SFTP: RESUME_START didn't work as described (#1921)
+- SFTP: fix SFTPv2 errors when logging errors (#1933)
+- SFTP: fix issue with get() downloading to files / streams (#1934)
+- Rijndael: fix E_DEPRECATED (#1935)
+- improve PHP32 compatibility (#1931)
+
+## 2.0.44 - 2023-06-13
+
+- SSH2: fix PHP 8.2 E_DEPRECATED errors (#1917)
+
+## 2.0.43 - 2023-06-13
+
+- SFTP: fix NET_SFTP_ATTR_EXTENDED (#1907)
+- SSH2: fix PHP 8.2 E_DEPRECATED errors (#1917)
+- X509: add support for EV DN's (#1916)
+
+## 2.0.42 - 2023-03-06
+
+- Blowfish: fix issues on 32-bit PHP installs
+- BigInteger: fix for hex numbers with new lines in them
+- SSH2: add getTimeout() method (#1889)
+
+## 2.0.41 - 2022-12-23
+
+- fix for more PHP 8.2 deprecations (#1875)
+
+## 2.0.40 - 2022-12-17
+
+- fix for PHP 8.2 deprecations (#1869)
+- SSH2: if logging in with rsa-sha2-256/512 fails, try ssh-rsa (#1865)
+- SSH/Agent: add support for named pipes on windows (for pageant) (#1866)
+- Crypt/Base: add a function to check continuous buffer status (#1870)
+- OpenSSL 3.0.1+ deprecated some algorithms (RC2, RC4, DES, Blowfish)
+
+## 2.0.39 - 2022-10-24
+
+- SFTP: fix deprecated implicit float to int on 32-bit PHP 8.1 (#1841)
+- SFTP: restore orig behavior when deleting non-existant folder (#1847)
+- Random: fix fallback on PHP 8.1+
+
+## 2.0.38 - 2022-09-02
+
+- RSA: add support for OpenSSH encrypted keys (#1737, #1733, #1531, #1490)
+- SSH2: fix possibly undefined variable error (#1802)
+- SFTP: try to delete dir even if it can't be opened (#1791)
+- SFTP: try without path canonicalization if initial realpath() fails (#1796)
+- SFTP: detect if stream metadata has wrapper_type set for put() method (#1792)
+- BigInteger: fix behavior on 32-bit PHP installs (#1820)
+- don't use dynamic properties, which are deprecated in PHP 8.2 (#1808, #1822)
+- fix deprecated implicit float to int on 32-bit PHP 8.1
+
+## 2.0.37 - 2022-04-04
+
+- RSA: add support for loading PuTTY v3 keys
+- Crypt/Base: fix CTR mode with continuous buffer with non-eval PHP
+- Crypt/Base: use sodium_increment in _increment_str
+- Crypt/Base: fix deprecation notice (#1770)
+- SSH2/Agent: rm unused parameter (#1757)
+
+## 2.0.36 - 2022-01-30
+
+- SSH2: make login() return false if no valid auth methods are found (#1744)
+- SFTP: fix chgrp() for version < 4 (#1730)
+- Crypt/Base: add OFB8 as a new mode (phpseclib/mcrypt_compat#33)
+- RSA & BigInteger: check phpinfo() available before using it (#1726)
+
+## 2.0.35 - 2021-11-28
+
+- SSH2: add "smart multi factor" login mode (enabled by default) (#1648)
+- SSH2: error out when no data is received from the server (#1647)
+- SFTP: don't attempt to parse unsupported attributes (#1708)
+- SFTP: getSupportedVersions() call didn't work
+
+## 2.0.34 - 2021-10-26
+
+- SSH2: add support for zlib and zlib@openssh.com compression
+- SFTP: add support for SFTPv4/5/6
+- SFTP: add option to allow arbitrary length packets (#1691)
+- RSA: ssh-keygen -yf private.key fails if \r is present (#1698)
+
+## 2.0.33 - 2021-08-15
+
+- SFTP: don't check SFTP packet size after SFTP initialization (#1606)
+- SFTP: timeout during SFTP init should return false (#1684)
+- SFTP: return false if get_channel_packet returns false (#1678)
+- ASN1: return false when not enough bytes are available (#1676)
+
+## 2.0.32 - 2021-06-13
+
+- SSH2: add getAuthMethodsToContinue() method (#1648)
+- SSH2: timeout would occasionally infinitely loop
+- SSH2: fix PHP7.4 errors about accessing bool as string (#1656)
+- SSH2: fix issue with key re-exchange (#1644)
+- SFTP: reopen channel on channel closure (#1654)
+- X509: extra characters before cert weren't being removed (#1659)
+- ASN1: fix timezone issue when non-utc time is given (#1562)
+- RSA: OAEP decryption didn't check labels correctly (#1669)
+
+## 2.0.31 - 2021-04-06
+
+- X509: always parse the first cert of a bundle (#1568)
+- SSH2: behave like putty with broken publickey auth (#1572)
+- SSH2: don't close channel on unexpected response to channel request (#1631)
+- RSA: support keys with PSS algorithm identifier (#1584)
+- RSA: cleanup RSA PKCS#1 v1.5 signature verification (CVE-2021-30130)
+- SFTP/Stream: make it so you can write past the end of a file (#1618)
+- SFTP: fix undefined index notice in stream touch() (#1615)
+- SFTP: digit only filenames were converted to integers by php (#1623)
+- BigInteger: fix issue with toBits on 32-bit PHP 8 installs
+- Crypt: use a custom error handler for mcrypt to avoid deprecation errors
+
+## 2.0.30 - 2020-12-16
+
+- X509: don't attempt to parse multi-cert PEMs (#1542)
+- SFTP: add stream to get method (#1546)
+- SFTP: progress callback should report actual downloaded bytes (#1543)
+- SSH2: end connection faster for algorithm mismatch
+- SSH2: add setKeepAlive() method (#1529)
+- ANSI: fix PHP8 compatibility issues
+
+## 2.0.29 - 2020-09-07
+
+- SFTP: add enableDatePreservation() / disableDatePreservation() (#1496)
+- SFTP: uploads on low speed networks could get in infinite loop (#1507)
+- SSH2: when building algo list look at if crypto engine is set (#1500)
+- X509: really looong base64 encoded strings broke extractBER() (#1486)
+
+## 2.0.28 - 2020-07-08
+
+- SFTP: realpath('') produced an error (#1474)
+- SFTP: if /path/to/file is a file then /path/to/file/whatever errors (#1475)
+- SFTP: speed up uploads (by changing SFTP upload packet size from 4KB to 32KB)
+- ANSI: fix "Number of elements can't be negative" error
+
+## 2.0.27 - 2020-05-22
+
+- SFTP: another attempt at speeding up uploads (#1455)
+- SSH2: try logging in with none as an auth method first (#1454)
+- ASN1: fix for malformed ASN1 strings (#1456)
+
+## 2.0.26 - 2020-03-22
+
+- SFTP: another attempt at speeding up uploads (#1455)
+- SSH2: try logging in with none as an auth method first (#1454)
+- ASN1: fix for malformed ASN1 strings (#1456)
+
+## 2.0.25 - 2020-02-25
+
+- SFTP: re-add buffering (#1455)
+
+## 2.0.24 - 2020-02-22
+
+- X509: fix PHP 5.3 compatability issue
+- SSH2: arcfour128 / arcfour256 were being included twice
+- SSH2: make window resizing behave more consistently with PuTTY (#1421)
+- SSH2: sodium_compat doesn't support memzero (#1432)
+- SSH2: logging enhancements
+- SFTP: don't buffer up download requests (PuTTY doesn't) (#1425)
+- RSA: make PSS verification work for key length that aren't a power of 2 (#1423)
+
+## 2.0.23 - 2019-09-16
+
+- SSH2: fix regression for connecting to servers with bad hostnames (#1405)
+
+## 2.0.22 - 2019-09-15
+
+- SSH2: backport setPreferredAlgorithms() / getAlgorithmsNegotiated (#1156)
+- SSH2 / SFTP: fix issues with ping() (#1402)
+- X509: IPs in nameconstraints extension include netmask (#1387)
+- X509: fix issue with explicit time tags whose maps expect implicit (#1388)
+- BigInteger: fix bug with toBytes() with fixed precision negative numbers
+- fix PHP 7.4 deprecations
+
+## 2.0.21 - 2019-07-14
+
+- SSH2: only auto close the channel for exec() timeouts (#1384)
+
+## 2.0.20 - 2019-06-23
+
+- BigInteger: lower PHP req back down to PHP 5.3.3 (#1382)
+
+## 2.0.19 - 2019-06-19
+
+- BigInteger: fix issues with divide method in pure-PHP mode
+
+## 2.0.18 - 2019-06-13
+
+- SSH2: close channel when a timeout occurs (#1378)
+- SFTP: improve handling of malformed packets (#1371)
+- RSA: add support for OpenSSH private keys (#1372)
+
+## 2.0.17 - 2019-05-26
+
+- BigInteger: new BigInteger('-0') caused issues with GMP
+
+## 2.0.16 - 2019-05-26
+
+- BigInteger: new BigInteger('00') caused issues with GMP
+- BigInteger: GMP engine didn't always return 1 or -1
+- ASN1: revamp how OIDs are handled (#1367)
+- ASN1: correctly handle long tags
+- SSH2: fix issue with reconnecting via ping() (#1353)
+- RSA: use hash_equals if available
+
+## 2.0.15 - 2019-03-10
+
+- SFTP: make it so get() can correctly handle out of order responses (#1343)
+- Crypt: avoid bogus IV errors in ECB mode with OpenSSL (#1087)
+- RSA: protect against possible timing attack during OAEP decryption
+- RSA: fix possible memory leak with XML keys (#1346)
+- Hash: fix issue with undefined constants (#1347)
+- Hash: fix issues with the mode
+- SCP: issue error if remote_file is empty in put() call (#1335)
+- X509: whitelist OID 1.3.6.1.4.1.11129.2.4.2 (#1341)
+
+## 2.0.14 - 2019-01-27
+
+- SSH2: ssh-rsa is sometimes incorrectly used instead of rsa-sha2-256 (#1331)
+- SSH2: more strictly adhere to RFC8332 for rsa-sha2-256/512 (#1332)
+
+## 2.0.13 - 2018-12-16
+
+- SSH2: fix order of user_error() / bitmap reset (#1314)
+- SSH2: setTimeout(0) didn't work as intended (#1116)
+- Agent: add support for rsa-sha2-256 / rsa-sha2-512 (#1319)
+- Agent: add parameter to constructor (#1319)
+- X509: fix errors with validateDate (#1318)
+
+## 2.0.12 - 2018-11-04
+
+- SSH2: fixes relating to delayed global requests (#1271)
+- SSH2: setEngine -> setPreferredEngine (#1294)
+- SSH2: reset $this->bitmap when the connection fails (#1298)
+- SSH2: add ping() method (#1298)
+- SSH2: add support for rsa-sha2-256 / rsa-sha2-512 (RFC8332)
+- SFTP: make rawlist give same result regardless of stat cache (#1287)
+- Hash: save hashed keys for re-use
+
+## 2.0.11 - 2018-04-15
+
+- X509: auto download intermediate certs
+- BigInteger: fix for (new BigInteger(48))->toString(true)) (#1264)
+- ASN1: class is never set as key in _decode_ber
+- check if phpinfo() is available before using (#1256)
+- backport CFB8 support from master to 2.0 (#1257)
+
+## 2.0.10 - 2018-02-08
+
+- BigInteger: fix issue with bitwise_xor (#1245)
+- Crypt: some of the minimum lengths were off
+- SFTP: update stat cache accordingly when file becomes a directory (#1235)
+- SFTP: fix issue with extended attributes on 64-bit PHP installs (#1248)
+- SSH2: more channel handling updates (#1200)
+- X509: use anonymous functions in PHP >= 5.3.0
+- X509: revise logic for validateSignature (#1213)
+- X509: fix 7.2 error when extensions were removed and new ones added (#1243)
+- fix float to int conversions on ARM CPU's (#1220)
+
+## 2.0.9 - 2017-11-29
+
+- 2.0.8 tag was done off of master branch - not 2.0 branch
+
+## 2.0.8 - 2017-11-29
+
+- SSH2: fix issue with key re-exchange
+- SSH2: updates to dealing with extraneous channel packets
+- X509: URL validation didn't work (#1203)
+
+## 2.0.7 - 2017-10-22
+
+- SSH2:
+  - add new READ_NEXT mode (#1140)
+  - add sendIdentificationStringFirst()
+  - add sendKEXINITFirst()
+  - add sendIdentificationStringLast()
+  - add sendKEXINITLast() (#1162)
+  - assume any SSH server >= 1.99 supports SSH2 (#1170)
+  - workaround for bad arcfour256 implementations (#1171)
+  - don't choke when getting response from diff channel in exec() (#1167)
+- SFTP:
+  - add enablePathCanonicalization()
+  - add disablePathCanonicalization() (#1137)
+  - fix put() with remote file stream resource (#1177)
+- ANSI: misc fixes (#1150, #1161)
+- X509: use DateTime instead of unix time (#1166)
+- Ciphers: use eval() instead of create_function() for >= 5.3
+
+## 2.0.6 - 2017-06-05
+
+- Crypt: fix OpenSSL engine on <= PHP 5.3.6 (#1122)
+- Random: suppress possible E_DEPRECATED errors
+- RSA: reset variables if bad key was loaded
+
+## 2.0.5 - 2017-05-07
+
+- SSH2: don't use timeout value of 0 for fsockopen (#775)
+- SSH2: make it so disabling PTY closes exec() channel if it's open (#1009)
+- SSH2: include `<pre>` tags in getLog result when SAPI isn't CLI
+- SFTP: don't assume current directory when $path parameter for delete is null (#1059)
+- SFTP: fix put() with php://input as source (#1119)
+- ASN1: fix UTCTime parsing (#1110)
+- X509: ignore certificate transparency extension (#1073)
+- Crypt: OpenSSL apparently supports variable size keys (#1085)
+
+## 2.0.4 - 2016-10-03
+
+- fix E_DEPRECATED errors on PHP 7.1 (#1041)
+- SFTP: speed up downloads (#945)
+- SFTP: fix infinite loop when uploading empty file (#995)
+- ASN1: fix possible infinite loop in decode (#1027)
+
+## 2.0.3 - 2016-08-18
+
+- BigInteger/RSA: don't compare openssl versions > 1.0 (#946)
+- RSA: don't attempt to use the CRT when zero value components exist (#980)
+- RSA: zero salt length RSA signatures don't work (#1002)
+- ASN1: fix PHP Warning on PHP 7.1 (#1013)
+- X509: set parameter fields to null for CSR's / RSA (#914)
+- CRL optimizations (#1000)
+- SSH2: fix "Expected SSH_FXP_STATUS or ..." error (#999)
+- SSH2: use stream_get_* instead of fread() / fgets() (#967)
+- SFTP: make symlinks support relative target's (#1004)
+- SFTP: fix sending stream resulting in zero byte file (#995)
+
+## 2.0.2 - 2016-06-04
+
+- All Ciphers: fix issue with CBC mode / OpenSSL / continuous buffers / decryption (#938)
+- Random: fix issues with serialize() (#932)
+- RC2: fix issue with decrypting
+- RC4: fix issue with key not being truncated correctly
+- SFTP: nlist() on a non-existent directory resulted in error
+- SFTP: add is_writable, is_writeable, is_readable
+- X509: add IPv6 support for subjectaltname extension (#936)
+
+## 2.0.1 - 2016-01-18
+
+- RSA: fix regression in PSS mode ([#769](https://github.com/phpseclib/phpseclib/pull/769))
+- RSA: fix issue loading PKCS8 specific keys ([#861](https://github.com/phpseclib/phpseclib/pull/861))
+- X509: add getOID() method ([#789](https://github.com/phpseclib/phpseclib/pull/789))
+- X509: improve base64-encoded detection rules ([#855](https://github.com/phpseclib/phpseclib/pull/855))
+- SFTP: fix quirky behavior with put() ([#830](https://github.com/phpseclib/phpseclib/pull/830))
+- SFTP: fix E_NOTICE ([#883](https://github.com/phpseclib/phpseclib/pull/883))
+- SFTP/Stream: fix issue with filenames with hashes ([#901](https://github.com/phpseclib/phpseclib/pull/901))
+- SSH2: add isAuthenticated() method ([#897](https://github.com/phpseclib/phpseclib/pull/897))
+- SSH/Agent: fix possible PHP warning ([#923](https://github.com/phpseclib/phpseclib/issues/923))
+- BigInteger: add __debugInfo() magic method ([#881](https://github.com/phpseclib/phpseclib/pull/881))
+- BigInteger: fix issue with doing bitwise not on 0
+- add getBlockLength() method to symmetric ciphers
+
+## 2.0.0 - 2015-08-04
+
+- Classes were renamed and namespaced ([#243](https://github.com/phpseclib/phpseclib/issues/243))
+- The use of an autoloader is now required (e.g. Composer)
+
+## 1.0.23 - 2024-02-25
+
+- BigInteger: add getLength() and getLengthInBytes() methods
+- BigInteger: put guardrails on isPrime() and randomPrime() (CVE-2024-27354)
+- ASN1: limit OID length (CVE-2024-27355)
+
+## 1.0.22 - 2023-12-28
+
+- SFTP: fix issue with get() downloading to files / streams (#1934)
+- SFTP: fix SFTPv2 errors when logging errors (#1933)
+- SSH2: implement terrapin attack countermeasures (#1972)
+- SSH2: only capture login info once (#1970)
+- SSH2: add support for RFC8308 (#1960)
+- Rijndael: fix for PHP 8.3+ compatability (#1944)
+- Crypt/Base: improve ARM detection code (#1949)
+- X509: fix for weird characters in subjaltname (#1943)
+- ASN1: fix string conversion code for 32-bit PHP installs (#1931)
+
+## 1.0.21 - 2023-07-09
+
+- fix deprecation errors in newer PHP versions
+- OpenSSL 3.0.1+ deprecated some algorithms
+- RSA: add support for loading OpenSSH encrypted keys (#1737, #1733, #1531, #1490)
+- RSA: add support for loading PuTTY v3 keys
+- SSH2: if logging in with rsa-sha2-256/512 fails, try ssh-rsa (#1865)
+- SSH2: add EOF test isConnected() (#1926)
+- SFTP: try without path canonicalization if initial realpath() fails (#1796)
+- SFTP: fix chgrp() for version < 4 (#1730)
+- SFTP: try to delete dir even if it can't be opened (#1791)
+- SFTP: make it so SFTP::RESUME also sets offset of local file (#1921)
+- SFTP: SFTP::RESUME_START didn't work as described (#1921)
+- Crypt/Base: fix CTR mode with continuous buffer with non-eval PHP
+
+## 1.0.20 - 2021-12-28
+
+SFTP:
+- speed up uploads (by changing SFTP upload packet size from 4KB to 32KB)
+- add support for SFTPv4/5/6
+- add enableDatePreservation() / disableDatePreservation() (#1496)
+- uploads on low speed networks could get in infinite loop (#1507)
+- "fix" rare resource not closed error (#1510)
+- progress callback should report actual downloaded bytes (#1543)
+- add stream to get method (#1546)
+- fix undefined index notice in stream touch() (#1615)
+- digit only filenames were converted to integers by php (#1623)
+- Stream: make it so you can write past the end of a file (#1618)
+- reopen channel on channel closure (#1654)
+- don't check SFTP packet size after SFTP initialization (#1606)
+- return false if get_channel_packet returns false (#1678)
+- timeout during SFTP init should return false (#1684)
+- add option to allow arbitrary length packets (#1691)
+
+SSH2:
+- add support for zlib and zlib@openssh.com compression
+- add "smart multi factor" login mode (enabled by default) (#1648)
+- don't try to login as none auth method for CoreFTP server (#1488)
+- when building algo list look at if crypto engine is set (#1500)
+- suppress 'broken pipe' errors (#1511)
+- add setKeepAlive() method (#1529)
+- behave like putty with broken publickey auth (#1572)
+- don't close channel on unexpected response to channel request (#1631)
+- add getAuthMethodsToContinue() method (#1648)
+- fix issue with key re-exchange (#1644)
+- fix PHP7.4 errors about accessing bool as string (#1656)
+- end connection faster for algorithm mismatch
+
+X509:
+- really looong base64 encoded strings broke extractBER() (#1486)
+- only parse the first cert of a multi-cert PEMs (#1542, #1568)
+
+ASN1:
+- fix timezone issue when non-utc time is given (#1562)
+- return false when not enough bytes are available (#1676)
+
+RSA:
+- ssh-keygen -yf private.key fails if \r is present (#1698)
+
+BigInteger:
+- fix issue with toBits on 32-bit PHP 8 installs
+
+Crypt/Base:
+- use a custom error handler for mcrypt
+
+## 1.0.19 - 2020-07-07
+
+- SSH2: arcfour128 / arcfour256 were being included twice
+- SSH2: make window resizing behave more consistently with PuTTY (#1421)
+- SSH2: logging enhancements
+- SSH2: try logging in with none as an auth method first (#1454)
+- SFTP: change the mode with a SETSTAT instead of MKDIR (#1463)
+- SFTP: make it so extending SFTP class doesn't cause a segfault (#1465)
+- SFTP: realpath('') produced an error (#1474)
+- SFTP: if /path/to/file is a file then /path/to/file/whatever errors (#1475)
+- RSA: make PSS verification work for key length that aren't a power of 2 (#1423)
+- ASN1: fix for malformed ASN1 strings (#1456)
+- ANSI: fix "Number of elements can't be negative" error
+
+## 1.0.18 - 2019-09-16
+
+- SSH2: fix regression for connecting to servers with bad hostnames (#1405)
+
+## 1.0.17 - 2019-09-15
+
+- SSH2: backport setPreferredAlgorithms() / getAlgorithmsNegotiated (#1156)
+- SSH2 / SFTP: fix issues with ping() (#1402)
+- SSH2: only auto close the channel for exec() timeouts (#1384)
+- SSH2 / SFTP: fix issues with ping() (#1402)
+- SFTP: add progress callback to get() (#1375)
+- SFTP: fix array_merge(): Argument #1 is not an array error (#1379)
+- X509: IPs in nameconstraints extension include netmask (#1387)
+- X509: fix issue with explicit time tags whose maps expect implicit (#1388)
+- BigInteger: fix issues with divide method
+- BigInteger: fix bug with toBytes() with fixed precision negative numbers
+- fix PHP 7.4 deprecations
+
+## 1.0.16 - 2019-06-13
+
+- BigInteger: new BigInteger('-0') caused issues with GMP
+- BigInteger: new BigInteger('00') caused issues with GMP
+- BigInteger: GMP engine didn't always return 1 or -1
+- ASN1: revamp how OIDs are handled (#1367)
+- ASN1: correctly handle long tags
+- SSH2: fix issue with reconnecting via ping() (#1353)
+- SSH2: close channel when a timeout occurs (#1378)
+- SFTP: improve handling of malformed packets (#1371)
+- RSA: add support for OpenSSH private keys (#1372)
+- RSA: use hash_equals if available
+
+## 1.0.15 - 2019-03-10
+
+- SFTP: make it so get() can correctly handle out of order responses (#1343)
+- Crypt: avoid bogus IV errors in ECB mode with OpenSSL (#1087)
+- RSA: protect against possible timing attack during OAEP decryption
+- RSA: fix possible memory leak with XML keys (#1346)
+- Hash: fix issues with the mode
+- SCP: issue error if remote_file is empty in put() call (#1335)
+- X509: whitelist OID 1.3.6.1.4.1.11129.2.4.2 (#1341)
+
+## 1.0.14 - 2019-01-27
+
+- SSH2: ssh-rsa is sometimes incorrectly used instead of rsa-sha2-256 (#1331)
+- SSH2: more strictly adhere to RFC8332 for rsa-sha2-256/512 (#1332)
+
+## 1.0.13 - 2018-12-16
+
+- SSH2: fix order of user_error() / bitmap reset (#1314)
+- SSH2: setTimeout(0) didn't work as intended (#1116)
+- Agent: add support for rsa-sha2-256 / rsa-sha2-512 (#1319)
+- Agent: add parameter to constructor (#1319)
+
+## 1.0.12 - 2018-11-04
+
+- SSH2: fixes relating to delayed global requests (#1271)
+- SSH2: setEngine -> setPreferredEngine (#1294)
+- SSH2: reset $this->bitmap when the connection fails (#1298)
+- SSH2: add ping() method (#1298)
+- SSH2: add support for rsa-sha2-256 / rsa-sha2-512 (RFC8332)
+- SFTP: make rawlist give same result regardless of stat cache (#1287)
+- Hash: save hashed keys for re-use
+
+## 1.0.11 - 2018-04-15
+
+- X509: auto download intermediate certs
+- BigInteger: fix for (new BigInteger(48))->toString(true)) (#1264)
+- ASN1: class is never set as key in _decode_ber
+
+## 1.0.10 - 2018-02-08
+
+- BigInteger: fix issue with bitwise_xor (#1245)
+- Crypt: some of the minimum lengths were off
+- SFTP: update stat cache accordingly when file becomes a directory (#1235)
+- SFTP: fix issue with extended attributes on 64-bit PHP installs (#1248)
+- SSH2: more channel handling updates (#1200)
+- X509: use anonymous functions in PHP >= 5.3.0
+- X509: revise logic for validateSignature (#1213)
+- X509: fix 7.2 error when extensions were removed and new ones added (#1243)
+- fix float to int conversions on ARM CPU's (#1220)
+
+## 1.0.9 - 2017-11-29
+
+- SSH2: fix issue with key re-exchange
+- SSH2: updates to dealing with extraneous channel packets
+- X509: URL validation didn't work (#1203)
+
+## 1.0.8 - 2017-10-22
+
+- SSH2:
+  - add new READ_NEXT mode (#1140)
+  - add sendIdentificationStringFirst()
+  - add sendKEXINITFirst()
+  - add sendIdentificationStringLast()
+  - add sendKEXINITLast() (#1162)
+  - assume any SSH server >= 1.99 supports SSH2 (#1170)
+  - workaround for bad arcfour256 implementations (#1171)
+  - don't choke when getting response from diff channel in exec() (#1167)
+- SFTP:
+  - add enablePathCanonicalization()
+  - add disablePathCanonicalization() (#1137)
+  - fix put() with remote file stream resource (#1177)
+- ANSI: misc fixes (#1150, #1161)
+- X509: use DateTime instead of unix time (#1166)
+- Ciphers: use eval() instead of create_function() for >= 5.3
+
+## 1.0.7 - 2017-06-05
+
+- Crypt: fix OpenSSL engine on <= PHP 5.3.6 (#1122)
+- Random: suppress possible E_DEPRECATED errors
+- RSA: reset variables if bad key was loaded
+
+## 1.0.6 - 2017-05-07
+
+- SSH2: don't use timeout value of 0 for fsockopen (#775)
+- SSH2: make it so disabling PTY closes exec() channel if it's open (#1009)
+- SSH2: include `<pre>` tags in getLog result when SAPI isn't CLI
+- SFTP: don't assume current directory when $path parameter for delete is null (#1059)
+- SFTP: fix put() with php://input as source (#1119)
+- ASN1: fix UTCTime parsing (#1110)
+- X509: ignore certificate transparency extension (#1073)
+- Crypt: OpenSSL apparently supports variable size keys (#1085)
+
+## 1.0.5 - 2016-10-22
+
+- fix issue preventing installation of 1.0.x via Composer (#1048)
+
+## 1.0.4 - 2016-10-03
+
+- fix E_DEPRECATED errors on PHP 7.0 and 7.1 (#1041)
+- fix float to int conversions on 32-bit Linux pre-PHP 5.3 (#1038, #1034)
+- SFTP: speed up downloads (#945)
+- SFTP: fix infinite loop when uploading empty file (#995)
+- ASN1: fix possible infinite loop in decode (#1027)
+
+## 1.0.3 - 2016-08-18
+
+- BigInteger/RSA: don't compare openssl versions > 1.0 (#946)
+- RSA: don't attempt to use the CRT when zero value components exist (#980)
+- RSA: zero salt length RSA signatures don't work (#1002)
+- ASN1: fix PHP Warning on PHP 7.1 (#1013)
+- X509: set parameter fields to null for CSR's / RSA (#914)
+- CRL optimizations (#1000)
+- SSH2: fix "Expected SSH_FXP_STATUS or ..." error (#999)
+- SFTP: make symlinks support relative target's (#1004)
+- SFTP: fix sending stream resulting in zero byte file (#995)
+
+## 1.0.2 - 2016-05-07
+
+- All Ciphers: fix issue with CBC mode / OpenSSL / continuous buffers / decryption (#938)
+- Random: fix issues with serialize() (#932)
+- RC2: fix issue with decrypting
+- RC4: fix issue with key not being truncated correctly
+- SFTP: nlist() on a non-existent directory resulted in error
+- SFTP: add is_writable, is_writeable, is_readable
+- RSA: fix PHP4 compatibility issue
+
+## 1.0.1 - 2016-01-18
+
+- RSA: fix regression in PSS mode ([#769](https://github.com/phpseclib/phpseclib/pull/769))
+- RSA: fix issue loading PKCS8 specific keys ([#861](https://github.com/phpseclib/phpseclib/pull/861))
+- X509: add getOID() method ([#789](https://github.com/phpseclib/phpseclib/pull/789))
+- X509: improve base64-encoded detection rules ([#855](https://github.com/phpseclib/phpseclib/pull/855))
+- SFTP: fix quirky behavior with put() ([#830](https://github.com/phpseclib/phpseclib/pull/830))
+- SFTP: fix E_NOTICE ([#883](https://github.com/phpseclib/phpseclib/pull/883))
+- SFTP/Stream: fix issue with filenames with hashes ([#901](https://github.com/phpseclib/phpseclib/pull/901))
+- SSH2: add isAuthenticated() method ([#897](https://github.com/phpseclib/phpseclib/pull/897))
+- SSH/Agent: fix possible PHP warning ([#923](https://github.com/phpseclib/phpseclib/issues/923))
+- BigInteger: add __debugInfo() magic method ([#881](https://github.com/phpseclib/phpseclib/pull/881))
+- BigInteger: fix issue with doing bitwise not on 0
+- add getBlockLength() method to symmetric ciphers
+
 ## 1.0.0 - 2015-08-02
 
 - OpenSSL support for symmetric ciphers ([#507](https://github.com/phpseclib/phpseclib/pull/507))
 - rewritten vt100 terminal emulator (File_ANSI) ([#689](https://github.com/phpseclib/phpseclib/pull/689))
 - agent-forwarding support (System_SSH_Agent) ([#592](https://github.com/phpseclib/phpseclib/pull/592))
 - Net_SSH2 improvements
- - diffie-hellman-group-exchange-sha1/sha256 support ([#714](https://github.com/phpseclib/phpseclib/pull/714))
- - window size handling updates ([#717](https://github.com/phpseclib/phpseclib/pull/717))
+  - diffie-hellman-group-exchange-sha1/sha256 support ([#714](https://github.com/phpseclib/phpseclib/pull/714))
+  - window size handling updates ([#717](https://github.com/phpseclib/phpseclib/pull/717))
 - Net_SFTP improvements
- - add callback support to put() ([#655](https://github.com/phpseclib/phpseclib/pull/655))
- - stat cache fixes ([#743](https://github.com/phpseclib/phpseclib/issues/743), [#730](https://github.com/phpseclib/phpseclib/issues/730), [#709](https://github.com/phpseclib/phpseclib/issues/709), [#726](https://github.com/phpseclib/phpseclib/issues/726))
+  - add callback support to put() ([#655](https://github.com/phpseclib/phpseclib/pull/655))
+  - stat cache fixes ([#743](https://github.com/phpseclib/phpseclib/issues/743), [#730](https://github.com/phpseclib/phpseclib/issues/730), [#709](https://github.com/phpseclib/phpseclib/issues/709), [#726](https://github.com/phpseclib/phpseclib/issues/726))
 - add "none" encryption mode to Crypt_RSA ([#692](https://github.com/phpseclib/phpseclib/pull/692))
 - misc ASN.1 / X.509 parsing fixes ([#721](https://github.com/phpseclib/phpseclib/pull/721), [#627](https://github.com/phpseclib/phpseclib/pull/627))
 - use a random serial number for new X509 certs ([#740](https://github.com/phpseclib/phpseclib/pull/740))
@@ -55,21 +1009,21 @@
 ## 0.3.5 - 2013-07-11
 
 - numerous SFTP changes:
- - chown
- - chgrp
- - truncate
- - improved file type detection
- - put() can write to te middle of a file
- - mkdir accepts the same paramters that PHP's mkdir does
- - the ability to upload/download 2GB files
+  - chown
+  - chgrp
+  - truncate
+  - improved file type detection
+  - put() can write to the middle of a file
+  - mkdir accepts the same parameters that PHP's mkdir does
+  - the ability to upload/download 2GB files
 - across-the-board speedups for the various encryption algorithms
 - multi-factor authentication support for Net_SSH2
 - a $callback parameter for Net_SSH2::exec
 - new classes:
- - Net_SFTP_StreamWrapper
- - Net_SCP
- - Crypt_Twofish
- - Crypt_Blowfish
+  - Net_SFTP_StreamWrapper
+  - Net_SCP
+  - Crypt_Twofish
+  - Crypt_Blowfish
 
 ## 0.3.1 - 2012-11-20
 
@@ -84,7 +1038,7 @@
 
 ## 0.3.0 - 2012-07-08
 
-- add support for reuming Net_SFTP::put()
+- add support for resuming Net_SFTP::put()
 - add support for recursive deletes and recursive chmods to Net_SFTP
 - add setTimeout() to Net_SSH2
 - add support for PBKDF2 to the various Crypt_* classes via setPassword()
@@ -99,7 +1053,32 @@
 - Net_SSH2 now has limited keyboard_interactive authentication support
 - support was added for PuTTY formatted RSA private keys and XML formatted RSA private keys
 - Crypt_RSA::loadKey() will now try all key types automatically
-= add support for AES-128-CBC and DES-EDE3-CFB encrypted RSA private keys
+- add support for AES-128-CBC and DES-EDE3-CFB encrypted RSA private keys
 - add Net_SFTP::stat(), Net_SFTP::lstat() and Net_SFTP::rawlist()
 - logging was added to Net_SSH1
-- the license was changed to the less restrictive MIT license
\ No newline at end of file
+- the license was changed to the less restrictive MIT license
+
+## 0.2.1 - 2010-05-03
+
+- across the board speedups
+- improved compatibility
+- implements RSA blinding
+- support for more public / private RSA keys added
+- implements CTR mode for block ciphers
+- adds Net_SFTP::rawlist() and Net_SFTP::size()
+- improves debugging capabilities
+- Crypt_Random should be more cryptographically secure
+
+## 0.2.0 - 2009-12-05
+
+- added Crypt_RSA
+- added support for RSA publickey authentication in Net_SSH2
+- compatibility improvements
+- speed improvements
+
+## 0.1.5 - 2009-06-11
+
+- SFTP support
+- misc bug fixes
+
+## 0.1.1 - 2009-02-17
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index 75f6b2045..e7214ebbe 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,4 @@
-Copyright 2007-2013 TerraFrost and other contributors
-http://phpseclib.sourceforge.net/
+Copyright (c) 2011-2019 TerraFrost and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -18,4 +17,4 @@ 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.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/README.md b/README.md
index d4d6b46c4..7166bafe7 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,61 @@
 # phpseclib - PHP Secure Communications Library
 
-[![Build Status](https://travis-ci.org/phpseclib/phpseclib.svg?branch=master)](https://travis-ci.org/phpseclib/phpseclib)
+[![CI Status](https://github.com/phpseclib/phpseclib/actions/workflows/ci.yml/badge.svg?branch=master&event=push "CI Status")](https://github.com/phpseclib/phpseclib/actions/workflows/ci.yml?query=branch%3Amaster)
 
-MIT-licensed pure-PHP implementations of an arbitrary-precision integer
-arithmetic library, fully PKCS#1 (v2.1) compliant RSA, DES, 3DES, RC4, Rijndael,
-AES, Blowfish, Twofish, SSH-1, SSH-2, SFTP, and X.509
+## Supporting phpseclib
 
-* [Download (1.0.0)](http://sourceforge.net/projects/phpseclib/files/phpseclib1.0.0.zip/download)
-* [Browse Git](https://github.com/phpseclib/phpseclib)
-* [Code Coverage Report](http://phpseclib.bantux.org/code_coverage/master/latest/)
+- [Become a backer or sponsor on Patreon](https://www.patreon.com/phpseclib)
+- [One-time donation via PayPal or crypto-currencies](http://sourceforge.net/donate/index.php?group_id=198487)
+- [Subscribe to Tidelift](https://tidelift.com/subscription/pkg/packagist-phpseclib-phpseclib?utm_source=packagist-phpseclib-phpseclib&utm_medium=referral&utm_campaign=readme)
+
+## Introduction
+
+MIT-licensed pure-PHP implementations of the following:
 
-<img src="http://phpseclib.sourceforge.net/pear-icon.png" alt="PEAR Channel" width="16" height="16">
-PEAR Channel: [phpseclib.sourceforge.net](http://phpseclib.sourceforge.net/pear.htm)
+SSH-2, SFTP, X.509, an arbitrary-precision integer arithmetic library, Ed25519 / Ed449 / Curve25519 / Curve449, ECDSA / ECDH (with support for 66 curves), RSA (PKCS#1 v2.2 compliant), DSA / DH, DES / 3DES / RC4 / Rijndael / AES / Blowfish / Twofish / Salsa20 / ChaCha20, GCM / Poly1305
+
+* [Browse Git](https://github.com/phpseclib/phpseclib)
 
 ## Documentation
 
-* [Documentation / Manual](http://phpseclib.sourceforge.net/)
-* [API Documentation](http://phpseclib.bantux.org/api/master/) (generated by Sami)
+* [Documentation / Manual](https://phpseclib.com/)
+* [API Documentation](https://api.phpseclib.com/master/) (generated by Doctum)
+
+## Branches
+
+### master
+
+* Development Branch
+* Unstable API
+* Do not use in production
+
+### 3.0
+
+* Long term support (LTS) release
+* Major expansion of cryptographic primitives
+* Minimum PHP version: 5.6.1
+* PSR-4 autoloading with namespace rooted at `\phpseclib3`
+* Install via Composer: `composer require phpseclib/phpseclib:~3.0`
+
+### 2.0
+
+* Long term support (LTS) release
+* Modernized version of 1.0
+* Minimum PHP version: 5.3.3
+* PSR-4 autoloading with namespace rooted at `\phpseclib`
+* Install via Composer: `composer require phpseclib/phpseclib:~2.0`
+
+### 1.0
+
+* Long term support (LTS) release
+* PHP4 compatible
+* Composer compatible (PSR-0 autoloading)
+* Install using Composer: `composer require phpseclib/phpseclib:~1.0`
+* [Download 1.0.23 as ZIP](http://sourceforge.net/projects/phpseclib/files/phpseclib1.0.23.zip/download)
+
+## Security contact information
+
+To report a security vulnerability, please use the [Tidelift security contact](https://tidelift.com/security). Tidelift will coordinate the fix and disclosure.
 
 ## Support
 
@@ -26,40 +65,29 @@ Need Support?
 * [Create a Support Ticket on GitHub](https://github.com/phpseclib/phpseclib/issues/new)
 * [Browse the Support Forum](http://www.frostjedi.com/phpbb/viewforum.php?f=46) (no longer in use)
 
-## Installing Development Dependencies
-
-Dependencies are managed via Composer.
-
-1. Download the [`composer.phar`](https://getcomposer.org/composer.phar) executable as per the
-   [Composer Download Instructions](https://getcomposer.org/download/), e.g. by running
+## Special Thanks
 
-    ``` sh
-    curl -sS https://getcomposer.org/installer | php
-    ```
-
-2. Install Dependencies
+Special Thanks to our $50+ sponsors!:
 
-    ``` sh
-    php composer.phar install
-    ```
+- Allan Simon
+- [ChargeOver](https://chargeover.com/)
 
 ## Contributing
 
 1. Fork the Project
 
-2. Install Development Dependencies
+2. Ensure you have Composer installed (see [Composer Download Instructions](https://getcomposer.org/download/))
 
-3. Create a Feature Branch
-
-4. (Recommended) Run the Test Suite
-
-    ``` sh
-    vendor/bin/phpunit
+3. Install Development Dependencies
+    ```sh
+    composer install
     ```
-5. (Recommended) Check whether your code conforms to our Coding Standards by running
 
-    ``` sh
-    vendor/bin/phing -f build/build.xml sniff
-    ```
+4. Create a Feature Branch
 
+5. Run continuous integration checks:
+   ```sh
+   composer run-script all-quality-tools
+   ```
+   
 6. Send us a Pull Request
diff --git a/build/build.xml b/build/build.xml
deleted file mode 100644
index 92d3923f4..000000000
--- a/build/build.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="phpseclib"
-         description="PHP Secure Communications Library"
-         default="all"
->
-
-  <target name="all" depends="sniff,api" />
-
-  <!-- Code Sniffer -->
-  <target name="sniff" depends="sniff-php-code,sniff-php-tests" />
-  <target name="sniff-php-code">
-    <exec command="vendor/bin/phpcs -s
-        --extensions=php
-        --standard=build/code-sniffer-ruleset.xml
-        phpseclib/"
-      dir=".." checkreturn="true" passthru="true" />
-  </target>
-  <target name="sniff-php-tests">
-    <exec command="vendor/bin/phpcs -s
-        --extensions=php
-        --standard=build/code-sniffer-ruleset-tests.xml
-        tests/"
-      dir=".." checkreturn="true" passthru="true" />
-  </target>
-
-  <!-- API Generation -->
-  <target name="api">
-    <exec command="vendor/bin/sami.php update build/sami.conf.php"
-      dir=".." passthru="true" />
-  </target>
-
-</project>
diff --git a/build/code-sniffer-ruleset-tests.xml b/build/code-sniffer-ruleset-tests.xml
deleted file mode 100644
index 7169012eb..000000000
--- a/build/code-sniffer-ruleset-tests.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="phpseclib Test Standard">
-
- <description>phpseclib coding standard for tests</description>
-
- <!-- In general rules that apply to library code also apply to tests. -->
- <rule ref="./code-sniffer-ruleset.xml">
-  <!-- Exceptions to the library coding standard follow. -->
-
-  <!-- Test classes do not have to be namespaced but may use pseudo-namespacing
-       using underscore. -->
-  <exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace" />
-  <exclude name="Squiz.Classes.ValidClassName.NotCamelCaps" />
- </rule>
-
-</ruleset>
diff --git a/build/code-sniffer-ruleset.xml b/build/code-sniffer-ruleset.xml
deleted file mode 100644
index 2e399139c..000000000
--- a/build/code-sniffer-ruleset.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="phpseclib Standard">
-
- <description>phpseclib coding standard</description>
-
- <!-- We are using the PSR2 standard as a base -->
- <rule ref="PSR2">
-  <!-- Exceptions due to legacy code with PHP4 compatibility -->
-  <exclude name="PSR2.Classes.PropertyDeclaration.ScopeMissing" />
-  <exclude name="PSR2.Classes.PropertyDeclaration.VarUsed" />
-  <exclude name="Squiz.Scope.MethodScope.Missing" />
-
-  <!-- Exceptions for backward compatibility -->
-  <exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps" />
-  <exclude name="PSR2.Methods.MethodDeclaration.Underscore" />
-
-  <!-- Exceptions for whitespacing -->
-  <exclude name="Generic.Functions.FunctionCallArgumentSpacing.TooMuchSpaceAfterComma" />
-  <exclude name="PSR2.ControlStructures.SwitchDeclaration.SpaceBeforeColonCASE" />
-  <exclude name="PSR2.ControlStructures.SwitchDeclaration.SpaceBeforeColonDEFAULT" />
-
-  <!-- Other Exceptions -->
-  <exclude name="Generic.Files.LineLength.TooLong" />
-  <exclude name="PSR2.ControlStructures.SwitchDeclaration.TerminatingComment" />
- </rule>
-
- <!-- Useful additional rules follow -->
-
- <!-- "for (; bar; )" should be "while (bar)" instead -->
- <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop" />
-
- <!-- A method MUST not only call its parent -->
- <rule ref="Generic.CodeAnalysis.UselessOverridingMethod" />
-
-</ruleset>
diff --git a/build/php-cs-fixer.php b/build/php-cs-fixer.php
new file mode 100644
index 000000000..27fe47812
--- /dev/null
+++ b/build/php-cs-fixer.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+return (new PhpCsFixer\Config())
+    ->setFinder(PhpCsFixer\Finder::create()->in(__DIR__ . '/..'))
+    ->setCacheFile(__DIR__ . '/php-cs-fixer.cache')
+    ->setRiskyAllowed(true)
+    // https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/master/doc/rules/index.rst
+    ->setRules(
+        [
+            // Array
+            'array_syntax' => ['syntax' => 'short'],
+            // Function Notation
+            'native_function_invocation' => ['exclude' => [], 'include' => [], 'scope' => 'all', 'strict' => true],
+            // Import
+            'fully_qualified_strict_types' => true,
+            'global_namespace_import' => ['import_constants' => false, 'import_functions' => false, 'import_classes' => false],
+            'no_leading_import_slash' => true,
+            'no_unused_imports' => true,
+            'ordered_imports' => ['sort_algorithm' => 'alpha', 'imports_order' => ['class', 'const', 'function']],
+            'single_import_per_statement' => true,
+            'single_line_after_imports' => true,
+            // PHPDoc
+            'no_superfluous_phpdoc_tags' => true,
+            'phpdoc_trim_consecutive_blank_line_separation' => true,
+            'phpdoc_trim' => true,
+
+            '@PHP81Migration' => true,
+            '@PHP80Migration:risky' => true,
+        ]
+    );
diff --git a/build/php_codesniffer.xml b/build/php_codesniffer.xml
new file mode 100644
index 000000000..4a7b18d78
--- /dev/null
+++ b/build/php_codesniffer.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<ruleset name="phpseclib">
+    <file>../build/php-cs-fixer.php</file>
+    <file>../phpseclib/</file>
+    <file>../tests/</file>
+
+    <arg name="extensions" value="php"/>
+    <arg name="basepath" value=".."/>
+    <arg name="report" value="diff"/>
+    <arg value="s"/>
+    <arg value="n"/>
+    <arg value="p"/>
+
+    <rule ref="PSR12">
+        <exclude name="Squiz.Classes.ValidClassName.NotCamelCaps"/>
+        <exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps"/>
+        <exclude name="PSR2.Methods.MethodDeclaration.Underscore"/>
+        <exclude name="PSR12.Files.FileHeader.IncorrectOrder"/>
+    </rule>
+</ruleset>
diff --git a/build/psalm.xml b/build/psalm.xml
new file mode 100644
index 000000000..142a414d4
--- /dev/null
+++ b/build/psalm.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<psalm
+    xmlns="https://getpsalm.org/schema/config"
+    errorLevel="1"
+    errorBaseline="psalm_baseline.xml"
+    findUnusedCode="true"
+    findUnusedPsalmSuppress="true"
+    sealAllMethods="true"
+    ensureArrayStringOffsetsExist="true"
+    ensureArrayIntOffsetsExist="true"
+    ignoreInternalFunctionNullReturn="false"
+    ignoreInternalFunctionFalseReturn="false"
+>
+    <projectFiles>
+        <directory name="../phpseclib"/>
+        <directory name="../tests"/>
+    </projectFiles>
+    <issueHandlers>
+        <Trace>
+            <errorLevel type="error">
+                <directory name=".."/>
+            </errorLevel>
+        </Trace>
+    </issueHandlers>
+</psalm>
diff --git a/build/psalm_baseline.xml b/build/psalm_baseline.xml
new file mode 100644
index 000000000..bd340c6bf
--- /dev/null
+++ b/build/psalm_baseline.xml
@@ -0,0 +1,17830 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="4.29.0@7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3">
+  <file src="../phpseclib/Common/Functions/Strings.php">
+    <MissingParamType occurrences="1">
+      <code>$var</code>
+    </MissingParamType>
+    <MixedArgument occurrences="8">
+      <code>$data</code>
+      <code>$data</code>
+      <code>$data</code>
+      <code>$digit</code>
+      <code>$digit</code>
+      <code>$element</code>
+      <code>$format</code>
+      <code>$length</code>
+    </MixedArgument>
+    <MixedArgumentTypeCoercion occurrences="1">
+      <code>$element</code>
+    </MixedArgumentTypeCoercion>
+    <MixedArrayAccess occurrences="1">
+      <code>$part[0]</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="8">
+      <code>$part[0]</code>
+      <code>$result[]</code>
+      <code>$result[]</code>
+      <code>$result[]</code>
+      <code>$result[]</code>
+      <code>$result[]</code>
+      <code>$result[]</code>
+      <code>$result[]</code>
+    </MixedArrayAssignment>
+    <MixedArrayOffset occurrences="1">
+      <code>$format[$i]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="9">
+      <code>$digit</code>
+      <code>$digit</code>
+      <code>$element</code>
+      <code>$i</code>
+      <code>$part</code>
+      <code>$result[]</code>
+      <code>$result[]</code>
+      <code>$temp</code>
+      <code>$temp</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>array</code>
+    </MixedInferredReturnType>
+    <MixedOperand occurrences="7">
+      <code>$i</code>
+      <code>$lower</code>
+      <code>$lower &lt; 0 ? ($lower &amp; 0x7FFFFFFFF) + 0x80000000 : $lower</code>
+      <code>$part</code>
+      <code>$temp['num']</code>
+      <code>$temp['num']</code>
+      <code>$upper</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="1">
+      <code>$result</code>
+    </MixedReturnStatement>
+    <PossiblyFalseArgument occurrences="4">
+      <code>$parts</code>
+      <code>pack('N', $temp['num'] + 1)</code>
+      <code>pack('N', $temp['num'] + 1)</code>
+      <code>unpack('Nupper/Nlower', self::shift($data, 8))</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalseIterator occurrences="3">
+      <code>$digits</code>
+      <code>$digits</code>
+      <code>$parts</code>
+    </PossiblyFalseIterator>
+    <PossiblyFalseOperand occurrences="7">
+      <code>pack('C', $element)</code>
+      <code>pack('N', $element)</code>
+      <code>pack('NN', $element / 4294967296, $element)</code>
+      <code>pack('Na*', strlen($element), $element)</code>
+      <code>pack('Na*', strlen($element), $element)</code>
+      <code>pack('Na*', strlen($element), $element)</code>
+    </PossiblyFalseOperand>
+    <PossiblyInvalidArrayAccess occurrences="8">
+      <code>$length</code>
+      <code>$parts[$i - 1]</code>
+      <code>$parts[$i - 1]</code>
+      <code>$parts[$i - 1]</code>
+      <code>$parts[$i]</code>
+      <code>$temp</code>
+      <code>$temp['num']</code>
+      <code>$temp['num']</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyUndefinedMethod occurrences="1">
+      <code>toBytes</code>
+    </PossiblyUndefinedMethod>
+    <PossiblyUndefinedStringArrayOffset occurrences="2">
+      <code>$temp['num']</code>
+      <code>$temp['num']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUnusedReturnValue occurrences="1">
+      <code>string</code>
+    </PossiblyUnusedReturnValue>
+    <RedundantConditionGivenDocblockType occurrences="2">
+      <code>$element instanceof BigInteger</code>
+      <code>$element instanceof FiniteField\Integer</code>
+    </RedundantConditionGivenDocblockType>
+  </file>
+  <file src="../phpseclib/Crypt/AES.php">
+    <PropertyNotSetInConstructor occurrences="9">
+      <code>AES</code>
+      <code>AES</code>
+      <code>AES</code>
+      <code>AES</code>
+      <code>AES</code>
+      <code>AES</code>
+      <code>AES</code>
+      <code>AES</code>
+      <code>AES</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Crypt/Blowfish.php">
+    <FalsableReturnStatement occurrences="3">
+      <code>pack("N*", $r, $l)</code>
+      <code>pack('L*', ...$cdata)</code>
+      <code>pack('N*', $r ^ $p[0], $l ^ $p[1])</code>
+    </FalsableReturnStatement>
+    <InvalidFalsableReturnType occurrences="3">
+      <code>string</code>
+      <code>string</code>
+      <code>string</code>
+    </InvalidFalsableReturnType>
+    <InvalidPropertyAssignmentValue occurrences="1"/>
+    <InvalidScalarArgument occurrences="32">
+      <code>$sbox0[(($x0 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x0 &amp; 0xFF0000) &gt;&gt; 16]</code>
+      <code>$sbox0[(($x0 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x0 &amp; 0xFF0000) &gt;&gt; 16]</code>
+      <code>$sbox0[(($x0 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x0 &amp; 0xFF0000) &gt;&gt; 16]</code>
+      <code>$sbox0[(($x0 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x0 &amp; 0xFF0000) &gt;&gt; 16]</code>
+      <code>$sbox0[(($x0 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x0 &amp; 0xFF0000) &gt;&gt; 16]</code>
+      <code>$sbox0[(($x0 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x0 &amp; 0xFF0000) &gt;&gt; 16]</code>
+      <code>$sbox0[(($x0 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x0 &amp; 0xFF0000) &gt;&gt; 16]</code>
+      <code>$sbox0[(($x0 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x0 &amp; 0xFF0000) &gt;&gt; 16]</code>
+      <code>$sbox0[(($x1 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x1 &amp; 0xFF0000) &gt;&gt; 16]</code>
+      <code>$sbox0[(($x1 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x1 &amp; 0xFF0000) &gt;&gt; 16]</code>
+      <code>$sbox0[(($x1 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x1 &amp; 0xFF0000) &gt;&gt; 16]</code>
+      <code>$sbox0[(($x1 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x1 &amp; 0xFF0000) &gt;&gt; 16]</code>
+      <code>$sbox0[(($x1 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x1 &amp; 0xFF0000) &gt;&gt; 16]</code>
+      <code>$sbox0[(($x1 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x1 &amp; 0xFF0000) &gt;&gt; 16]</code>
+      <code>$sbox0[(($x1 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x1 &amp; 0xFF0000) &gt;&gt; 16]</code>
+      <code>$sbox0[(($x1 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x1 &amp; 0xFF0000) &gt;&gt; 16]</code>
+      <code>(self::safe_intval($sbox0[(($x0 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x0 &amp; 0xFF0000) &gt;&gt; 16]) ^ $sbox2[($x0 &amp; 0xFF00) &gt;&gt; 8]) + $sbox3[$x0 &amp; 0xFF]</code>
+      <code>(self::safe_intval($sbox0[(($x0 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x0 &amp; 0xFF0000) &gt;&gt; 16]) ^ $sbox2[($x0 &amp; 0xFF00) &gt;&gt; 8]) + $sbox3[$x0 &amp; 0xFF]</code>
+      <code>(self::safe_intval($sbox0[(($x0 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x0 &amp; 0xFF0000) &gt;&gt; 16]) ^ $sbox2[($x0 &amp; 0xFF00) &gt;&gt; 8]) + $sbox3[$x0 &amp; 0xFF]</code>
+      <code>(self::safe_intval($sbox0[(($x0 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x0 &amp; 0xFF0000) &gt;&gt; 16]) ^ $sbox2[($x0 &amp; 0xFF00) &gt;&gt; 8]) + $sbox3[$x0 &amp; 0xFF]</code>
+      <code>(self::safe_intval($sbox0[(($x0 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x0 &amp; 0xFF0000) &gt;&gt; 16]) ^ $sbox2[($x0 &amp; 0xFF00) &gt;&gt; 8]) + $sbox3[$x0 &amp; 0xFF]</code>
+      <code>(self::safe_intval($sbox0[(($x0 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x0 &amp; 0xFF0000) &gt;&gt; 16]) ^ $sbox2[($x0 &amp; 0xFF00) &gt;&gt; 8]) + $sbox3[$x0 &amp; 0xFF]</code>
+      <code>(self::safe_intval($sbox0[(($x0 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x0 &amp; 0xFF0000) &gt;&gt; 16]) ^ $sbox2[($x0 &amp; 0xFF00) &gt;&gt; 8]) + $sbox3[$x0 &amp; 0xFF]</code>
+      <code>(self::safe_intval($sbox0[(($x0 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x0 &amp; 0xFF0000) &gt;&gt; 16]) ^ $sbox2[($x0 &amp; 0xFF00) &gt;&gt; 8]) + $sbox3[$x0 &amp; 0xFF]</code>
+      <code>(self::safe_intval($sbox0[(($x1 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x1 &amp; 0xFF0000) &gt;&gt; 16]) ^ $sbox2[($x1 &amp; 0xFF00) &gt;&gt; 8]) + $sbox3[$x1 &amp; 0xFF]</code>
+      <code>(self::safe_intval($sbox0[(($x1 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x1 &amp; 0xFF0000) &gt;&gt; 16]) ^ $sbox2[($x1 &amp; 0xFF00) &gt;&gt; 8]) + $sbox3[$x1 &amp; 0xFF]</code>
+      <code>(self::safe_intval($sbox0[(($x1 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x1 &amp; 0xFF0000) &gt;&gt; 16]) ^ $sbox2[($x1 &amp; 0xFF00) &gt;&gt; 8]) + $sbox3[$x1 &amp; 0xFF]</code>
+      <code>(self::safe_intval($sbox0[(($x1 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x1 &amp; 0xFF0000) &gt;&gt; 16]) ^ $sbox2[($x1 &amp; 0xFF00) &gt;&gt; 8]) + $sbox3[$x1 &amp; 0xFF]</code>
+      <code>(self::safe_intval($sbox0[(($x1 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x1 &amp; 0xFF0000) &gt;&gt; 16]) ^ $sbox2[($x1 &amp; 0xFF00) &gt;&gt; 8]) + $sbox3[$x1 &amp; 0xFF]</code>
+      <code>(self::safe_intval($sbox0[(($x1 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x1 &amp; 0xFF0000) &gt;&gt; 16]) ^ $sbox2[($x1 &amp; 0xFF00) &gt;&gt; 8]) + $sbox3[$x1 &amp; 0xFF]</code>
+      <code>(self::safe_intval($sbox0[(($x1 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x1 &amp; 0xFF0000) &gt;&gt; 16]) ^ $sbox2[($x1 &amp; 0xFF00) &gt;&gt; 8]) + $sbox3[$x1 &amp; 0xFF]</code>
+      <code>(self::safe_intval($sbox0[(($x1 &amp; -16777216) &gt;&gt; 24) &amp; 0xFF] + $sbox1[($x1 &amp; 0xFF0000) &gt;&gt; 16]) ^ $sbox2[($x1 &amp; 0xFF00) &gt;&gt; 8]) + $sbox3[$x1 &amp; 0xFF]</code>
+    </InvalidScalarArgument>
+    <LoopInvalidation occurrences="1">
+      <code>$j</code>
+    </LoopInvalidation>
+    <MixedArgument occurrences="16">
+      <code>$cdata[$j + 1]</code>
+      <code>$cdata[$j]</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$p</code>
+      <code>$p</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$sb_0</code>
+      <code>$sb_0</code>
+      <code>$sb_1</code>
+      <code>$sb_1</code>
+      <code>$sb_2</code>
+      <code>$sb_2</code>
+      <code>$sb_3</code>
+      <code>$sb_3</code>
+    </MixedArgument>
+    <MixedArgumentTypeCoercion occurrences="9">
+      <code>$p</code>
+      <code>$sbox0</code>
+      <code>$sbox1</code>
+      <code>$sbox2</code>
+      <code>$sbox3</code>
+      <code>$sha2pass</code>
+      <code>$sha2pass</code>
+      <code>$sha2salt</code>
+      <code>$sha2salt</code>
+    </MixedArgumentTypeCoercion>
+    <MixedArrayAccess occurrences="28">
+      <code>$p[$i + 1]</code>
+      <code>$p[$i - 1]</code>
+      <code>$p[$i - 1]</code>
+      <code>$p[$i]</code>
+      <code>$p[$i]</code>
+      <code>$p[$i]</code>
+      <code>$p[0]</code>
+      <code>$p[0]</code>
+      <code>$p[16]</code>
+      <code>$p[17]</code>
+      <code>$p[1]</code>
+      <code>$p[1]</code>
+      <code>$sb_0[$l &gt;&gt; 24 &amp; 0xff]</code>
+      <code>$sb_0[$r &gt;&gt; 24 &amp; 0xff]</code>
+      <code>$sb_1[$l &gt;&gt; 16 &amp; 0xff]</code>
+      <code>$sb_1[$r &gt;&gt; 16 &amp; 0xff]</code>
+      <code>$sb_2[$l &gt;&gt;  8 &amp; 0xff]</code>
+      <code>$sb_2[$r &gt;&gt;  8 &amp; 0xff]</code>
+      <code>$sb_3[$l       &amp; 0xff]</code>
+      <code>$sb_3[$r       &amp; 0xff]</code>
+      <code>$this-&gt;bctx['sb'][0]</code>
+      <code>$this-&gt;bctx['sb'][0]</code>
+      <code>$this-&gt;bctx['sb'][1]</code>
+      <code>$this-&gt;bctx['sb'][1]</code>
+      <code>$this-&gt;bctx['sb'][2]</code>
+      <code>$this-&gt;bctx['sb'][2]</code>
+      <code>$this-&gt;bctx['sb'][3]</code>
+      <code>$this-&gt;bctx['sb'][3]</code>
+    </MixedArrayAccess>
+    <MixedArrayOffset occurrences="8">
+      <code>$sb_0[$l &gt;&gt; 24 &amp; 0xff]</code>
+      <code>$sb_0[$r &gt;&gt; 24 &amp; 0xff]</code>
+      <code>$sb_1[$l &gt;&gt; 16 &amp; 0xff]</code>
+      <code>$sb_1[$r &gt;&gt; 16 &amp; 0xff]</code>
+      <code>$sb_2[$l &gt;&gt;  8 &amp; 0xff]</code>
+      <code>$sb_2[$r &gt;&gt;  8 &amp; 0xff]</code>
+      <code>$sb_3[$l       &amp; 0xff]</code>
+      <code>$sb_3[$r       &amp; 0xff]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="20">
+      <code>$data</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$p</code>
+      <code>$p</code>
+      <code>$p</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$sb_0</code>
+      <code>$sb_0</code>
+      <code>$sb_1</code>
+      <code>$sb_1</code>
+      <code>$sb_2</code>
+      <code>$sb_2</code>
+      <code>$sb_3</code>
+      <code>$sb_3</code>
+    </MixedAssignment>
+    <MixedOperand occurrences="26">
+      <code>$data</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$p[$i + 1]</code>
+      <code>$p[$i - 1]</code>
+      <code>$p[$i]</code>
+      <code>$p[$i]</code>
+      <code>$p[0]</code>
+      <code>$p[16]</code>
+      <code>$p[17]</code>
+      <code>$p[1]</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$sb_0[$l &gt;&gt; 24 &amp; 0xff]</code>
+      <code>$sb_0[$r &gt;&gt; 24 &amp; 0xff]</code>
+      <code>self::$parray[$i]</code>
+    </MixedOperand>
+    <PossiblyFalseArgument occurrences="6">
+      <code>unpack('C*', $this-&gt;key)</code>
+      <code>unpack('N*', $data = $this-&gt;encryptBlock($data))</code>
+      <code>unpack('N*', $data = $this-&gt;encryptBlock($data))</code>
+      <code>unpack('N*', $sha2pass)</code>
+      <code>unpack('N*', $sha2salt)</code>
+      <code>unpack('N*', 'OxychromaticBlowfishSwatDynamite')</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalseOperand occurrences="1">
+      <code>pack('N', $count++)</code>
+    </PossiblyFalseOperand>
+    <PossiblyInvalidArrayAccess occurrences="4">
+      <code>$in[1]</code>
+      <code>$in[1]</code>
+      <code>$in[2]</code>
+      <code>$in[2]</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyNullOperand occurrences="1">
+      <code>$this-&gt;openssl_translate_mode()</code>
+    </PossiblyNullOperand>
+    <PossiblyUndefinedIntArrayOffset occurrences="125">
+      <code>$data[0]</code>
+      <code>$data[1]</code>
+      <code>$data[2]</code>
+      <code>$data[3]</code>
+      <code>$in[1]</code>
+      <code>$in[1]</code>
+      <code>$in[2]</code>
+      <code>$in[2]</code>
+      <code>$key[0]</code>
+      <code>$key[0]</code>
+      <code>$key[10]</code>
+      <code>$key[10]</code>
+      <code>$key[11]</code>
+      <code>$key[11]</code>
+      <code>$key[12]</code>
+      <code>$key[12]</code>
+      <code>$key[13]</code>
+      <code>$key[13]</code>
+      <code>$key[14]</code>
+      <code>$key[14]</code>
+      <code>$key[15]</code>
+      <code>$key[15]</code>
+      <code>$key[1]</code>
+      <code>$key[1]</code>
+      <code>$key[2]</code>
+      <code>$key[2]</code>
+      <code>$key[3]</code>
+      <code>$key[3]</code>
+      <code>$key[4]</code>
+      <code>$key[4]</code>
+      <code>$key[5]</code>
+      <code>$key[5]</code>
+      <code>$key[6]</code>
+      <code>$key[6]</code>
+      <code>$key[7]</code>
+      <code>$key[7]</code>
+      <code>$key[8]</code>
+      <code>$key[8]</code>
+      <code>$key[9]</code>
+      <code>$key[9]</code>
+      <code>$p[0]</code>
+      <code>$p[0]</code>
+      <code>$p[0]</code>
+      <code>$p[0]</code>
+      <code>$p[10]</code>
+      <code>$p[10]</code>
+      <code>$p[10]</code>
+      <code>$p[10]</code>
+      <code>$p[11]</code>
+      <code>$p[11]</code>
+      <code>$p[11]</code>
+      <code>$p[11]</code>
+      <code>$p[12]</code>
+      <code>$p[12]</code>
+      <code>$p[12]</code>
+      <code>$p[12]</code>
+      <code>$p[13]</code>
+      <code>$p[13]</code>
+      <code>$p[13]</code>
+      <code>$p[13]</code>
+      <code>$p[14]</code>
+      <code>$p[14]</code>
+      <code>$p[14]</code>
+      <code>$p[14]</code>
+      <code>$p[15]</code>
+      <code>$p[15]</code>
+      <code>$p[15]</code>
+      <code>$p[15]</code>
+      <code>$p[16]</code>
+      <code>$p[16]</code>
+      <code>$p[16]</code>
+      <code>$p[16]</code>
+      <code>$p[17]</code>
+      <code>$p[17]</code>
+      <code>$p[17]</code>
+      <code>$p[17]</code>
+      <code>$p[1]</code>
+      <code>$p[1]</code>
+      <code>$p[1]</code>
+      <code>$p[1]</code>
+      <code>$p[2]</code>
+      <code>$p[2]</code>
+      <code>$p[2]</code>
+      <code>$p[2]</code>
+      <code>$p[3]</code>
+      <code>$p[3]</code>
+      <code>$p[3]</code>
+      <code>$p[3]</code>
+      <code>$p[4]</code>
+      <code>$p[4]</code>
+      <code>$p[4]</code>
+      <code>$p[4]</code>
+      <code>$p[5]</code>
+      <code>$p[5]</code>
+      <code>$p[5]</code>
+      <code>$p[5]</code>
+      <code>$p[6]</code>
+      <code>$p[6]</code>
+      <code>$p[6]</code>
+      <code>$p[6]</code>
+      <code>$p[7]</code>
+      <code>$p[7]</code>
+      <code>$p[7]</code>
+      <code>$p[7]</code>
+      <code>$p[8]</code>
+      <code>$p[8]</code>
+      <code>$p[8]</code>
+      <code>$p[8]</code>
+      <code>$p[9]</code>
+      <code>$p[9]</code>
+      <code>$p[9]</code>
+      <code>$p[9]</code>
+      <code>$sbox0[254]</code>
+      <code>$sbox0[254]</code>
+      <code>$sbox0[255]</code>
+      <code>$sbox0[255]</code>
+      <code>$sbox1[254]</code>
+      <code>$sbox1[254]</code>
+      <code>$sbox1[255]</code>
+      <code>$sbox1[255]</code>
+      <code>$sbox2[254]</code>
+      <code>$sbox2[254]</code>
+      <code>$sbox2[255]</code>
+      <code>$sbox2[255]</code>
+      <code>self::$sbox2[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="5">
+      <code>$this-&gt;bctx['p']</code>
+      <code>$this-&gt;bctx['p']</code>
+      <code>$this-&gt;bctx['p']</code>
+      <code>$this-&gt;bctx['sb']</code>
+      <code>$this-&gt;bctx['sb']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUnusedMethod occurrences="1">
+      <code>setupInlineCrypt</code>
+    </PossiblyUnusedMethod>
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>$bctx</code>
+      <code>$kl</code>
+      <code>Blowfish</code>
+      <code>Blowfish</code>
+      <code>Blowfish</code>
+      <code>Blowfish</code>
+      <code>Blowfish</code>
+      <code>Blowfish</code>
+      <code>Blowfish</code>
+      <code>Blowfish</code>
+      <code>Blowfish</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Crypt/ChaCha20.php">
+    <DocblockTypeContradiction occurrences="3">
+      <code>$this-&gt;key === false</code>
+      <code>$this-&gt;nonce === false</code>
+      <code>$this-&gt;oldtag === false</code>
+    </DocblockTypeContradiction>
+    <MissingReturnType occurrences="1">
+      <code>salsa20</code>
+    </MissingReturnType>
+    <MixedAssignment occurrences="352">
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x12</code>
+      <code>$x13</code>
+      <code>$x14</code>
+      <code>$x15</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x4</code>
+      <code>$x5</code>
+      <code>$x6</code>
+      <code>$x7</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$z0</code>
+      <code>$z1</code>
+      <code>$z10</code>
+      <code>$z11</code>
+      <code>$z12</code>
+      <code>$z13</code>
+      <code>$z14</code>
+      <code>$z15</code>
+      <code>$z2</code>
+      <code>$z3</code>
+      <code>$z4</code>
+      <code>$z5</code>
+      <code>$z6</code>
+      <code>$z7</code>
+      <code>$z8</code>
+      <code>$z9</code>
+    </MixedAssignment>
+    <MixedOperand occurrences="336">
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x10</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x11</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x8</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$x9</code>
+      <code>$z12</code>
+      <code>$z13</code>
+      <code>$z14</code>
+      <code>$z15</code>
+      <code>$z4</code>
+      <code>$z5</code>
+      <code>$z6</code>
+      <code>$z7</code>
+    </MixedOperand>
+    <PossiblyFalseArgument occurrences="4">
+      <code>$ciphertext</code>
+      <code>$ciphertext</code>
+      <code>$ciphertext</code>
+      <code>$plaintext</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalsePropertyAssignmentValue occurrences="3">
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+    </PossiblyFalsePropertyAssignmentValue>
+    <PossiblyInvalidArrayAccess occurrences="16">
+      <code>$x0</code>
+      <code>$x1</code>
+      <code>$x10</code>
+      <code>$x11</code>
+      <code>$x12</code>
+      <code>$x13</code>
+      <code>$x14</code>
+      <code>$x15</code>
+      <code>$x2</code>
+      <code>$x3</code>
+      <code>$x4</code>
+      <code>$x5</code>
+      <code>$x6</code>
+      <code>$x7</code>
+      <code>$x8</code>
+      <code>$x9</code>
+    </PossiblyInvalidArrayAccess>
+    <PropertyNotSetInConstructor occurrences="8">
+      <code>ChaCha20</code>
+      <code>ChaCha20</code>
+      <code>ChaCha20</code>
+      <code>ChaCha20</code>
+      <code>ChaCha20</code>
+      <code>ChaCha20</code>
+      <code>ChaCha20</code>
+      <code>ChaCha20</code>
+    </PropertyNotSetInConstructor>
+    <RedundantPropertyInitializationCheck occurrences="3">
+      <code>$this-&gt;usePoly1305 &amp;&amp; !isset($this-&gt;poly1305Key)</code>
+      <code>$this-&gt;usePoly1305 &amp;&amp; !isset($this-&gt;poly1305Key)</code>
+      <code>isset($this-&gt;poly1305Key)</code>
+    </RedundantPropertyInitializationCheck>
+    <TypeDoesNotContainType occurrences="1">
+      <code>is_string($nonce)</code>
+    </TypeDoesNotContainType>
+  </file>
+  <file src="../phpseclib/Crypt/Common/AsymmetricKey.php">
+    <ArgumentTypeCoercion occurrences="2">
+      <code>$this-&gt;format</code>
+      <code>$type</code>
+    </ArgumentTypeCoercion>
+    <ImplicitToStringCast occurrences="1">
+      <code>string</code>
+    </ImplicitToStringCast>
+    <MissingReturnType occurrences="1">
+      <code>validatePlugin</code>
+    </MissingReturnType>
+    <MixedArgument occurrences="9">
+      <code>$name</code>
+      <code>$rolen</code>
+      <code>$this-&gt;q</code>
+      <code>$this-&gt;q</code>
+      <code>$this-&gt;x</code>
+      <code>$type</code>
+      <code>$vlen - $qlen</code>
+      <code>-$rolen</code>
+      <code>self::$invisiblePlugins[static::ALGORITHM]</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="5">
+      <code>$components['comment']</code>
+      <code>$components['secret']</code>
+      <code>$components['secret']</code>
+      <code>self::$plugins[static::ALGORITHM]['Keys']</code>
+      <code>self::$plugins[static::ALGORITHM]['Keys']</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="8">
+      <code>$components['format']</code>
+      <code>$components['format']</code>
+      <code>$components['secret']</code>
+      <code>$components['secret']</code>
+      <code>self::$invisiblePlugins[static::ALGORITHM][]</code>
+      <code>self::$plugins[static::ALGORITHM][$format]</code>
+      <code>self::$plugins[static::ALGORITHM][$format]</code>
+      <code>self::$plugins[static::ALGORITHM]['Keys']</code>
+    </MixedArrayAssignment>
+    <MixedArrayOffset occurrences="11">
+      <code>self::$invisiblePlugins[static::ALGORITHM]</code>
+      <code>self::$invisiblePlugins[static::ALGORITHM]</code>
+      <code>self::$invisiblePlugins[static::ALGORITHM]</code>
+      <code>self::$plugins[static::ALGORITHM]</code>
+      <code>self::$plugins[static::ALGORITHM]</code>
+      <code>self::$plugins[static::ALGORITHM]</code>
+      <code>self::$plugins[static::ALGORITHM]</code>
+      <code>self::$plugins[static::ALGORITHM]</code>
+      <code>self::$plugins[static::ALGORITHM]</code>
+      <code>self::$plugins[static::ALGORITHM]</code>
+      <code>self::$plugins[static::ALGORITHM]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="15">
+      <code>$comment</code>
+      <code>$components</code>
+      <code>$components</code>
+      <code>$components['format']</code>
+      <code>$components['format']</code>
+      <code>$components['secret']</code>
+      <code>$components['secret']</code>
+      <code>$format</code>
+      <code>$format</code>
+      <code>$new</code>
+      <code>$new</code>
+      <code>$qlen</code>
+      <code>$qlen</code>
+      <code>$rolen</code>
+      <code>$type</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="3">
+      <code>AsymmetricKey</code>
+      <code>array</code>
+      <code>static</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="5">
+      <code>$format::load($key, $password)</code>
+      <code>$format::load($key, $password)</code>
+      <code>getLength</code>
+      <code>getLengthInBytes</code>
+      <code>getLengthInBytes</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="3">
+      <code>$qlen</code>
+      <code>static::ALGORITHM</code>
+      <code>static::ALGORITHM</code>
+    </MixedOperand>
+    <MixedPropertyAssignment occurrences="3">
+      <code>$new</code>
+      <code>$new</code>
+      <code>$new</code>
+    </MixedPropertyAssignment>
+    <MixedReturnStatement occurrences="3">
+      <code>self::$plugins[static::ALGORITHM]['Keys']</code>
+    </MixedReturnStatement>
+    <PossiblyInvalidArgument occurrences="1">
+      <code>$key</code>
+    </PossiblyInvalidArgument>
+    <PossiblyInvalidCast occurrences="1">
+      <code>$key</code>
+    </PossiblyInvalidCast>
+    <PossiblyUndefinedVariable occurrences="2">
+      <code>$format</code>
+      <code>$format</code>
+    </PossiblyUndefinedVariable>
+    <PossiblyUnusedMethod occurrences="9">
+      <code>computek</code>
+      <code>getComment</code>
+      <code>getSupportedKeyFormats</code>
+      <code>loadParameters</code>
+      <code>loadParametersFormat</code>
+      <code>loadPrivateKey</code>
+      <code>loadPrivateKeyFormat</code>
+      <code>loadPublicKey</code>
+      <code>loadPublicKeyFormat</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedReturnValue occurrences="1">
+      <code>array</code>
+    </PossiblyUnusedReturnValue>
+    <PropertyNotSetInConstructor occurrences="1">
+      <code>$format</code>
+    </PropertyNotSetInConstructor>
+    <RedundantPropertyInitializationCheck occurrences="1">
+      <code>isset(self::$zero)</code>
+    </RedundantPropertyInitializationCheck>
+    <UndefinedConstant occurrences="18">
+      <code>static::ALGORITHM</code>
+      <code>static::ALGORITHM</code>
+      <code>static::ALGORITHM</code>
+      <code>static::ALGORITHM</code>
+      <code>static::ALGORITHM</code>
+      <code>static::ALGORITHM</code>
+      <code>static::ALGORITHM</code>
+      <code>static::ALGORITHM</code>
+      <code>static::ALGORITHM</code>
+      <code>static::ALGORITHM</code>
+      <code>static::ALGORITHM</code>
+      <code>static::ALGORITHM</code>
+      <code>static::ALGORITHM</code>
+      <code>static::ALGORITHM</code>
+      <code>static::ALGORITHM</code>
+      <code>static::ALGORITHM</code>
+      <code>static::ALGORITHM</code>
+      <code>static::ALGORITHM</code>
+    </UndefinedConstant>
+    <UndefinedMethod occurrences="2">
+      <code>static::onLoad($components)</code>
+      <code>static::onLoad($components)</code>
+    </UndefinedMethod>
+    <UndefinedThisPropertyFetch occurrences="5">
+      <code>$this-&gt;q</code>
+      <code>$this-&gt;q</code>
+      <code>$this-&gt;q</code>
+      <code>$this-&gt;q</code>
+      <code>$this-&gt;x</code>
+    </UndefinedThisPropertyFetch>
+    <UndefinedVariable occurrences="1">
+      <code>$name</code>
+    </UndefinedVariable>
+  </file>
+  <file src="../phpseclib/Crypt/Common/Formats/Keys/JWK.php">
+    <FalsableReturnStatement occurrences="1">
+      <code>json_encode(['keys' =&gt; [$key + $options]])</code>
+    </FalsableReturnStatement>
+    <InvalidFalsableReturnType occurrences="1">
+      <code>string</code>
+    </InvalidFalsableReturnType>
+    <MixedArgument occurrences="1">
+      <code>$key-&gt;keys</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="1">
+      <code>$key-&gt;keys[0]</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="1">
+      <code>$key</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>\stdClass</code>
+    </MixedInferredReturnType>
+    <MixedPropertyFetch occurrences="2">
+      <code>$key-&gt;keys</code>
+      <code>$key-&gt;kty</code>
+    </MixedPropertyFetch>
+    <MixedReturnStatement occurrences="2">
+      <code>$key</code>
+      <code>$key-&gt;keys[0]</code>
+    </MixedReturnStatement>
+    <PossiblyNullArgument occurrences="1">
+      <code>$key</code>
+    </PossiblyNullArgument>
+  </file>
+  <file src="../phpseclib/Crypt/Common/Formats/Keys/OpenSSH.php">
+    <InvalidArgument occurrences="3">
+      <code>$salt</code>
+      <code>32</code>
+      <code>32</code>
+    </InvalidArgument>
+    <MixedArgument occurrences="14">
+      <code>$checkint</code>
+      <code>$checkint</code>
+      <code>$comment</code>
+      <code>$kdfoptions</code>
+      <code>$paddedKey</code>
+      <code>$publicKey</code>
+      <code>$rounds</code>
+      <code>$rounds</code>
+      <code>$rounds</code>
+      <code>$salt</code>
+      <code>$type</code>
+      <code>$type</code>
+      <code>static::$types</code>
+      <code>static::$types</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="3">
+      <code>$comment</code>
+      <code>$paddedKey</code>
+      <code>$rounds</code>
+    </MixedAssignment>
+    <MixedMethodCall occurrences="1">
+      <code>decrypt</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="3">
+      <code>$asciiType</code>
+      <code>$ciphername</code>
+      <code>$kdfname</code>
+    </MixedOperand>
+    <PossiblyInvalidArgument occurrences="1">
+      <code>$rounds</code>
+    </PossiblyInvalidArgument>
+    <PossiblyInvalidArrayAccess occurrences="1">
+      <code>$checkint</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyNullArgument occurrences="2">
+      <code>$key</code>
+      <code>$password</code>
+    </PossiblyNullArgument>
+    <PossiblyUndefinedIntArrayOffset occurrences="1">
+      <code>$parts[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUnusedMethod occurrences="1">
+      <code>setBinaryOutput</code>
+    </PossiblyUnusedMethod>
+    <RedundantConditionGivenDocblockType occurrences="1">
+      <code>is_string($password)</code>
+    </RedundantConditionGivenDocblockType>
+    <ReferenceConstraintViolation occurrences="2">
+      <code>$key</code>
+      <code>$key</code>
+    </ReferenceConstraintViolation>
+    <UndefinedPropertyFetch occurrences="2">
+      <code>static::$types</code>
+      <code>static::$types</code>
+    </UndefinedPropertyFetch>
+  </file>
+  <file src="../phpseclib/Crypt/Common/Formats/Keys/PKCS.php">
+    <PossiblyUnusedMethod occurrences="3">
+      <code>requireAny</code>
+      <code>requireDER</code>
+      <code>requirePEM</code>
+    </PossiblyUnusedMethod>
+  </file>
+  <file src="../phpseclib/Crypt/Common/Formats/Keys/PKCS1.php">
+    <DocblockTypeContradiction occurrences="1">
+      <code>!is_string($password)</code>
+    </DocblockTypeContradiction>
+    <InvalidArgument occurrences="3">
+      <code>self::getEncryptionMode($matches[1])</code>
+      <code>self::getEncryptionMode($matches[1])</code>
+      <code>self::getEncryptionMode($matches[2])</code>
+    </InvalidArgument>
+    <InvalidReturnStatement occurrences="1">
+      <code>$mode</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="1">
+      <code>int</code>
+    </InvalidReturnType>
+    <MixedArgument occurrences="1">
+      <code>$encryptionAlgorithm</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="1">
+      <code>$encryptionAlgorithm</code>
+    </MixedAssignment>
+    <PossiblyNullArgument occurrences="2">
+      <code>$key</code>
+      <code>$password</code>
+    </PossiblyNullArgument>
+    <PossiblyUndefinedIntArrayOffset occurrences="6">
+      <code>$matches[1]</code>
+      <code>$matches[1]</code>
+      <code>$matches[1]</code>
+      <code>$matches[1]</code>
+      <code>$matches[2]</code>
+      <code>$matches[2]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <RedundantCondition occurrences="1">
+      <code>$decoded !== false</code>
+    </RedundantCondition>
+    <TypeDoesNotContainType occurrences="1">
+      <code>$ciphertext === false</code>
+    </TypeDoesNotContainType>
+  </file>
+  <file src="../phpseclib/Crypt/Common/Formats/Keys/PKCS8.php">
+    <InvalidArgument occurrences="2">
+      <code>$hash</code>
+      <code>$salt</code>
+    </InvalidArgument>
+    <MissingParamType occurrences="2">
+      <code>$params</code>
+      <code>$params</code>
+    </MissingParamType>
+    <MixedArgument occurrences="41">
+      <code>$algorithm</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decrypted['encryptionAlgorithm']['parameters']</code>
+      <code>$decrypted['encryptionAlgorithm']['parameters']</code>
+      <code>$decrypted['encryptionAlgorithm']['parameters']</code>
+      <code>$encryptionAlgorithm</code>
+      <code>$encryptionScheme</code>
+      <code>$encryptionScheme['algorithm']</code>
+      <code>$encryptionScheme['parameters']</code>
+      <code>$iterationCount</code>
+      <code>$kdf['parameters']-&gt;element</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$keyDerivationFunc['parameters']</code>
+      <code>$prf</code>
+      <code>$prf['algorithm']</code>
+      <code>$private['publicKey']</code>
+      <code>$private['publicKey'][0]</code>
+      <code>$public['publicKey']</code>
+      <code>$public['publicKey'][0]</code>
+      <code>$r['encryptionAlgorithm']['parameters']-&gt;element</code>
+      <code>$temp['length']</code>
+      <code>$temp['length']</code>
+      <code>$temp['start']</code>
+      <code>$temp['start']</code>
+      <code>$temp[0]</code>
+      <code>$temp[0]</code>
+      <code>$temp[0]</code>
+      <code>$temp[0]</code>
+      <code>$temp[0]</code>
+      <code>static::OID_NAME</code>
+      <code>static::OID_NAME</code>
+      <code>static::OID_NAME</code>
+      <code>static::OID_VALUE</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="36">
+      <code>$decoded[0]['content']</code>
+      <code>$decoded[0]['content']</code>
+      <code>$decrypted['encryptedData']</code>
+      <code>$decrypted['encryptedData']</code>
+      <code>$decrypted['encryptionAlgorithm']['algorithm']</code>
+      <code>$decrypted['encryptionAlgorithm']['parameters']</code>
+      <code>$decrypted['encryptionAlgorithm']['parameters']</code>
+      <code>$decrypted['encryptionAlgorithm']['parameters']</code>
+      <code>$encryptionScheme['algorithm']</code>
+      <code>$encryptionScheme['algorithm']</code>
+      <code>$encryptionScheme['parameters']</code>
+      <code>$encryptionScheme['parameters']</code>
+      <code>$kdf['algorithm']</code>
+      <code>$kdf['parameters']</code>
+      <code>$keyDerivationFunc['algorithm']</code>
+      <code>$keyDerivationFunc['algorithm']</code>
+      <code>$keyDerivationFunc['parameters']</code>
+      <code>$prf['algorithm']</code>
+      <code>$prf['algorithm']</code>
+      <code>$private['privateKeyAlgorithm']['algorithm']</code>
+      <code>$private['privateKeyAlgorithm']['algorithm']</code>
+      <code>$private['privateKeyAlgorithm']['algorithm']</code>
+      <code>$private['privateKeyAlgorithm']['algorithm']</code>
+      <code>$private['publicKey'][0]</code>
+      <code>$private['publicKey'][0]</code>
+      <code>$public['publicKey'][0]</code>
+      <code>$public['publicKeyAlgorithm']['algorithm']</code>
+      <code>$public['publicKeyAlgorithm']['algorithm']</code>
+      <code>$public['publicKeyAlgorithm']['algorithm']</code>
+      <code>$public['publicKeyAlgorithm']['algorithm']</code>
+      <code>$r['encryptionAlgorithm']['algorithm']</code>
+      <code>$r['encryptionAlgorithm']['parameters']</code>
+      <code>$temp['length']</code>
+      <code>$temp['length']</code>
+      <code>$temp['start']</code>
+      <code>$temp['start']</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="5">
+      <code>$kdf['parameters']</code>
+      <code>$meta['meta']</code>
+      <code>$meta['meta']</code>
+      <code>$meta['meta']</code>
+      <code>$r['encryptionAlgorithm']['parameters']</code>
+    </MixedArrayAssignment>
+    <MixedArrayOffset occurrences="1">
+      <code>[static::OID_NAME =&gt; static::OID_VALUE]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="16">
+      <code>$algorithm</code>
+      <code>$encryptionAlgorithm</code>
+      <code>$encryptionScheme</code>
+      <code>$iterationCount</code>
+      <code>$kdf</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key['privateKeyAlgorithm']['parameters']</code>
+      <code>$key['publicKeyAlgorithm']['parameters']</code>
+      <code>$meta['meta']['algorithm']</code>
+      <code>$meta['meta']['cipher']</code>
+      <code>$meta['meta']['keyDerivationFunc']</code>
+      <code>$meta['meta']['prf']</code>
+      <code>$prf</code>
+      <code>$temp</code>
+      <code>$temp</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="2">
+      <code>array</code>
+      <code>array</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="11">
+      <code>decrypt</code>
+      <code>decrypt</code>
+      <code>setIV</code>
+      <code>setIV</code>
+      <code>setKeyLength</code>
+      <code>setPassword</code>
+      <code>setPassword</code>
+      <code>toString</code>
+      <code>toString</code>
+      <code>toString</code>
+      <code>toString</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="7">
+      <code>$meta</code>
+      <code>$private['privateKeyAlgorithm']['algorithm']</code>
+      <code>$private['privateKeyAlgorithm']['algorithm']</code>
+      <code>$public['publicKeyAlgorithm']['algorithm']</code>
+      <code>$public['publicKeyAlgorithm']['algorithm']</code>
+      <code>static::OID_NAME</code>
+      <code>static::OID_NAME</code>
+    </MixedOperand>
+    <MixedPropertyFetch occurrences="2">
+      <code>$kdf['parameters']-&gt;element</code>
+      <code>$r['encryptionAlgorithm']['parameters']-&gt;element</code>
+    </MixedPropertyFetch>
+    <MixedReturnStatement occurrences="2">
+      <code>$private + $meta</code>
+      <code>$r['encryptionAlgorithm']</code>
+    </MixedReturnStatement>
+    <PossiblyInvalidArgument occurrences="6">
+      <code>$key</code>
+      <code>$params</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>ASN1::asn1map($temp[0], Maps\PBEParameter::MAP)</code>
+      <code>ASN1::asn1map($temp[0], Maps\RC2CBCParameter::MAP)</code>
+    </PossiblyInvalidArgument>
+    <PossiblyInvalidArrayAccess occurrences="1">
+      <code>$r['encryptionAlgorithm']['parameters']['keyDerivationFunc']</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyInvalidArrayOffset occurrences="1">
+      <code>$r['encryptionAlgorithm']['parameters']['keyDerivationFunc']</code>
+    </PossiblyInvalidArrayOffset>
+    <PossiblyInvalidCast occurrences="1">
+      <code>$key</code>
+    </PossiblyInvalidCast>
+    <PossiblyNullArgument occurrences="1">
+      <code>$kdf['parameters']-&gt;element</code>
+    </PossiblyNullArgument>
+    <PossiblyNullArrayAccess occurrences="3">
+      <code>$kdf['algorithm']</code>
+      <code>$kdf['parameters']</code>
+      <code>$r['encryptionAlgorithm']['parameters']['keyDerivationFunc']</code>
+    </PossiblyNullArrayAccess>
+    <PossiblyNullPropertyFetch occurrences="1">
+      <code>$kdf['parameters']-&gt;element</code>
+    </PossiblyNullPropertyFetch>
+    <PossiblyNullReference occurrences="1">
+      <code>$r['encryptionAlgorithm']['parameters']</code>
+    </PossiblyNullReference>
+    <PossiblyUndefinedIntArrayOffset occurrences="12">
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$matches[1]</code>
+      <code>$matches[1]</code>
+      <code>$temp[0]</code>
+      <code>$temp[0]</code>
+      <code>$temp[0]</code>
+      <code>$temp[0]</code>
+      <code>$temp[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="16">
+      <code>$decrypted['encryptionAlgorithm']</code>
+      <code>$private['privateKeyAlgorithm']</code>
+      <code>$private['privateKeyAlgorithm']</code>
+      <code>$private['privateKeyAlgorithm']</code>
+      <code>$private['privateKeyAlgorithm']</code>
+      <code>$public['publicKey']</code>
+      <code>$public['publicKey']</code>
+      <code>$public['publicKey']</code>
+      <code>$public['publicKeyAlgorithm']</code>
+      <code>$public['publicKeyAlgorithm']</code>
+      <code>$public['publicKeyAlgorithm']</code>
+      <code>$public['publicKeyAlgorithm']</code>
+      <code>$r['encryptionAlgorithm']</code>
+      <code>$r['encryptionAlgorithm']</code>
+      <code>$r['encryptionAlgorithm']</code>
+      <code>$r['encryptionAlgorithm']['parameters']['keyDerivationFunc']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUndefinedVariable occurrences="2">
+      <code>$iv</code>
+      <code>$salt</code>
+    </PossiblyUndefinedVariable>
+    <PossiblyUnusedMethod occurrences="1">
+      <code>setIterationCount</code>
+    </PossiblyUnusedMethod>
+    <RedundantCondition occurrences="1">
+      <code>$decoded !== false</code>
+    </RedundantCondition>
+    <RedundantConditionGivenDocblockType occurrences="2">
+      <code>!empty($password) &amp;&amp; is_string($password)</code>
+      <code>is_string($password)</code>
+    </RedundantConditionGivenDocblockType>
+    <TypeDoesNotContainType occurrences="1">
+      <code>Strings::is_stringable($key)</code>
+    </TypeDoesNotContainType>
+    <UndefinedConstant occurrences="17">
+      <code>static::OID_NAME</code>
+      <code>static::OID_NAME</code>
+      <code>static::OID_NAME</code>
+      <code>static::OID_NAME</code>
+      <code>static::OID_NAME</code>
+      <code>static::OID_NAME</code>
+      <code>static::OID_NAME</code>
+      <code>static::OID_NAME</code>
+      <code>static::OID_NAME</code>
+      <code>static::OID_NAME</code>
+      <code>static::OID_NAME</code>
+      <code>static::OID_NAME</code>
+      <code>static::OID_NAME</code>
+      <code>static::OID_NAME</code>
+      <code>static::OID_NAME</code>
+      <code>static::OID_VALUE</code>
+      <code>static::OID_VALUE</code>
+    </UndefinedConstant>
+    <UndefinedMethod occurrences="1">
+      <code>$r['encryptionAlgorithm']['parameters']</code>
+    </UndefinedMethod>
+    <UndefinedPropertyAssignment occurrences="1">
+      <code>static::$childOIDsLoaded</code>
+    </UndefinedPropertyAssignment>
+  </file>
+  <file src="../phpseclib/Crypt/Common/Formats/Keys/PuTTY.php">
+    <MixedArgument occurrences="28">
+      <code>$comment</code>
+      <code>$hash-&gt;hash($source)</code>
+      <code>$hash-&gt;hash($source)</code>
+      <code>$hashkey</code>
+      <code>$hashkey</code>
+      <code>$hashkey</code>
+      <code>$key</code>
+      <code>$key[$offset + $privateLength]</code>
+      <code>$key[$offset++]</code>
+      <code>$key[$offset++]</code>
+      <code>$key[$offset++]</code>
+      <code>$key[$offset++]</code>
+      <code>$key[$offset++]</code>
+      <code>$key[$offset++]</code>
+      <code>$length</code>
+      <code>$offset</code>
+      <code>$password</code>
+      <code>$password</code>
+      <code>$private</code>
+      <code>$private</code>
+      <code>$private</code>
+      <code>$public</code>
+      <code>$symiv</code>
+      <code>$symkey</code>
+      <code>array_slice($key, $offset, $privateLength)</code>
+      <code>array_slice($key, 4, $publicLength)</code>
+      <code>static::$types</code>
+      <code>static::$types</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="8">
+      <code>$key[$offset + $privateLength]</code>
+      <code>$key[$offset++]</code>
+      <code>$key[$offset++]</code>
+      <code>$key[$offset++]</code>
+      <code>$key[$offset++]</code>
+      <code>$key[$offset++]</code>
+      <code>$key[$offset++]</code>
+      <code>static::$types[0]</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="3">
+      <code>$components['comment']</code>
+      <code>$components['private']</code>
+      <code>$components['public']</code>
+    </MixedArrayAssignment>
+    <MixedArrayOffset occurrences="7">
+      <code>$key[$offset + $privateLength]</code>
+      <code>$key[$offset++]</code>
+      <code>$key[$offset++]</code>
+      <code>$key[$offset++]</code>
+      <code>$key[$offset++]</code>
+      <code>$key[$offset++]</code>
+      <code>$key[$offset++]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="15">
+      <code>$comment</code>
+      <code>$components</code>
+      <code>$components</code>
+      <code>$components['private']</code>
+      <code>$mac</code>
+      <code>$offset</code>
+      <code>$offset</code>
+      <code>$offset</code>
+      <code>$offset</code>
+      <code>$offset</code>
+      <code>$offset</code>
+      <code>$offset</code>
+      <code>$private</code>
+      <code>$private</code>
+      <code>$version</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>array|false</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="11">
+      <code>decrypt</code>
+      <code>disablePadding</code>
+      <code>disablePadding</code>
+      <code>encrypt</code>
+      <code>hash</code>
+      <code>hash</code>
+      <code>hash</code>
+      <code>setIV</code>
+      <code>setIV</code>
+      <code>setKey</code>
+      <code>setKey</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="13">
+      <code>$components</code>
+      <code>$hashkey</code>
+      <code>$key</code>
+      <code>$offset</code>
+      <code>$offset</code>
+      <code>$offset</code>
+      <code>$offset</code>
+      <code>$offset</code>
+      <code>$offset</code>
+      <code>$offset</code>
+      <code>$publicLength</code>
+      <code>$source</code>
+      <code>static::$types[0]</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="2">
+      <code>$components</code>
+      <code>$components</code>
+    </MixedReturnStatement>
+    <PossiblyFalseArgument occurrences="8">
+      <code>$key</code>
+      <code>$key</code>
+      <code>$lines</code>
+      <code>$lines</code>
+      <code>$password</code>
+      <code>$password</code>
+      <code>$temp</code>
+      <code>unpack('Nlength', Strings::shift($public, 4))</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalseOperand occurrences="1">
+      <code>$password</code>
+    </PossiblyFalseOperand>
+    <PossiblyInvalidArrayAccess occurrences="6">
+      <code>$key[0]</code>
+      <code>$key[1]</code>
+      <code>$key[2]</code>
+      <code>$key[3]</code>
+      <code>$lines[0]</code>
+      <code>$lines[count($lines) - 1]</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyNullArgument occurrences="10">
+      <code>preg_replace('#Argon2-Memory: (\d+)#', '$1', $key[$offset++])</code>
+      <code>preg_replace('#Argon2-Parallelism: (\d+)#', '$1', $key[$offset++])</code>
+      <code>preg_replace('#Argon2-Passes: (\d+)#', '$1', $key[$offset++])</code>
+      <code>preg_replace('#Argon2-Salt: ([0-9a-f]+)#', '$1', $key[$offset++])</code>
+      <code>preg_replace('#Comment: (.+)#', '$1', $key[2])</code>
+      <code>preg_replace('#Encryption: (.+)#', '$1', $key[1])</code>
+      <code>preg_replace('#Key-Derivation: (.*)#', '$1', $key[$offset++])</code>
+      <code>preg_replace('#Private-Lines: (\d+)#', '$1', $key[$offset++])</code>
+      <code>preg_replace('#Private-MAC: (.+)#', '$1', $key[$offset + $privateLength])</code>
+      <code>preg_replace('#Public-Lines: (\d+)#', '$1', $key[3])</code>
+    </PossiblyNullArgument>
+    <PossiblyUndefinedIntArrayOffset occurrences="6">
+      <code>$key[1]</code>
+      <code>$key[2]</code>
+      <code>$key[3]</code>
+      <code>$match[1]</code>
+      <code>$match[2]</code>
+      <code>$match[2]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="1">
+      <code>$values['comment']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUndefinedVariable occurrences="6">
+      <code>$hash</code>
+      <code>$hash</code>
+      <code>$symiv</code>
+      <code>$symiv</code>
+      <code>$symkey</code>
+      <code>$symkey</code>
+    </PossiblyUndefinedVariable>
+    <PossiblyUnusedMethod occurrences="1">
+      <code>setVersion</code>
+    </PossiblyUnusedMethod>
+    <UndefinedConstant occurrences="1">
+      <code>static::PUBLIC_HANDLER</code>
+    </UndefinedConstant>
+    <UndefinedPropertyFetch occurrences="2">
+      <code>static::$types</code>
+      <code>static::$types</code>
+    </UndefinedPropertyFetch>
+    <UnusedVariable occurrences="1">
+      <code>$mac</code>
+    </UnusedVariable>
+  </file>
+  <file src="../phpseclib/Crypt/Common/Formats/Signature/Raw.php">
+    <InvalidReturnStatement occurrences="1">
+      <code>compact('r', 's')</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="1">
+      <code>string</code>
+    </InvalidReturnType>
+    <PossiblyUndefinedStringArrayOffset occurrences="4">
+      <code>$sig['r']</code>
+      <code>$sig['r']</code>
+      <code>$sig['s']</code>
+      <code>$sig['s']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUnusedMethod occurrences="2">
+      <code>load</code>
+      <code>save</code>
+    </PossiblyUnusedMethod>
+    <TypeDoesNotContainType occurrences="2">
+      <code>!is_array($sig)</code>
+      <code>!isset($sig['r']) || !isset($sig['s'])</code>
+    </TypeDoesNotContainType>
+  </file>
+  <file src="../phpseclib/Crypt/Common/PrivateKey.php">
+    <MissingParamType occurrences="1">
+      <code>$message</code>
+    </MissingParamType>
+    <MissingReturnType occurrences="2">
+      <code>getPublicKey</code>
+      <code>sign</code>
+    </MissingReturnType>
+  </file>
+  <file src="../phpseclib/Crypt/Common/PublicKey.php">
+    <MissingParamType occurrences="3">
+      <code>$algorithm</code>
+      <code>$message</code>
+      <code>$signature</code>
+    </MissingParamType>
+    <MissingReturnType occurrences="2">
+      <code>getFingerprint</code>
+      <code>verify</code>
+    </MissingReturnType>
+    <PossiblyUnusedMethod occurrences="1">
+      <code>verify</code>
+    </PossiblyUnusedMethod>
+  </file>
+  <file src="../phpseclib/Crypt/Common/StreamCipher.php">
+    <PossiblyUnusedReturnValue occurrences="1">
+      <code>StreamCipher</code>
+    </PossiblyUnusedReturnValue>
+    <PropertyNotSetInConstructor occurrences="9">
+      <code>StreamCipher</code>
+      <code>StreamCipher</code>
+      <code>StreamCipher</code>
+      <code>StreamCipher</code>
+      <code>StreamCipher</code>
+      <code>StreamCipher</code>
+      <code>StreamCipher</code>
+      <code>StreamCipher</code>
+      <code>StreamCipher</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Crypt/Common/SymmetricKey.php">
+    <DocblockTypeContradiction occurrences="8">
+      <code>!$this-&gt;h</code>
+      <code>!$this-&gt;h</code>
+      <code>$this-&gt;iv === false</code>
+      <code>$this-&gt;key === false</code>
+      <code>$this-&gt;newtag === false</code>
+      <code>$this-&gt;nonce === false</code>
+      <code>$this-&gt;oldtag === false</code>
+      <code>is_int($x)</code>
+    </DocblockTypeContradiction>
+    <FalsableReturnStatement occurrences="6">
+      <code>$ciphertext</code>
+      <code>$ciphertext</code>
+      <code>$ciphertext</code>
+      <code>$result</code>
+      <code>openssl_encrypt($plaintext, $this-&gt;cipher_name_openssl, $this-&gt;key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING)</code>
+      <code>openssl_encrypt($plaintext, $this-&gt;cipher_name_openssl, $this-&gt;key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING)</code>
+    </FalsableReturnStatement>
+    <InvalidArgument occurrences="2">
+      <code>$func_args[0]</code>
+      <code>$salt</code>
+    </InvalidArgument>
+    <InvalidArrayAccess occurrences="2">
+      <code>$xor[0]</code>
+      <code>$xor[0]</code>
+    </InvalidArrayAccess>
+    <InvalidCast occurrences="1">
+      <code>$salt</code>
+    </InvalidCast>
+    <InvalidFalsableReturnType occurrences="1">
+      <code>string</code>
+    </InvalidFalsableReturnType>
+    <InvalidFunctionCall occurrences="2">
+      <code>$inline('decrypt', $ciphertext)</code>
+      <code>$inline('encrypt', $plaintext)</code>
+    </InvalidFunctionCall>
+    <InvalidPropertyAssignmentValue occurrences="1">
+      <code>$length &gt;&gt; 3</code>
+    </InvalidPropertyAssignmentValue>
+    <InvalidReturnStatement occurrences="1">
+      <code>PHP_INT_SIZE == 4 &amp;&amp; PHP_VERSION_ID &gt;= 80100 ? intval($x) : $x</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="1">
+      <code>int</code>
+    </InvalidReturnType>
+    <MissingReturnType occurrences="1">
+      <code>setupKey</code>
+    </MissingReturnType>
+    <MixedArgument occurrences="61">
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['xor']</code>
+      <code>$buffer['xor']</code>
+      <code>$buffer['xor']</code>
+      <code>$buffer['xor']</code>
+      <code>$buffer['xor']</code>
+      <code>$buffer['xor']</code>
+      <code>$buffer['xor']</code>
+      <code>$buffer['xor']</code>
+      <code>$ciphertext</code>
+      <code>$dkLen</code>
+      <code>$dkLen</code>
+      <code>$dkLen</code>
+      <code>$dkLen</code>
+      <code>$dkLen &gt;&gt; 1</code>
+      <code>$dkLen &gt;&gt; 1</code>
+      <code>$i</code>
+      <code>$i</code>
+      <code>$i</code>
+      <code>$i</code>
+      <code>$i</code>
+      <code>$i</code>
+      <code>$i</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$keylen</code>
+      <code>$keylen</code>
+      <code>$keylen + $this-&gt;block_size</code>
+      <code>$len</code>
+      <code>$len</code>
+      <code>$one</code>
+      <code>$orig_pos</code>
+      <code>$orig_pos</code>
+      <code>$orig_pos</code>
+      <code>$orig_pos</code>
+      <code>$overflow</code>
+      <code>$overflow</code>
+      <code>$plaintext</code>
+      <code>$reverseMap[$engine]</code>
+      <code>$this-&gt;openssl_options</code>
+      <code>$this-&gt;openssl_options</code>
+      <code>-$overflow</code>
+      <code>-$overflow</code>
+      <code>-$overflow</code>
+      <code>-$overflow</code>
+      <code>-$overflow</code>
+      <code>-$overflow</code>
+      <code>-$overflow - $this-&gt;block_size</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="1">
+      <code>$reverseMap[$engine]</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="44">
+      <code>$bindedClosure</code>
+      <code>$ciphertext</code>
+      <code>$decrypt_block</code>
+      <code>$dkLen</code>
+      <code>$encrypt_block</code>
+      <code>$i</code>
+      <code>$i</code>
+      <code>$i</code>
+      <code>$i</code>
+      <code>$init_crypt</code>
+      <code>$init_decrypt</code>
+      <code>$init_encrypt</code>
+      <code>$key_length</code>
+      <code>$keylen</code>
+      <code>$len</code>
+      <code>$len</code>
+      <code>$len</code>
+      <code>$len</code>
+      <code>$len</code>
+      <code>$len</code>
+      <code>$max</code>
+      <code>$max</code>
+      <code>$max</code>
+      <code>$max</code>
+      <code>$orig_pos</code>
+      <code>$orig_pos</code>
+      <code>$orig_pos</code>
+      <code>$orig_pos</code>
+      <code>$overflow</code>
+      <code>$overflow</code>
+      <code>$pos</code>
+      <code>$pos</code>
+      <code>$pos</code>
+      <code>$pos</code>
+      <code>$pos</code>
+      <code>$pos</code>
+      <code>$pos</code>
+      <code>$pos</code>
+      <code>$pos</code>
+      <code>$pos</code>
+      <code>$pos</code>
+      <code>$pos</code>
+      <code>$size</code>
+      <code>$this-&gt;preferredEngine</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="3">
+      <code>int</code>
+      <code>string</code>
+      <code>string</code>
+    </MixedInferredReturnType>
+    <MixedOperand occurrences="75">
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['xor']</code>
+      <code>$buffer['xor']</code>
+      <code>$buffer['xor']</code>
+      <code>$buffer['xor']</code>
+      <code>$buffer['xor']</code>
+      <code>$decrypt_block</code>
+      <code>$decrypt_block</code>
+      <code>$decrypt_block</code>
+      <code>$dkLen</code>
+      <code>$dkLen</code>
+      <code>$encrypt_block</code>
+      <code>$encrypt_block</code>
+      <code>$encrypt_block</code>
+      <code>$encrypt_block</code>
+      <code>$encrypt_block</code>
+      <code>$encrypt_block</code>
+      <code>$encrypt_block</code>
+      <code>$encrypt_block</code>
+      <code>$encrypt_block</code>
+      <code>$encrypt_block</code>
+      <code>$encrypt_block</code>
+      <code>$encrypt_block</code>
+      <code>$encrypt_block</code>
+      <code>$encrypt_block</code>
+      <code>$encrypt_block</code>
+      <code>$encrypt_block</code>
+      <code>$encrypt_block</code>
+      <code>$encrypt_block</code>
+      <code>$encrypt_block</code>
+      <code>$init_decrypt</code>
+      <code>$init_decrypt</code>
+      <code>$init_decrypt</code>
+      <code>$init_encrypt</code>
+      <code>$init_encrypt</code>
+      <code>$init_encrypt</code>
+      <code>$init_encrypt</code>
+      <code>$init_encrypt</code>
+      <code>$init_encrypt</code>
+      <code>$init_encrypt</code>
+      <code>$init_encrypt</code>
+      <code>$init_encrypt</code>
+      <code>$init_encrypt</code>
+      <code>$init_encrypt</code>
+      <code>$init_encrypt</code>
+      <code>$init_encrypt</code>
+      <code>$key_length</code>
+      <code>$keylen</code>
+      <code>$len</code>
+      <code>$len</code>
+      <code>$len</code>
+      <code>$len</code>
+      <code>$max</code>
+      <code>$max</code>
+      <code>$max</code>
+      <code>$max</code>
+      <code>$overflow</code>
+      <code>$overflow</code>
+      <code>$pos</code>
+      <code>$pos</code>
+      <code>$pos</code>
+      <code>$pos</code>
+      <code>$pos</code>
+      <code>$pos</code>
+      <code>$pos</code>
+      <code>$pos</code>
+      <code>$this-&gt;key_length</code>
+      <code>$xor[0]</code>
+      <code>$xor[0]</code>
+      <code>-$overflow</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="6">
+      <code>$inline('decrypt', $ciphertext)</code>
+      <code>$inline('encrypt', $plaintext)</code>
+      <code>$plaintext</code>
+      <code>$this-&gt;key_length &lt;&lt; 3</code>
+      <code>$this-&gt;paddable ? $this-&gt;unpad($plaintext) : $plaintext</code>
+      <code>$x</code>
+    </MixedReturnStatement>
+    <PossiblyFalseArgument occurrences="9">
+      <code>$ciphertext</code>
+      <code>$ciphertext</code>
+      <code>$ciphertext</code>
+      <code>$ciphertext</code>
+      <code>$ciphertext</code>
+      <code>$encryptIV</code>
+      <code>$encrypted</code>
+      <code>$iv</code>
+      <code>$result</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalseOperand occurrences="7">
+      <code>openssl_decrypt($ciphertext, $this-&gt;cipher_name_openssl, $this-&gt;key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $iv)</code>
+      <code>openssl_decrypt(substr($ciphertext, 0, -$overflow), $this-&gt;cipher_name_openssl, $this-&gt;key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $iv)</code>
+      <code>openssl_encrypt($plaintext . str_repeat("\0", $block_size), $this-&gt;cipher_name_openssl, $key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $encryptIV)</code>
+      <code>openssl_encrypt(substr($plaintext, 0, -$overflow) . str_repeat("\0", $block_size), $this-&gt;cipher_name_openssl, $key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $encryptIV)</code>
+      <code>openssl_encrypt(substr($plaintext, 0, -$overflow) . str_repeat("\0", $this-&gt;block_size), $this-&gt;cipher_name_openssl, $this-&gt;key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $iv)</code>
+      <code>pack('N', $i++)</code>
+      <code>pack('N', 8 * strlen($str))</code>
+    </PossiblyFalseOperand>
+    <PossiblyFalsePropertyAssignmentValue occurrences="9">
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+    </PossiblyFalsePropertyAssignmentValue>
+    <PossiblyInvalidArgument occurrences="12">
+      <code>$count</code>
+      <code>$count</code>
+      <code>$count</code>
+      <code>$dkLen</code>
+      <code>$dkLen</code>
+      <code>$dkLen</code>
+      <code>$dkLen</code>
+      <code>$keylen</code>
+      <code>$keylen</code>
+      <code>$rounds</code>
+      <code>$salt</code>
+      <code>$salt</code>
+    </PossiblyInvalidArgument>
+    <PossiblyInvalidArrayOffset occurrences="1">
+      <code>$reverseMap[$engine]</code>
+    </PossiblyInvalidArrayOffset>
+    <PossiblyInvalidCast occurrences="1">
+      <code>$salt</code>
+    </PossiblyInvalidCast>
+    <PossiblyInvalidOperand occurrences="3">
+      <code>$salt</code>
+      <code>$salt</code>
+      <code>$salt</code>
+    </PossiblyInvalidOperand>
+    <PossiblyNullPropertyAssignmentValue occurrences="1">
+      <code>null</code>
+    </PossiblyNullPropertyAssignmentValue>
+    <PossiblyUndefinedIntArrayOffset occurrences="1">
+      <code>$func_args[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="36">
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['pos']</code>
+      <code>$buffer['pos']</code>
+      <code>$buffer['xor']</code>
+      <code>$buffer['xor']</code>
+      <code>$buffer['xor']</code>
+      <code>$buffer['xor']</code>
+      <code>$buffer['xor']</code>
+      <code>$buffer['xor']</code>
+      <code>$buffer['xor']</code>
+      <code>$buffer['xor']</code>
+      <code>$buffer['xor']</code>
+      <code>$buffer['xor']</code>
+      <code>$buffer['xor']</code>
+      <code>$buffer['xor']</code>
+      <code>$cipher_code['decrypt_block']</code>
+      <code>$cipher_code['encrypt_block']</code>
+      <code>$this-&gt;debuffer['pos']</code>
+      <code>$this-&gt;enbuffer['pos']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUndefinedVariable occurrences="7">
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$plaintext</code>
+      <code>$plaintext</code>
+      <code>$plaintext</code>
+    </PossiblyUndefinedVariable>
+    <PossiblyUnusedMethod occurrences="3">
+      <code>enablePadding</code>
+      <code>getMode</code>
+      <code>safe_intval_inline</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedParam occurrences="1">
+      <code>$cipher_code</code>
+    </PossiblyUnusedParam>
+    <PossiblyUnusedReturnValue occurrences="1">
+      <code>bool</code>
+    </PossiblyUnusedReturnValue>
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>$cipher_name_openssl</code>
+      <code>$cipher_name_openssl_ecb</code>
+      <code>$debuffer</code>
+      <code>$decryptIV</code>
+      <code>$enbuffer</code>
+      <code>$encryptIV</code>
+      <code>$engine</code>
+      <code>$h</code>
+      <code>$inline_crypt</code>
+      <code>$poly1305Key</code>
+      <code>$preferredEngine</code>
+    </PropertyNotSetInConstructor>
+    <RedundantCondition occurrences="1">
+      <code>is_string($engine)</code>
+    </RedundantCondition>
+    <RedundantConditionGivenDocblockType occurrences="2">
+      <code>is_string($this-&gt;key)</code>
+      <code>strlen($password)</code>
+    </RedundantConditionGivenDocblockType>
+    <RedundantPropertyInitializationCheck occurrences="7">
+      <code>$this-&gt;usePoly1305 &amp;&amp; !isset($this-&gt;poly1305Key)</code>
+      <code>$this-&gt;usePoly1305 &amp;&amp; !isset($this-&gt;poly1305Key)</code>
+      <code>isset($this-&gt;poly1305Key)</code>
+      <code>isset($this-&gt;poly1305Key)</code>
+      <code>isset($this-&gt;preferredEngine)</code>
+      <code>isset(self::$gcmField)</code>
+      <code>isset(self::$poly1305Field)</code>
+    </RedundantPropertyInitializationCheck>
+    <ReferenceConstraintViolation occurrences="1">
+      <code>return $ciphertext;</code>
+    </ReferenceConstraintViolation>
+    <TypeDoesNotContainType occurrences="1">
+      <code>''</code>
+    </TypeDoesNotContainType>
+    <UndefinedDocblockClass occurrences="1">
+      <code>Callback</code>
+    </UndefinedDocblockClass>
+    <UndefinedMethod occurrences="1">
+      <code>setupInlineCrypt</code>
+    </UndefinedMethod>
+    <UndefinedThisPropertyAssignment occurrences="1">
+      <code>$this-&gt;key_length</code>
+    </UndefinedThisPropertyAssignment>
+    <UndefinedThisPropertyFetch occurrences="5">
+      <code>$this-&gt;key_length</code>
+      <code>$this-&gt;key_length</code>
+      <code>$this-&gt;key_length</code>
+      <code>$this-&gt;openssl_options</code>
+      <code>$this-&gt;openssl_options</code>
+    </UndefinedThisPropertyFetch>
+    <UnsafeInstantiation occurrences="3">
+      <code>new static('ctr')</code>
+      <code>new static('ctr')</code>
+      <code>new static('ecb')</code>
+    </UnsafeInstantiation>
+    <UnusedVariable occurrences="5">
+      <code>$ciphertext</code>
+      <code>$ciphertext</code>
+      <code>$i</code>
+      <code>$i</code>
+      <code>$size</code>
+    </UnusedVariable>
+  </file>
+  <file src="../phpseclib/Crypt/Common/Traits/Fingerprint.php">
+    <MissingReturnType occurrences="1">
+      <code>getFingerprint</code>
+    </MissingReturnType>
+    <MixedAssignment occurrences="1">
+      <code>$type</code>
+    </MixedAssignment>
+    <TypeDoesNotContainType occurrences="1">
+      <code>$key === false</code>
+    </TypeDoesNotContainType>
+  </file>
+  <file src="../phpseclib/Crypt/DES.php">
+    <InvalidPropertyAssignmentValue occurrences="2">
+      <code>8</code>
+    </InvalidPropertyAssignmentValue>
+    <MixedArgument occurrences="2">
+      <code>$block</code>
+      <code>$key</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="46">
+      <code>$k[$c][++$ki]</code>
+      <code>$k[$c][++$ki]</code>
+      <code>$keys[++$ki]</code>
+      <code>$keys[++$ki]</code>
+      <code>$pc1map[ $l        &amp; 0xFF]</code>
+      <code>$pc1map[ $r        &amp; 0xFF]</code>
+      <code>$pc1map[($l &gt;&gt;  8) &amp; 0xFF]</code>
+      <code>$pc1map[($l &gt;&gt; 16) &amp; 0xFF]</code>
+      <code>$pc1map[($l &gt;&gt; 24) &amp; 0xFF]</code>
+      <code>$pc1map[($r &gt;&gt;  8) &amp; 0xFF]</code>
+      <code>$pc1map[($r &gt;&gt; 16) &amp; 0xFF]</code>
+      <code>$pc1map[($r &gt;&gt; 24) &amp; 0xFF]</code>
+      <code>$pc2mapc1[ $c &gt;&gt; 24        ]</code>
+      <code>$pc2mapc2[($c &gt;&gt; 16) &amp; 0xFF]</code>
+      <code>$pc2mapc3[($c &gt;&gt;  8) &amp; 0xFF]</code>
+      <code>$pc2mapc4[ $c        &amp; 0xFF]</code>
+      <code>$pc2mapd1[ $d &gt;&gt; 24        ]</code>
+      <code>$pc2mapd2[($d &gt;&gt; 16) &amp; 0xFF]</code>
+      <code>$pc2mapd3[($d &gt;&gt;  8) &amp; 0xFF]</code>
+      <code>$pc2mapd4[ $d        &amp; 0xFF]</code>
+      <code>$sbox1[($b1 &gt;&gt; 24) &amp; 0x3F]</code>
+      <code>$sbox2[($b2 &gt;&gt; 24) &amp; 0x3F]</code>
+      <code>$sbox3[($b1 &gt;&gt; 16) &amp; 0x3F]</code>
+      <code>$sbox4[($b2 &gt;&gt; 16) &amp; 0x3F]</code>
+      <code>$sbox5[($b1 &gt;&gt;  8) &amp; 0x3F]</code>
+      <code>$sbox6[($b2 &gt;&gt;  8) &amp; 0x3F]</code>
+      <code>$sbox7[ $b1        &amp; 0x3F]</code>
+      <code>$sbox8[ $b2        &amp; 0x3F]</code>
+      <code>$shifts[$i]</code>
+      <code>$shifts[$i]</code>
+      <code>$shuffleinvip[ $l        &amp; 0xFF]</code>
+      <code>$shuffleinvip[ $r        &amp; 0xFF]</code>
+      <code>$shuffleinvip[($l &gt;&gt;  8) &amp; 0xFF]</code>
+      <code>$shuffleinvip[($l &gt;&gt; 16) &amp; 0xFF]</code>
+      <code>$shuffleinvip[($l &gt;&gt; 24) &amp; 0xFF]</code>
+      <code>$shuffleinvip[($r &gt;&gt;  8) &amp; 0xFF]</code>
+      <code>$shuffleinvip[($r &gt;&gt; 16) &amp; 0xFF]</code>
+      <code>$shuffleinvip[($r &gt;&gt; 24) &amp; 0xFF]</code>
+      <code>$shuffleip[ $l        &amp; 0xFF]</code>
+      <code>$shuffleip[ $r        &amp; 0xFF]</code>
+      <code>$shuffleip[($l &gt;&gt;  8) &amp; 0xFF]</code>
+      <code>$shuffleip[($l &gt;&gt; 16) &amp; 0xFF]</code>
+      <code>$shuffleip[($l &gt;&gt; 24) &amp; 0xFF]</code>
+      <code>$shuffleip[($r &gt;&gt;  8) &amp; 0xFF]</code>
+      <code>$shuffleip[($r &gt;&gt; 16) &amp; 0xFF]</code>
+      <code>$shuffleip[($r &gt;&gt; 24) &amp; 0xFF]</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="2">
+      <code>$shuffleinvip[]</code>
+      <code>$shuffleip[]</code>
+    </MixedArrayAssignment>
+    <MixedArrayOffset occurrences="50">
+      <code>$pc1map[ $l        &amp; 0xFF]</code>
+      <code>$pc1map[ $r        &amp; 0xFF]</code>
+      <code>$pc1map[($l &gt;&gt;  8) &amp; 0xFF]</code>
+      <code>$pc1map[($l &gt;&gt; 16) &amp; 0xFF]</code>
+      <code>$pc1map[($l &gt;&gt; 24) &amp; 0xFF]</code>
+      <code>$pc1map[($r &gt;&gt;  8) &amp; 0xFF]</code>
+      <code>$pc1map[($r &gt;&gt; 16) &amp; 0xFF]</code>
+      <code>$pc1map[($r &gt;&gt; 24) &amp; 0xFF]</code>
+      <code>$pc2mapc1[ $c &gt;&gt; 24        ]</code>
+      <code>$pc2mapc2[($c &gt;&gt; 16) &amp; 0xFF]</code>
+      <code>$pc2mapc3[($c &gt;&gt;  8) &amp; 0xFF]</code>
+      <code>$pc2mapc4[ $c        &amp; 0xFF]</code>
+      <code>$pc2mapd1[ $d &gt;&gt; 24        ]</code>
+      <code>$pc2mapd2[($d &gt;&gt; 16) &amp; 0xFF]</code>
+      <code>$pc2mapd3[($d &gt;&gt;  8) &amp; 0xFF]</code>
+      <code>$pc2mapd4[ $d        &amp; 0xFF]</code>
+      <code>$sbox1[($b1 &gt;&gt; 24) &amp; 0x3F]</code>
+      <code>$sbox2[($b2 &gt;&gt; 24) &amp; 0x3F]</code>
+      <code>$sbox3[($b1 &gt;&gt; 16) &amp; 0x3F]</code>
+      <code>$sbox4[($b2 &gt;&gt; 16) &amp; 0x3F]</code>
+      <code>$sbox5[($b1 &gt;&gt;  8) &amp; 0x3F]</code>
+      <code>$sbox6[($b2 &gt;&gt;  8) &amp; 0x3F]</code>
+      <code>$sbox7[ $b1        &amp; 0x3F]</code>
+      <code>$sbox8[ $b2        &amp; 0x3F]</code>
+      <code>$shuffleinvip[ $l        &amp; 0xFF]</code>
+      <code>$shuffleinvip[ $r        &amp; 0xFF]</code>
+      <code>$shuffleinvip[($l &gt;&gt;  8) &amp; 0xFF]</code>
+      <code>$shuffleinvip[($l &gt;&gt; 16) &amp; 0xFF]</code>
+      <code>$shuffleinvip[($l &gt;&gt; 24) &amp; 0xFF]</code>
+      <code>$shuffleinvip[($r &gt;&gt;  8) &amp; 0xFF]</code>
+      <code>$shuffleinvip[($r &gt;&gt; 16) &amp; 0xFF]</code>
+      <code>$shuffleinvip[($r &gt;&gt; 24) &amp; 0xFF]</code>
+      <code>$shuffleip[ $l        &amp; 0xFF]</code>
+      <code>$shuffleip[ $r        &amp; 0xFF]</code>
+      <code>$shuffleip[($l &gt;&gt;  8) &amp; 0xFF]</code>
+      <code>$shuffleip[($l &gt;&gt; 16) &amp; 0xFF]</code>
+      <code>$shuffleip[($l &gt;&gt; 24) &amp; 0xFF]</code>
+      <code>$shuffleip[($r &gt;&gt;  8) &amp; 0xFF]</code>
+      <code>$shuffleip[($r &gt;&gt; 16) &amp; 0xFF]</code>
+      <code>$shuffleip[($r &gt;&gt; 24) &amp; 0xFF]</code>
+      <code>self::$shuffle[$pc1map[ $l        &amp; 0xFF]]</code>
+      <code>self::$shuffle[$pc1map[ $r        &amp; 0xFF]]</code>
+      <code>self::$shuffle[$pc1map[($l &gt;&gt;  8) &amp; 0xFF]]</code>
+      <code>self::$shuffle[$pc1map[($l &gt;&gt; 16) &amp; 0xFF]]</code>
+      <code>self::$shuffle[$pc1map[($l &gt;&gt; 24) &amp; 0xFF]]</code>
+      <code>self::$shuffle[$pc1map[($r &gt;&gt;  8) &amp; 0xFF]]</code>
+      <code>self::$shuffle[$pc1map[($r &gt;&gt; 16) &amp; 0xFF]]</code>
+      <code>self::$shuffle[$pc1map[($r &gt;&gt; 24) &amp; 0xFF]]</code>
+      <code>self::$shuffle[self::$invipmap[$i]]</code>
+      <code>self::$shuffle[self::$ipmap[$i]]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="33">
+      <code>$b1</code>
+      <code>$b2</code>
+      <code>$block</code>
+      <code>$c</code>
+      <code>$c</code>
+      <code>$c</code>
+      <code>$cp</code>
+      <code>$d</code>
+      <code>$d</code>
+      <code>$d</code>
+      <code>$dp</code>
+      <code>$key</code>
+      <code>$keys</code>
+      <code>$keys[$des_round][self::DECRYPT][$ki    ]</code>
+      <code>$keys[$des_round][self::DECRYPT][$ki - 1]</code>
+      <code>$keys[$des_round][self::ENCRYPT][       ]</code>
+      <code>$keys[$des_round][self::ENCRYPT][       ]</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$shuffleinvip[]</code>
+      <code>$shuffleip[]</code>
+      <code>$t</code>
+      <code>$t</code>
+      <code>$val1</code>
+      <code>$val2</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>string</code>
+    </MixedInferredReturnType>
+    <MixedOperand occurrences="102">
+      <code>$b1</code>
+      <code>$b1</code>
+      <code>$b1</code>
+      <code>$b1</code>
+      <code>$b2</code>
+      <code>$b2</code>
+      <code>$b2</code>
+      <code>$b2</code>
+      <code>$c</code>
+      <code>$c</code>
+      <code>$c</code>
+      <code>$c</code>
+      <code>$c</code>
+      <code>$c</code>
+      <code>$c</code>
+      <code>$cp</code>
+      <code>$cp</code>
+      <code>$cp</code>
+      <code>$cp</code>
+      <code>$d</code>
+      <code>$d</code>
+      <code>$d</code>
+      <code>$d</code>
+      <code>$d</code>
+      <code>$d</code>
+      <code>$d</code>
+      <code>$dp</code>
+      <code>$dp</code>
+      <code>$dp</code>
+      <code>$dp</code>
+      <code>$k[$c][++$ki]</code>
+      <code>$k[$c][++$ki]</code>
+      <code>$key['c']</code>
+      <code>$key['c']</code>
+      <code>$key['d']</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$pc2mapc1[ $c &gt;&gt; 24        ]</code>
+      <code>$pc2mapd1[ $d &gt;&gt; 24        ]</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$sbox1[($b1 &gt;&gt; 24) &amp; 0x3F] ^ $sbox2[($b2 &gt;&gt; 24) &amp; 0x3F]</code>
+      <code>$sbox2[($b2 &gt;&gt; 24) &amp; 0x3F]</code>
+      <code>$shuffleinvip[ $l        &amp; 0xFF]</code>
+      <code>$shuffleinvip[ $r        &amp; 0xFF]</code>
+      <code>$shuffleinvip[($l &gt;&gt;  8) &amp; 0xFF]</code>
+      <code>$shuffleinvip[($l &gt;&gt; 16) &amp; 0xFF]</code>
+      <code>$shuffleinvip[($l &gt;&gt; 24) &amp; 0xFF]</code>
+      <code>$shuffleinvip[($r &gt;&gt;  8) &amp; 0xFF]</code>
+      <code>$shuffleinvip[($r &gt;&gt; 16) &amp; 0xFF]</code>
+      <code>$shuffleinvip[($r &gt;&gt; 24) &amp; 0xFF]</code>
+      <code>$shuffleip[ $l        &amp; 0xFF]</code>
+      <code>$shuffleip[ $r        &amp; 0xFF]</code>
+      <code>$shuffleip[($l &gt;&gt;  8) &amp; 0xFF]</code>
+      <code>$shuffleip[($l &gt;&gt; 16) &amp; 0xFF]</code>
+      <code>$shuffleip[($l &gt;&gt; 24) &amp; 0xFF]</code>
+      <code>$shuffleip[($r &gt;&gt;  8) &amp; 0xFF]</code>
+      <code>$shuffleip[($r &gt;&gt; 16) &amp; 0xFF]</code>
+      <code>$shuffleip[($r &gt;&gt; 24) &amp; 0xFF]</code>
+      <code>( $cp        &amp; intval(0xFF000000)) | (($cp &lt;&lt;  8) &amp; 0x00FF0000)</code>
+      <code>($cp &lt;&lt;  8) &amp; intval(0xFF000000)</code>
+      <code>($key['d'] &gt;&gt; 4) &amp; 0x0FFFFFF0</code>
+      <code>($r &gt;&gt;  3) &amp; 0x1FFFFFFF</code>
+      <code>($r &gt;&gt; 31) &amp; 0x00000001</code>
+      <code>(($cp &lt;&lt;  8) &amp; intval(0xFF000000)) | (($cp &lt;&lt; 16) &amp; 0x00FF0000)</code>
+      <code>(($r &gt;&gt;  3) &amp; 0x1FFFFFFF) ^ ($r &lt;&lt; 29)</code>
+      <code>(($r &gt;&gt; 31) &amp; 0x00000001) ^ ($r &lt;&lt;  1)</code>
+      <code>self::$shuffle[$pc1map[ $l        &amp; 0xFF]]</code>
+      <code>self::$shuffle[$pc1map[ $r        &amp; 0xFF]]</code>
+      <code>self::$shuffle[$pc1map[($l &gt;&gt;  8) &amp; 0xFF]]</code>
+      <code>self::$shuffle[$pc1map[($l &gt;&gt; 16) &amp; 0xFF]]</code>
+      <code>self::$shuffle[$pc1map[($l &gt;&gt; 24) &amp; 0xFF]]</code>
+      <code>self::$shuffle[$pc1map[($r &gt;&gt;  8) &amp; 0xFF]]</code>
+      <code>self::$shuffle[$pc1map[($r &gt;&gt; 16) &amp; 0xFF]]</code>
+      <code>self::$shuffle[$pc1map[($r &gt;&gt; 24) &amp; 0xFF]]</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="1"/>
+    <PossiblyInvalidArrayAccess occurrences="8">
+      <code>$key['c']</code>
+      <code>$key['d']</code>
+      <code>$t['l']</code>
+      <code>$t['l']</code>
+      <code>$t['l']</code>
+      <code>$t['r']</code>
+      <code>$t['r']</code>
+      <code>$t['r']</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyNullOperand occurrences="1">
+      <code>$this-&gt;openssl_translate_mode()</code>
+    </PossiblyNullOperand>
+    <PossiblyUndefinedIntArrayOffset occurrences="8">
+      <code>$crypt_block[self::DECRYPT]</code>
+      <code>$crypt_block[self::ENCRYPT]</code>
+      <code>$keys[0]</code>
+      <code>$keys[0]</code>
+      <code>$keys[1]</code>
+      <code>$keys[2]</code>
+      <code>$this-&gt;keys[self::DECRYPT]</code>
+      <code>$this-&gt;keys[self::ENCRYPT]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="9">
+      <code>$key['c']</code>
+      <code>$key['d']</code>
+      <code>$t['l']</code>
+      <code>$t['l']</code>
+      <code>$t['l']</code>
+      <code>$t['r']</code>
+      <code>$t['r']</code>
+      <code>$t['r']</code>
+      <code>$this-&gt;kl['des_rounds']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUnusedMethod occurrences="1">
+      <code>setupInlineCrypt</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedProperty occurrences="2">
+      <code>$key_length</code>
+      <code>$openssl_mode_names</code>
+    </PossiblyUnusedProperty>
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>$keys</code>
+      <code>$kl</code>
+      <code>DES</code>
+      <code>DES</code>
+      <code>DES</code>
+      <code>DES</code>
+      <code>DES</code>
+      <code>DES</code>
+      <code>DES</code>
+      <code>DES</code>
+      <code>DES</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Crypt/DH.php">
+    <InvalidArgument occurrences="1">
+      <code>$args[0]</code>
+    </InvalidArgument>
+    <MissingParamType occurrences="1">
+      <code>$args</code>
+    </MissingParamType>
+    <MissingReturnType occurrences="1">
+      <code>computeSecret</code>
+    </MissingReturnType>
+    <MixedArgument occurrences="1">
+      <code>$key</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="6">
+      <code>$key</code>
+      <code>$new-&gt;base</code>
+      <code>$new-&gt;prime</code>
+      <code>$new-&gt;privateKey</code>
+      <code>$new-&gt;publicKey</code>
+      <code>$type</code>
+    </MixedAssignment>
+    <MixedMethodCall occurrences="1">
+      <code>$type::saveParameters($this-&gt;prime, $this-&gt;base)</code>
+    </MixedMethodCall>
+    <PossiblyUndefinedIntArrayOffset occurrences="4">
+      <code>$args[0]</code>
+      <code>$args[0]</code>
+      <code>$args[0]</code>
+      <code>$args[1]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="2">
+      <code>$components['base']</code>
+      <code>$components['prime']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUnusedMethod occurrences="1">
+      <code>onLoad</code>
+    </PossiblyUnusedMethod>
+    <UndefinedPropertyAssignment occurrences="1">
+      <code>$new-&gt;privateKey</code>
+    </UndefinedPropertyAssignment>
+  </file>
+  <file src="../phpseclib/Crypt/DH/Formats/Keys/PKCS1.php">
+    <MixedArgument occurrences="1">
+      <code>$decoded[0]</code>
+    </MixedArgument>
+    <PossiblyInvalidArgument occurrences="1">
+      <code>$key</code>
+    </PossiblyInvalidArgument>
+    <PossiblyUndefinedIntArrayOffset occurrences="1">
+      <code>$decoded[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <UnusedClass occurrences="1">
+      <code>PKCS1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/DH/Formats/Keys/PKCS8.php">
+    <ImplicitToStringCast occurrences="2">
+      <code>$privateKey</code>
+      <code>$publicKey</code>
+    </ImplicitToStringCast>
+    <MixedArgument occurrences="3">
+      <code>$decoded[0]</code>
+      <code>$key[$type . 'Algorithm']['parameters']-&gt;element</code>
+      <code>$key[$type]</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="3">
+      <code>$decoded[0]['content']</code>
+      <code>$decoded[0]['content']</code>
+      <code>$key[$type . 'Algorithm']['parameters']</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="1">
+      <code>$components[$type]</code>
+    </MixedAssignment>
+    <MixedPropertyFetch occurrences="1">
+      <code>$key[$type . 'Algorithm']['parameters']-&gt;element</code>
+    </MixedPropertyFetch>
+    <PossiblyNullArgument occurrences="1">
+      <code>$password</code>
+    </PossiblyNullArgument>
+    <PossiblyNullArrayAccess occurrences="2">
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+    </PossiblyNullArrayAccess>
+    <PossiblyUndefinedIntArrayOffset occurrences="3">
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="2">
+      <code>$key[$type . 'Algorithm']</code>
+      <code>$key[$type]</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <UnusedClass occurrences="1">
+      <code>PKCS8</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/DH/Parameters.php">
+    <MixedAssignment occurrences="1">
+      <code>$type</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>string</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="1">
+      <code>$type::saveParameters($this-&gt;prime, $this-&gt;base, $options)</code>
+    </MixedMethodCall>
+    <MixedReturnStatement occurrences="1">
+      <code>$type::saveParameters($this-&gt;prime, $this-&gt;base, $options)</code>
+    </MixedReturnStatement>
+    <PropertyNotSetInConstructor occurrences="4">
+      <code>Parameters</code>
+      <code>Parameters</code>
+      <code>Parameters</code>
+      <code>Parameters</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Crypt/DH/PrivateKey.php">
+    <LessSpecificReturnStatement occurrences="1">
+      <code>DH::loadFormat('PKCS8', $key)</code>
+    </LessSpecificReturnStatement>
+    <MixedArgument occurrences="1">
+      <code>$key</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="3">
+      <code>$key</code>
+      <code>$type</code>
+      <code>$type</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>string</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="2">
+      <code>$type::savePrivateKey($this-&gt;prime, $this-&gt;base, $this-&gt;privateKey, $this-&gt;publicKey, $this-&gt;password, $options)</code>
+      <code>$type::savePublicKey($this-&gt;prime, $this-&gt;base, $this-&gt;publicKey)</code>
+    </MixedMethodCall>
+    <MixedReturnStatement occurrences="1">
+      <code>$type::savePrivateKey($this-&gt;prime, $this-&gt;base, $this-&gt;privateKey, $this-&gt;publicKey, $this-&gt;password, $options)</code>
+    </MixedReturnStatement>
+    <MoreSpecificReturnType occurrences="1">
+      <code>DH\PublicKey</code>
+    </MoreSpecificReturnType>
+    <PropertyNotSetInConstructor occurrences="5">
+      <code>$privateKey</code>
+      <code>$publicKey</code>
+      <code>PrivateKey</code>
+      <code>PrivateKey</code>
+      <code>PrivateKey</code>
+    </PropertyNotSetInConstructor>
+    <RedundantPropertyInitializationCheck occurrences="2">
+      <code>isset($this-&gt;publicKey)</code>
+      <code>isset($this-&gt;publicKey)</code>
+    </RedundantPropertyInitializationCheck>
+  </file>
+  <file src="../phpseclib/Crypt/DH/PublicKey.php">
+    <MixedAssignment occurrences="1">
+      <code>$type</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>string</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="1">
+      <code>$type::savePublicKey($this-&gt;prime, $this-&gt;base, $this-&gt;publicKey, $options)</code>
+    </MixedMethodCall>
+    <MixedReturnStatement occurrences="1">
+      <code>$type::savePublicKey($this-&gt;prime, $this-&gt;base, $this-&gt;publicKey, $options)</code>
+    </MixedReturnStatement>
+    <PropertyNotSetInConstructor occurrences="4">
+      <code>PublicKey</code>
+      <code>PublicKey</code>
+      <code>PublicKey</code>
+      <code>PublicKey</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Crypt/DSA.php">
+    <DocblockTypeContradiction occurrences="4">
+      <code>count($args) == 1 &amp;&amp; $args[0] instanceof Parameters</code>
+      <code>count($args) == 2 &amp;&amp; is_int($args[0])</code>
+      <code>is_int($args[0])</code>
+      <code>is_int($args[1])</code>
+    </DocblockTypeContradiction>
+    <MissingReturnType occurrences="1">
+      <code>getParameters</code>
+    </MissingReturnType>
+    <MixedArgument occurrences="3">
+      <code>$args[0]</code>
+      <code>$args[1]</code>
+      <code>$key</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="9">
+      <code>$key</code>
+      <code>$new-&gt;g</code>
+      <code>$new-&gt;p</code>
+      <code>$new-&gt;q</code>
+      <code>$new-&gt;sigFormat</code>
+      <code>$new-&gt;x</code>
+      <code>$new-&gt;y</code>
+      <code>$this-&gt;sigFormat</code>
+      <code>$type</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>DSA\PrivateKey</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="1">
+      <code>$type::saveParameters($this-&gt;p, $this-&gt;q, $this-&gt;g)</code>
+    </MixedMethodCall>
+    <MixedReturnStatement occurrences="1"/>
+    <PossiblyInvalidPropertyFetch occurrences="5">
+      <code>$params-&gt;g</code>
+      <code>$params-&gt;hash</code>
+      <code>$params-&gt;p</code>
+      <code>$params-&gt;q</code>
+      <code>$params-&gt;shortFormat</code>
+    </PossiblyInvalidPropertyFetch>
+    <PossiblyUndefinedIntArrayOffset occurrences="3">
+      <code>$args[0]</code>
+      <code>$args[0]</code>
+      <code>$args[1]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="4">
+      <code>$components['g']</code>
+      <code>$components['p']</code>
+      <code>$components['q']</code>
+      <code>self::$engines['OpenSSL']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUnusedMethod occurrences="4">
+      <code>getEngine</code>
+      <code>getLength</code>
+      <code>getSignatureFormat</code>
+      <code>onLoad</code>
+    </PossiblyUnusedMethod>
+    <PropertyNotSetInConstructor occurrences="5">
+      <code>$g</code>
+      <code>$p</code>
+      <code>$q</code>
+      <code>$y</code>
+      <code>DSA</code>
+    </PropertyNotSetInConstructor>
+    <UndefinedMethod occurrences="2">
+      <code>withSignatureFormat</code>
+      <code>withSignatureFormat</code>
+    </UndefinedMethod>
+  </file>
+  <file src="../phpseclib/Crypt/DSA/Formats/Keys/OpenSSH.php">
+    <ImplicitToStringCast occurrences="9">
+      <code>$g</code>
+      <code>$g</code>
+      <code>$p</code>
+      <code>$p</code>
+      <code>$q</code>
+      <code>$q</code>
+      <code>$x</code>
+      <code>$y</code>
+      <code>$y</code>
+    </ImplicitToStringCast>
+    <MixedArgument occurrences="3">
+      <code>$parsed['paddedKey']</code>
+      <code>$parsed['paddedKey']</code>
+      <code>$parsed['publicKey']</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="2">
+      <code>$comment</code>
+      <code>$comment</code>
+    </MixedAssignment>
+    <MixedOperand occurrences="1">
+      <code>$comment</code>
+    </MixedOperand>
+    <PossiblyNullArgument occurrences="1">
+      <code>$password</code>
+    </PossiblyNullArgument>
+    <PossiblyUndefinedStringArrayOffset occurrences="4">
+      <code>$parsed['comment']</code>
+      <code>$parsed['publicKey']</code>
+      <code>$parsed['type']</code>
+      <code>$parsed[type]</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <UnusedClass occurrences="1">
+      <code>OpenSSH</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/DSA/Formats/Keys/PKCS1.php">
+    <ImplicitToStringCast occurrences="1">
+      <code>$y</code>
+    </ImplicitToStringCast>
+    <MixedArgument occurrences="3">
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+    </MixedArgument>
+    <PossiblyInvalidArgument occurrences="1">
+      <code>$key</code>
+    </PossiblyInvalidArgument>
+    <PossiblyUndefinedIntArrayOffset occurrences="1">
+      <code>$decoded[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <UnusedClass occurrences="1">
+      <code>PKCS1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/DSA/Formats/Keys/PKCS8.php">
+    <ImplicitToStringCast occurrences="2">
+      <code>$x</code>
+      <code>$y</code>
+    </ImplicitToStringCast>
+    <MixedArgument occurrences="4">
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$key[$type . 'Algorithm']['parameters']-&gt;element</code>
+      <code>$key[$type]</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="1">
+      <code>$key[$type . 'Algorithm']['parameters']</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="1">
+      <code>$components['meta']</code>
+    </MixedAssignment>
+    <MixedPropertyFetch occurrences="1">
+      <code>$key[$type . 'Algorithm']['parameters']-&gt;element</code>
+    </MixedPropertyFetch>
+    <PossiblyNullArgument occurrences="1">
+      <code>$password</code>
+    </PossiblyNullArgument>
+    <PossiblyUndefinedIntArrayOffset occurrences="2">
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="2">
+      <code>$key[$type . 'Algorithm']</code>
+      <code>$key[$type]</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <RedundantConditionGivenDocblockType occurrences="1">
+      <code>$components[$var] instanceof BigInteger</code>
+    </RedundantConditionGivenDocblockType>
+    <UnusedClass occurrences="1">
+      <code>PKCS8</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/DSA/Formats/Keys/PuTTY.php">
+    <ImplicitToStringCast occurrences="9">
+      <code>$g</code>
+      <code>$g</code>
+      <code>$p</code>
+      <code>$p</code>
+      <code>$q</code>
+      <code>$q</code>
+      <code>$x</code>
+      <code>$y</code>
+      <code>$y</code>
+    </ImplicitToStringCast>
+    <MixedArrayAccess occurrences="1">
+      <code>$components['public']</code>
+    </MixedArrayAccess>
+    <NullReference occurrences="2">
+      <code>$private</code>
+      <code>$public</code>
+    </NullReference>
+    <PossiblyNullArgument occurrences="1">
+      <code>$password</code>
+    </PossiblyNullArgument>
+    <UnusedClass occurrences="1">
+      <code>PuTTY</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/DSA/Formats/Keys/Raw.php">
+    <InvalidReturnStatement occurrences="2">
+      <code>compact('p', 'q', 'g', 'y')</code>
+      <code>compact('p', 'q', 'g', 'y', 'x')</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="2">
+      <code>string</code>
+      <code>string</code>
+    </InvalidReturnType>
+    <PossiblyUndefinedStringArrayOffset occurrences="3">
+      <code>$key['g']</code>
+      <code>$key['p']</code>
+      <code>$key['q']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <UnusedClass occurrences="1">
+      <code>Raw</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/DSA/Formats/Keys/XML.php">
+    <ArgumentTypeCoercion occurrences="1">
+      <code>$key</code>
+    </ArgumentTypeCoercion>
+    <InvalidReturnStatement occurrences="1">
+      <code>$components</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="1">
+      <code>array</code>
+    </InvalidReturnType>
+    <MixedArrayAssignment occurrences="4">
+      <code>$components['g']</code>
+      <code>$components['p']</code>
+      <code>$components['q']</code>
+      <code>$components['y']</code>
+    </MixedArrayAssignment>
+    <PossiblyNullArgument occurrences="1">
+      <code>$temp-&gt;item(0)-&gt;nodeValue</code>
+    </PossiblyNullArgument>
+    <PossiblyNullPropertyFetch occurrences="1">
+      <code>$temp-&gt;item(0)-&gt;nodeValue</code>
+    </PossiblyNullPropertyFetch>
+    <PossiblyUndefinedVariable occurrences="4">
+      <code>$components</code>
+      <code>$components</code>
+      <code>$components</code>
+      <code>$components</code>
+    </PossiblyUndefinedVariable>
+    <TypeDoesNotContainType occurrences="1">
+      <code>Strings::is_stringable($key)</code>
+    </TypeDoesNotContainType>
+    <UnusedClass occurrences="1">
+      <code>XML</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/DSA/Formats/Signature/ASN1.php">
+    <InvalidReturnStatement occurrences="1">
+      <code>$components</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="1">
+      <code>array|bool</code>
+    </InvalidReturnType>
+    <MixedArgument occurrences="1">
+      <code>$decoded[0]</code>
+    </MixedArgument>
+    <NullableReturnStatement occurrences="1">
+      <code>$components</code>
+    </NullableReturnStatement>
+    <PossiblyUndefinedIntArrayOffset occurrences="1">
+      <code>$decoded[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <TypeDoesNotContainType occurrences="1">
+      <code>is_string($sig)</code>
+    </TypeDoesNotContainType>
+  </file>
+  <file src="../phpseclib/Crypt/DSA/Formats/Signature/Raw.php">
+    <UnusedClass occurrences="1">
+      <code>Raw</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/DSA/Formats/Signature/SSH2.php">
+    <FalsableReturnStatement occurrences="1">
+      <code>false</code>
+    </FalsableReturnStatement>
+    <InvalidFalsableReturnType occurrences="1">
+      <code>string</code>
+    </InvalidFalsableReturnType>
+    <MissingReturnType occurrences="1">
+      <code>load</code>
+    </MissingReturnType>
+    <MixedArgument occurrences="2">
+      <code>$blob</code>
+      <code>$blob</code>
+    </MixedArgument>
+    <TypeDoesNotContainType occurrences="2">
+      <code>$result === false</code>
+      <code>is_string($sig)</code>
+    </TypeDoesNotContainType>
+    <UnusedClass occurrences="1">
+      <code>SSH2</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/DSA/Parameters.php">
+    <MixedAssignment occurrences="1">
+      <code>$type</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>string</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="1">
+      <code>$type::saveParameters($this-&gt;p, $this-&gt;q, $this-&gt;g, $options)</code>
+    </MixedMethodCall>
+    <MixedReturnStatement occurrences="1">
+      <code>$type::saveParameters($this-&gt;p, $this-&gt;q, $this-&gt;g, $options)</code>
+    </MixedReturnStatement>
+    <PropertyNotSetInConstructor occurrences="5">
+      <code>Parameters</code>
+      <code>Parameters</code>
+      <code>Parameters</code>
+      <code>Parameters</code>
+      <code>Parameters</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Crypt/DSA/PrivateKey.php">
+    <InvalidStringClass occurrences="1">
+      <code>$format::save($r, $s)</code>
+    </InvalidStringClass>
+    <MissingReturnType occurrences="1">
+      <code>getPublicKey</code>
+    </MissingReturnType>
+    <MixedArgument occurrences="1">
+      <code>$key</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="3">
+      <code>$key</code>
+      <code>$type</code>
+      <code>$type</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="2">
+      <code>string</code>
+      <code>string</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="3">
+      <code>$format::save($r, $s)</code>
+      <code>$type::savePrivateKey($this-&gt;p, $this-&gt;q, $this-&gt;g, $this-&gt;y, $this-&gt;x, $this-&gt;password, $options)</code>
+      <code>$type::savePublicKey($this-&gt;p, $this-&gt;q, $this-&gt;g, $this-&gt;y)</code>
+    </MixedMethodCall>
+    <MixedReturnStatement occurrences="3">
+      <code>$format::save($r, $s)</code>
+      <code>$format::save($r, $s)</code>
+      <code>$type::savePrivateKey($this-&gt;p, $this-&gt;q, $this-&gt;g, $this-&gt;y, $this-&gt;x, $this-&gt;password, $options)</code>
+    </MixedReturnStatement>
+    <PossiblyInvalidArgument occurrences="1">
+      <code>ASN1Signature::load($signature)</code>
+    </PossiblyInvalidArgument>
+    <PossiblyUndefinedStringArrayOffset occurrences="1">
+      <code>self::$engines['OpenSSL']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUndefinedVariable occurrences="2">
+      <code>$r</code>
+      <code>$s</code>
+    </PossiblyUndefinedVariable>
+    <PropertyNotSetInConstructor occurrences="6">
+      <code>$x</code>
+      <code>PrivateKey</code>
+      <code>PrivateKey</code>
+      <code>PrivateKey</code>
+      <code>PrivateKey</code>
+      <code>PrivateKey</code>
+    </PropertyNotSetInConstructor>
+    <RedundantPropertyInitializationCheck occurrences="2">
+      <code>isset($this-&gt;y)</code>
+      <code>isset($this-&gt;y)</code>
+    </RedundantPropertyInitializationCheck>
+    <UndefinedMethod occurrences="1">
+      <code>withSignatureFormat</code>
+    </UndefinedMethod>
+  </file>
+  <file src="../phpseclib/Crypt/DSA/PublicKey.php">
+    <InvalidStringClass occurrences="1">
+      <code>$format::load($signature)</code>
+    </InvalidStringClass>
+    <MixedArgument occurrences="11">
+      <code>$message</code>
+      <code>$message</code>
+      <code>$params</code>
+      <code>$params</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$s</code>
+      <code>$sig</code>
+      <code>$u2</code>
+      <code>$w</code>
+      <code>self::$one</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="1">
+      <code>$u2</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="5">
+      <code>$params</code>
+      <code>$sig</code>
+      <code>$type</code>
+      <code>$w</code>
+      <code>[, $u2]</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>string</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="6">
+      <code>$type::savePublicKey($this-&gt;p, $this-&gt;q, $this-&gt;g, $this-&gt;y, $options)</code>
+      <code>between</code>
+      <code>between</code>
+      <code>divide</code>
+      <code>modInverse</code>
+      <code>multiply</code>
+    </MixedMethodCall>
+    <MixedReturnStatement occurrences="1">
+      <code>$type::savePublicKey($this-&gt;p, $this-&gt;q, $this-&gt;g, $this-&gt;y, $options)</code>
+    </MixedReturnStatement>
+    <PropertyNotSetInConstructor occurrences="5">
+      <code>PublicKey</code>
+      <code>PublicKey</code>
+      <code>PublicKey</code>
+      <code>PublicKey</code>
+      <code>PublicKey</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Crypt/EC.php">
+    <InvalidReturnStatement occurrences="1">
+      <code>$decoded</code>
+    </InvalidReturnStatement>
+    <LessSpecificReturnStatement occurrences="2">
+      <code>$privatekey</code>
+      <code>$privatekey-&gt;withHash($curve::HASH)</code>
+    </LessSpecificReturnStatement>
+    <MissingReturnType occurrences="1">
+      <code>getParameters</code>
+    </MissingReturnType>
+    <MixedArgument occurrences="9">
+      <code>$components['curve']::HASH</code>
+      <code>$curve-&gt;getBasePoint()</code>
+      <code>$curve::HASH</code>
+      <code>$dA</code>
+      <code>$dA-&gt;toBytes()</code>
+      <code>$decoded[0]</code>
+      <code>$key</code>
+      <code>$params</code>
+      <code>$this-&gt;QA[0]-&gt;toBytes(true)</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="2">
+      <code>$arr['dA']</code>
+      <code>$arr['secret']</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="18">
+      <code>$arr</code>
+      <code>$dA</code>
+      <code>$dA</code>
+      <code>$key</code>
+      <code>$new-&gt;QA</code>
+      <code>$new-&gt;curve</code>
+      <code>$new-&gt;curve</code>
+      <code>$new-&gt;dA</code>
+      <code>$new-&gt;secret</code>
+      <code>$new-&gt;sigFormat</code>
+      <code>$params</code>
+      <code>$privatekey-&gt;QA</code>
+      <code>$privatekey-&gt;dA</code>
+      <code>$privatekey-&gt;dA</code>
+      <code>$privatekey-&gt;secret</code>
+      <code>$this-&gt;curveName</code>
+      <code>$this-&gt;sigFormat</code>
+      <code>$type</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="2">
+      <code>string</code>
+      <code>string|array</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="10">
+      <code>$type::saveParameters($this-&gt;curve)</code>
+      <code>createRandomMultiplier</code>
+      <code>getBasePoint</code>
+      <code>multiplyPoint</code>
+      <code>new $curve()</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toString</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="2">
+      <code>$this-&gt;QA[0]-&gt;toBytes(true)</code>
+      <code>$this-&gt;QA[1]-&gt;toBytes(true)</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="2">
+      <code>$decoded['namedCurve']</code>
+      <code>$this-&gt;curve-&gt;encodePoint($this-&gt;QA)</code>
+    </MixedReturnStatement>
+    <MoreSpecificReturnType occurrences="1">
+      <code>PrivateKey</code>
+    </MoreSpecificReturnType>
+    <NullableReturnStatement occurrences="1">
+      <code>$decoded</code>
+    </NullableReturnStatement>
+    <PossiblyNullArgument occurrences="1">
+      <code>$decoded[0]</code>
+    </PossiblyNullArgument>
+    <PossiblyNullArrayAccess occurrences="1">
+      <code>$decoded[0]</code>
+    </PossiblyNullArrayAccess>
+    <PossiblyNullPropertyAssignmentValue occurrences="1">
+      <code>null</code>
+    </PossiblyNullPropertyAssignmentValue>
+    <PossiblyUndefinedIntArrayOffset occurrences="4">
+      <code>$decoded[0]</code>
+      <code>$this-&gt;QA[0]</code>
+      <code>$this-&gt;QA[0]</code>
+      <code>$this-&gt;QA[1]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="7">
+      <code>$components['QA']</code>
+      <code>$components['curve']</code>
+      <code>$components['curve']</code>
+      <code>$components['secret']</code>
+      <code>self::$engines['OpenSSL']</code>
+      <code>self::$engines['libsodium']</code>
+      <code>self::$engines['libsodium']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUnusedMethod occurrences="5">
+      <code>getContext</code>
+      <code>getEngine</code>
+      <code>getLength</code>
+      <code>getSignatureFormat</code>
+      <code>onLoad</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedProperty occurrences="2">
+      <code>$q</code>
+      <code>$x</code>
+    </PossiblyUnusedProperty>
+    <PropertyNotSetInConstructor occurrences="7">
+      <code>$QA</code>
+      <code>$context</code>
+      <code>$curve</code>
+      <code>$curveName</code>
+      <code>$format</code>
+      <code>$q</code>
+      <code>$x</code>
+    </PropertyNotSetInConstructor>
+    <PropertyTypeCoercion occurrences="1">
+      <code>$curve</code>
+    </PropertyTypeCoercion>
+    <RedundantPropertyInitializationCheck occurrences="1">
+      <code>$this-&gt;curve instanceof Ed25519 &amp;&amp; self::$engines['libsodium'] &amp;&amp; !isset($this-&gt;context)</code>
+    </RedundantPropertyInitializationCheck>
+    <TypeDoesNotContainType occurrences="1">
+      <code>is_string($context)</code>
+    </TypeDoesNotContainType>
+    <UndefinedMethod occurrences="4">
+      <code>$decoded</code>
+      <code>encodePoint</code>
+      <code>extractSecret</code>
+      <code>withSignatureFormat</code>
+    </UndefinedMethod>
+    <UndefinedPropertyAssignment occurrences="3">
+      <code>$new-&gt;dA</code>
+      <code>$new-&gt;secret</code>
+      <code>$privatekey-&gt;curveName</code>
+    </UndefinedPropertyAssignment>
+    <UndefinedVariable occurrences="1">
+      <code>$namedCurves</code>
+    </UndefinedVariable>
+  </file>
+  <file src="../phpseclib/Crypt/EC/BaseCurves/Base.php">
+    <InvalidReturnStatement occurrences="1">
+      <code>$this-&gt;convertToAffine($r)</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="2">
+      <code>int[]</code>
+      <code>object</code>
+    </InvalidReturnType>
+    <MissingConstructor occurrences="2">
+      <code>$factory</code>
+      <code>$order</code>
+    </MissingConstructor>
+    <MixedArgument occurrences="9">
+      <code>$one</code>
+      <code>$one</code>
+      <code>$points[0]</code>
+      <code>$points[1]</code>
+      <code>$r</code>
+      <code>$r[0]</code>
+      <code>$scalars[0]</code>
+      <code>$scalars[1]</code>
+      <code>$zero</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="4">
+      <code>$r</code>
+      <code>$r[$d_i]</code>
+      <code>$r[1 - $d_i]</code>
+      <code>$temp[]</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="5">
+      <code>array</code>
+      <code>integer</code>
+      <code>integer</code>
+      <code>object</code>
+      <code>object</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="1">
+      <code>negate</code>
+    </MixedMethodCall>
+    <MixedReturnStatement occurrences="5">
+      <code>$alreadyInternal ? $r[0] : $this-&gt;convertToAffine($r[0])</code>
+      <code>$this-&gt;factory-&gt;getLength()</code>
+      <code>$this-&gt;factory-&gt;getLengthInBytes()</code>
+      <code>$this-&gt;factory-&gt;newInteger($x)</code>
+      <code>$this-&gt;factory-&gt;randomInteger()</code>
+    </MixedReturnStatement>
+    <MixedReturnTypeCoercion occurrences="6">
+      <code>$p</code>
+      <code>$p</code>
+      <code>$temp</code>
+      <code>object[]</code>
+      <code>object[]</code>
+      <code>object[]</code>
+    </MixedReturnTypeCoercion>
+    <PossiblyUndefinedIntArrayOffset occurrences="10">
+      <code>$p[0]</code>
+      <code>$p[1]</code>
+      <code>$points[0]</code>
+      <code>$points[1]</code>
+      <code>$r[0]</code>
+      <code>$r[0]</code>
+      <code>$r[0]</code>
+      <code>$r[1]</code>
+      <code>$scalars[0]</code>
+      <code>$scalars[1]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUnusedMethod occurrences="3">
+      <code>createRandomMultiplier</code>
+      <code>randomInteger</code>
+      <code>setReduction</code>
+    </PossiblyUnusedMethod>
+    <RedundantPropertyInitializationCheck occurrences="1">
+      <code>isset($this-&gt;order)</code>
+    </RedundantPropertyInitializationCheck>
+    <UndefinedDocblockClass occurrences="6">
+      <code>$this-&gt;factory</code>
+      <code>$this-&gt;factory</code>
+      <code>$this-&gt;factory</code>
+      <code>$this-&gt;factory</code>
+      <code>$this-&gt;factory</code>
+      <code>Integer</code>
+    </UndefinedDocblockClass>
+    <UndefinedMethod occurrences="3">
+      <code>addPoint</code>
+      <code>addPoint</code>
+      <code>doublePoint</code>
+    </UndefinedMethod>
+  </file>
+  <file src="../phpseclib/Crypt/EC/BaseCurves/Binary.php">
+    <InvalidPropertyAssignmentValue occurrences="1"/>
+    <InvalidReturnStatement occurrences="1">
+      <code>$this-&gt;p</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="1">
+      <code>array</code>
+    </InvalidReturnType>
+    <LessSpecificReturnStatement occurrences="2">
+      <code>$this-&gt;a</code>
+      <code>$this-&gt;b</code>
+    </LessSpecificReturnStatement>
+    <MissingConstructor occurrences="7">
+      <code>$a</code>
+      <code>$b</code>
+      <code>$factory</code>
+      <code>$modulo</code>
+      <code>$one</code>
+      <code>$order</code>
+      <code>$p</code>
+    </MissingConstructor>
+    <MissingParamType occurrences="1">
+      <code>$m</code>
+    </MissingParamType>
+    <MixedAssignment occurrences="10">
+      <code>$lhs</code>
+      <code>$lhs</code>
+      <code>$rhs</code>
+      <code>$this-&gt;a</code>
+      <code>$this-&gt;b</code>
+      <code>$x2</code>
+      <code>$x3</code>
+      <code>$z</code>
+      <code>$z</code>
+      <code>$z2</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="3">
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+      <code>boolean</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="18">
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>divide</code>
+      <code>equals</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>newInteger</code>
+      <code>newInteger</code>
+      <code>newInteger</code>
+      <code>newInteger</code>
+    </MixedMethodCall>
+    <MixedReturnStatement occurrences="1">
+      <code>$lhs-&gt;equals($rhs)</code>
+    </MixedReturnStatement>
+    <MixedReturnTypeCoercion occurrences="6">
+      <code>$p</code>
+      <code>$p</code>
+      <code>$p</code>
+      <code>Integer[]</code>
+      <code>Integer[]</code>
+    </MixedReturnTypeCoercion>
+    <MoreSpecificReturnType occurrences="2">
+      <code>Integer</code>
+      <code>Integer</code>
+    </MoreSpecificReturnType>
+    <NonInvariantDocblockPropertyType occurrences="1">
+      <code>$factory</code>
+    </NonInvariantDocblockPropertyType>
+    <PossiblyFalseArgument occurrences="4">
+      <code>pack('H*', $a)</code>
+      <code>pack('H*', $b)</code>
+      <code>pack('H*', $x)</code>
+      <code>pack('H*', $y)</code>
+    </PossiblyFalseArgument>
+    <PossiblyUnusedMethod occurrences="4">
+      <code>addPoint</code>
+      <code>derivePoint</code>
+      <code>doublePoint</code>
+      <code>verifyPoint</code>
+    </PossiblyUnusedMethod>
+    <RedundantPropertyInitializationCheck occurrences="3">
+      <code>isset($this-&gt;factory)</code>
+      <code>isset($this-&gt;factory)</code>
+      <code>isset($this-&gt;factory)</code>
+    </RedundantPropertyInitializationCheck>
+    <UndefinedDocblockClass occurrences="2">
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+    </UndefinedDocblockClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/BaseCurves/KoblitzPrime.php">
+    <InvalidArgument occurrences="2">
+      <code>$lambdas[0]</code>
+      <code>$this-&gt;p</code>
+    </InvalidArgument>
+    <InvalidArrayAccess occurrences="1">
+      <code>$this-&gt;p[0]</code>
+    </InvalidArrayAccess>
+    <InvalidPropertyAssignmentValue occurrences="1">
+      <code>static::extendedGCD($lambda-&gt;toBigInteger(), $this-&gt;order)</code>
+    </InvalidPropertyAssignmentValue>
+    <InvalidReturnStatement occurrences="1"/>
+    <InvalidReturnType occurrences="1">
+      <code>BigInteger[]</code>
+    </InvalidReturnType>
+    <MissingClosureParamType occurrences="1">
+      <code>$p</code>
+    </MissingClosureParamType>
+    <MissingConstructor occurrences="2">
+      <code>$basis</code>
+      <code>$beta</code>
+    </MissingConstructor>
+    <MixedArgument occurrences="11">
+      <code>$basis['a']-&gt;toHex(true)</code>
+      <code>$basis['b']-&gt;toHex(true)</code>
+      <code>$k</code>
+      <code>$one</code>
+      <code>$one</code>
+      <code>$one</code>
+      <code>$p</code>
+      <code>$p['naf']</code>
+      <code>$rhs</code>
+      <code>$two</code>
+      <code>$two</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="6">
+      <code>$p['naf']</code>
+      <code>$p['nafwidth']</code>
+      <code>$p[0]</code>
+      <code>$p[0]</code>
+      <code>$p[1]</code>
+      <code>$p[1]</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="17">
+      <code>$a2</code>
+      <code>$b2</code>
+      <code>$beta['nafwidth']</code>
+      <code>$inv</code>
+      <code>$k</code>
+      <code>$lhs</code>
+      <code>$lhs</code>
+      <code>$npoints[$pos]</code>
+      <code>$nscalars[$pos]</code>
+      <code>$nscalars[$pos]</code>
+      <code>$p</code>
+      <code>$rhs</code>
+      <code>$rhs</code>
+      <code>$rhs</code>
+      <code>$s</code>
+      <code>$temp</code>
+      <code>$this-&gt;beta</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="4">
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+      <code>boolean</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="24">
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>compare</code>
+      <code>divide</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>negate</code>
+      <code>negate</code>
+      <code>negate</code>
+      <code>squareRoot</code>
+      <code>subtract</code>
+      <code>toBigInteger</code>
+      <code>toHex</code>
+      <code>toHex</code>
+    </MixedMethodCall>
+    <MixedReturnStatement occurrences="1">
+      <code>$lhs-&gt;equals($rhs)</code>
+    </MixedReturnStatement>
+    <PossiblyFalseReference occurrences="1">
+      <code>multiply</code>
+    </PossiblyFalseReference>
+    <PossiblyUndefinedIntArrayOffset occurrences="1">
+      <code>$this-&gt;multiplyPoint($this-&gt;p, $lambdas[0])[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedVariable occurrences="4">
+      <code>$a0</code>
+      <code>$a0</code>
+      <code>$b0</code>
+      <code>$b0</code>
+    </PossiblyUndefinedVariable>
+    <RedundantPropertyInitializationCheck occurrences="2">
+      <code>isset($this-&gt;basis)</code>
+      <code>isset($this-&gt;beta)</code>
+    </RedundantPropertyInitializationCheck>
+    <UndefinedDocblockClass occurrences="5">
+      <code>$this-&gt;factory</code>
+      <code>$this-&gt;factory</code>
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+    </UndefinedDocblockClass>
+    <UndefinedMethod occurrences="2">
+      <code>$basis</code>
+      <code>$basis</code>
+    </UndefinedMethod>
+  </file>
+  <file src="../phpseclib/Crypt/EC/BaseCurves/Montgomery.php">
+    <InvalidPropertyAssignmentValue occurrences="1"/>
+    <InvalidReturnStatement occurrences="1">
+      <code>$this-&gt;p</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="2">
+      <code>PrimeInteger[]</code>
+      <code>array</code>
+    </InvalidReturnType>
+    <LessSpecificReturnStatement occurrences="1">
+      <code>[clone $this-&gt;zero, clone $this-&gt;one]</code>
+    </LessSpecificReturnStatement>
+    <MissingConstructor occurrences="8">
+      <code>$a</code>
+      <code>$a24</code>
+      <code>$factory</code>
+      <code>$modulo</code>
+      <code>$one</code>
+      <code>$order</code>
+      <code>$p</code>
+      <code>$zero</code>
+    </MissingConstructor>
+    <MixedArgument occurrences="2">
+      <code>$x</code>
+      <code>$x</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="2">
+      <code>$x</code>
+      <code>$z</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>FiniteField[][]</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="1">
+      <code>divide</code>
+    </MixedMethodCall>
+    <MixedReturnTypeCoercion occurrences="6">
+      <code>$p</code>
+      <code>$p</code>
+      <code>$p</code>
+      <code>PrimeInteger[]</code>
+      <code>PrimeInteger[]</code>
+      <code>[$x-&gt;divide($z)]</code>
+    </MixedReturnTypeCoercion>
+    <NonInvariantDocblockPropertyType occurrences="1">
+      <code>$factory</code>
+    </NonInvariantDocblockPropertyType>
+    <PossiblyUndefinedIntArrayOffset occurrences="1">
+      <code>$p[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUnusedMethod occurrences="2">
+      <code>setBasePoint</code>
+      <code>setCoefficients</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedProperty occurrences="2">
+      <code>$a24</code>
+      <code>$modulo</code>
+    </PossiblyUnusedProperty>
+    <RedundantPropertyInitializationCheck occurrences="3">
+      <code>isset($this-&gt;factory)</code>
+      <code>isset($this-&gt;factory)</code>
+      <code>isset($this-&gt;factory)</code>
+    </RedundantPropertyInitializationCheck>
+    <UndefinedDocblockClass occurrences="1">
+      <code>FiniteField[][]</code>
+    </UndefinedDocblockClass>
+    <UndefinedVariable occurrences="1">
+      <code>$x</code>
+    </UndefinedVariable>
+  </file>
+  <file src="../phpseclib/Crypt/EC/BaseCurves/Prime.php">
+    <InvalidArgument occurrences="1">
+      <code>$jsf[0]</code>
+    </InvalidArgument>
+    <InvalidArrayAccess occurrences="2">
+      <code>$jsf[0][$j]</code>
+      <code>$jsf[1][$j]</code>
+    </InvalidArrayAccess>
+    <InvalidPropertyAssignmentValue occurrences="2">
+      <code>new PrimeField($modulo)</code>
+    </InvalidPropertyAssignmentValue>
+    <InvalidReturnStatement occurrences="3">
+      <code>$jsf</code>
+      <code>$this-&gt;convertToAffine($acc)</code>
+      <code>$this-&gt;p</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="3">
+      <code>array</code>
+      <code>int[]</code>
+      <code>int[]</code>
+    </InvalidReturnType>
+    <LessSpecificReturnStatement occurrences="2">
+      <code>$this-&gt;a</code>
+      <code>$this-&gt;b</code>
+    </LessSpecificReturnStatement>
+    <MissingConstructor occurrences="22">
+      <code>$a</code>
+      <code>$a</code>
+      <code>$b</code>
+      <code>$b</code>
+      <code>$eight</code>
+      <code>$eight</code>
+      <code>$factory</code>
+      <code>$factory</code>
+      <code>$four</code>
+      <code>$four</code>
+      <code>$modulo</code>
+      <code>$modulo</code>
+      <code>$one</code>
+      <code>$one</code>
+      <code>$order</code>
+      <code>$order</code>
+      <code>$p</code>
+      <code>$p</code>
+      <code>$three</code>
+      <code>$three</code>
+      <code>$two</code>
+      <code>$two</code>
+    </MissingConstructor>
+    <MissingParamType occurrences="1">
+      <code>$m</code>
+    </MissingParamType>
+    <MixedArgument occurrences="14">
+      <code>$m</code>
+      <code>$naf[$a]</code>
+      <code>$naf[$b]</code>
+      <code>$p</code>
+      <code>$point</code>
+      <code>$points[$a]</code>
+      <code>$points[$a]</code>
+      <code>$points[$b]</code>
+      <code>$points[$b]</code>
+      <code>$points[$i]</code>
+      <code>$points[0]</code>
+      <code>$scalars[$a]</code>
+      <code>$scalars[$b]</code>
+      <code>$wnd[$j][(-$z - 1) &gt;&gt; 1]</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="2">
+      <code>$points[$i]['nafwidth']</code>
+      <code>$points[0]['nafwidth']</code>
+    </MixedArrayAccess>
+    <MixedArrayOffset occurrences="1">
+      <code>$wnd[$j][($z - 1) &gt;&gt; 1]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="42">
+      <code>$b</code>
+      <code>$bn</code>
+      <code>$jsf[0][]</code>
+      <code>$jsf[1][]</code>
+      <code>$k1</code>
+      <code>$k1</code>
+      <code>$k2</code>
+      <code>$k2</code>
+      <code>$lhs</code>
+      <code>$m14</code>
+      <code>$m14</code>
+      <code>$m14</code>
+      <code>$m24</code>
+      <code>$m24</code>
+      <code>$m24</code>
+      <code>$m8</code>
+      <code>$m8</code>
+      <code>$m8</code>
+      <code>$m8</code>
+      <code>$m8</code>
+      <code>$m8</code>
+      <code>$naf[$a]</code>
+      <code>$naf[$b]</code>
+      <code>$p</code>
+      <code>$point</code>
+      <code>$rhs</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp[$j]</code>
+      <code>$this-&gt;a</code>
+      <code>$this-&gt;b</code>
+      <code>$u1</code>
+      <code>$u2</code>
+      <code>$wndWidth[]</code>
+      <code>$yp</code>
+      <code>$z</code>
+      <code>$z</code>
+      <code>$z</code>
+      <code>$z2</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="10">
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+      <code>boolean</code>
+      <code>list&lt;array&gt;</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="40">
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>bitwise_rightShift</code>
+      <code>bitwise_rightShift</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>divide</code>
+      <code>equals</code>
+      <code>getNAF</code>
+      <code>getNAF</code>
+      <code>isOdd</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>negate</code>
+      <code>newInteger</code>
+      <code>newInteger</code>
+      <code>newInteger</code>
+      <code>newInteger</code>
+      <code>squareRoot</code>
+      <code>testBit</code>
+      <code>testBit</code>
+      <code>testBit</code>
+      <code>testBit</code>
+      <code>testBit</code>
+      <code>testBit</code>
+      <code>testBit</code>
+      <code>testBit</code>
+      <code>testBit</code>
+      <code>testBit</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="23">
+      <code>$k1-&gt;testBit(0)</code>
+      <code>$k1-&gt;testBit(0)</code>
+      <code>$k1-&gt;testBit(1)</code>
+      <code>$k1-&gt;testBit(1)</code>
+      <code>$k1-&gt;testBit(2)</code>
+      <code>$k2-&gt;testBit(0)</code>
+      <code>$k2-&gt;testBit(0)</code>
+      <code>$k2-&gt;testBit(1)</code>
+      <code>$k2-&gt;testBit(1)</code>
+      <code>$k2-&gt;testBit(2)</code>
+      <code>$m14</code>
+      <code>$m14</code>
+      <code>$m14</code>
+      <code>$m24</code>
+      <code>$m24</code>
+      <code>$m24</code>
+      <code>$m8</code>
+      <code>$m8</code>
+      <code>$m8</code>
+      <code>$m8</code>
+      <code>$u1</code>
+      <code>$u2</code>
+      <code>$z</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="2">
+      <code>$lhs-&gt;equals($rhs)</code>
+      <code>$point['naf']</code>
+    </MixedReturnStatement>
+    <MixedReturnTypeCoercion occurrences="6">
+      <code>$p</code>
+      <code>$p</code>
+      <code>$p</code>
+      <code>PrimeInteger[]</code>
+      <code>PrimeInteger[]</code>
+    </MixedReturnTypeCoercion>
+    <MoreSpecificReturnType occurrences="2">
+      <code>PrimeInteger</code>
+      <code>PrimeInteger</code>
+    </MoreSpecificReturnType>
+    <NonInvariantDocblockPropertyType occurrences="1">
+      <code>$factory</code>
+    </NonInvariantDocblockPropertyType>
+    <PossiblyNullArgument occurrences="1">
+      <code>$dbl</code>
+    </PossiblyNullArgument>
+    <PossiblyUndefinedIntArrayOffset occurrences="2">
+      <code>$jsf[0]</code>
+      <code>$points[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUnusedMethod occurrences="8">
+      <code>derivePoint</code>
+      <code>doublePointHelper</code>
+      <code>jacobianAddPoint</code>
+      <code>jacobianAddPointMixedX</code>
+      <code>jacobianAddPointMixedXY</code>
+      <code>jacobianDoublePoint</code>
+      <code>jacobianDoublePointMixed</code>
+      <code>verifyPoint</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedParam occurrences="3">
+      <code>$p</code>
+      <code>$p</code>
+      <code>$q</code>
+    </PossiblyUnusedParam>
+    <PossiblyUnusedProperty occurrences="2">
+      <code>$eight</code>
+      <code>$four</code>
+    </PossiblyUnusedProperty>
+    <RedundantPropertyInitializationCheck occurrences="3">
+      <code>isset($this-&gt;factory)</code>
+      <code>isset($this-&gt;factory)</code>
+      <code>isset($this-&gt;factory)</code>
+    </RedundantPropertyInitializationCheck>
+    <UndefinedDocblockClass occurrences="13">
+      <code>$this-&gt;factory</code>
+      <code>$this-&gt;factory</code>
+      <code>$this-&gt;factory</code>
+      <code>$this-&gt;factory</code>
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+      <code>PrimeFields</code>
+    </UndefinedDocblockClass>
+    <UndefinedMethod occurrences="2">
+      <code>toBigInteger</code>
+      <code>toBigInteger</code>
+    </UndefinedMethod>
+    <UnusedVariable occurrences="1">
+      <code>$p</code>
+    </UnusedVariable>
+  </file>
+  <file src="../phpseclib/Crypt/EC/BaseCurves/TwistedEdwards.php">
+    <InvalidPropertyAssignmentValue occurrences="1">
+      <code>new PrimeField($modulo)</code>
+    </InvalidPropertyAssignmentValue>
+    <LessSpecificReturnStatement occurrences="2">
+      <code>$this-&gt;a</code>
+      <code>$this-&gt;d</code>
+    </LessSpecificReturnStatement>
+    <MissingConstructor occurrences="7">
+      <code>$a</code>
+      <code>$d</code>
+      <code>$modulo</code>
+      <code>$one</code>
+      <code>$p</code>
+      <code>$two</code>
+      <code>$zero</code>
+    </MissingConstructor>
+    <MissingParamType occurrences="2">
+      <code>$x</code>
+      <code>$y</code>
+    </MissingParamType>
+    <MixedAssignment occurrences="8">
+      <code>$lhs</code>
+      <code>$rhs</code>
+      <code>$this-&gt;a</code>
+      <code>$this-&gt;d</code>
+      <code>$x2</code>
+      <code>$y2</code>
+      <code>$z</code>
+      <code>$z</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>boolean</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="11">
+      <code>add</code>
+      <code>add</code>
+      <code>divide</code>
+      <code>equals</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+    </MixedMethodCall>
+    <MixedPropertyTypeCoercion occurrences="1"/>
+    <MixedReturnStatement occurrences="1">
+      <code>$lhs-&gt;equals($rhs)</code>
+    </MixedReturnStatement>
+    <MixedReturnTypeCoercion occurrences="3">
+      <code>$p</code>
+      <code>PrimeInteger[]</code>
+    </MixedReturnTypeCoercion>
+    <MoreSpecificReturnType occurrences="2">
+      <code>PrimeInteger</code>
+      <code>PrimeInteger</code>
+    </MoreSpecificReturnType>
+    <PossiblyUnusedMethod occurrences="2">
+      <code>getA</code>
+      <code>getD</code>
+    </PossiblyUnusedMethod>
+    <RedundantPropertyInitializationCheck occurrences="3">
+      <code>isset($this-&gt;factory)</code>
+      <code>isset($this-&gt;factory)</code>
+      <code>isset($this-&gt;factory)</code>
+    </RedundantPropertyInitializationCheck>
+    <UndefinedDocblockClass occurrences="4">
+      <code>$this-&gt;factory</code>
+      <code>$this-&gt;factory</code>
+      <code>$this-&gt;factory</code>
+      <code>$this-&gt;factory</code>
+    </UndefinedDocblockClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/Curve25519.php">
+    <InvalidPropertyAssignmentValue occurrences="1">
+      <code>[$this-&gt;factory-&gt;newInteger(new BigInteger(9))]</code>
+    </InvalidPropertyAssignmentValue>
+    <PossiblyNullReference occurrences="2">
+      <code>newInteger</code>
+      <code>newInteger</code>
+    </PossiblyNullReference>
+    <PropertyNotSetInConstructor occurrences="6">
+      <code>Curve25519</code>
+      <code>Curve25519</code>
+      <code>Curve25519</code>
+      <code>Curve25519</code>
+      <code>Curve25519</code>
+      <code>Curve25519</code>
+    </PropertyNotSetInConstructor>
+    <UninitializedProperty occurrences="2">
+      <code>$this-&gt;factory</code>
+      <code>$this-&gt;factory</code>
+    </UninitializedProperty>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/Curve448.php">
+    <InvalidPropertyAssignmentValue occurrences="1">
+      <code>[$this-&gt;factory-&gt;newInteger(new BigInteger(5))]</code>
+    </InvalidPropertyAssignmentValue>
+    <PossiblyNullReference occurrences="2">
+      <code>newInteger</code>
+      <code>newInteger</code>
+    </PossiblyNullReference>
+    <PropertyNotSetInConstructor occurrences="6">
+      <code>Curve448</code>
+      <code>Curve448</code>
+      <code>Curve448</code>
+      <code>Curve448</code>
+      <code>Curve448</code>
+      <code>Curve448</code>
+    </PropertyNotSetInConstructor>
+    <UninitializedProperty occurrences="2">
+      <code>$this-&gt;factory</code>
+      <code>$this-&gt;factory</code>
+    </UninitializedProperty>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/Ed25519.php">
+    <InvalidReturnStatement occurrences="1">
+      <code>clone $this-&gt;zero</code>
+    </InvalidReturnStatement>
+    <MixedArgument occurrences="1">
+      <code>$y</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="1">
+      <code>$y[0]</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="2">
+      <code>$y[0]</code>
+      <code>$y[0]</code>
+    </MixedArrayAssignment>
+    <MixedAssignment occurrences="12">
+      <code>$temp</code>
+      <code>$u</code>
+      <code>$v</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x2</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$y2</code>
+      <code>$y[0]</code>
+      <code>$y[0]</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="4">
+      <code>BigInteger</code>
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+      <code>Integer[]</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="19">
+      <code>add</code>
+      <code>divide</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>isOdd</code>
+      <code>isOdd</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>negate</code>
+      <code>pow</code>
+      <code>pow</code>
+      <code>subtract</code>
+      <code>subtract</code>
+      <code>subtract</code>
+      <code>toBytes</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="2">
+      <code>$y[0]</code>
+      <code>$y[0]</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="1">
+      <code>$this-&gt;extractSecret(Random::string(32))['dA']</code>
+    </MixedReturnStatement>
+    <MixedReturnTypeCoercion occurrences="2">
+      <code>[$x, $y]</code>
+      <code>object[]</code>
+    </MixedReturnTypeCoercion>
+    <PossiblyUndefinedStringArrayOffset occurrences="1">
+      <code>$this-&gt;extractSecret(Random::string(32))['dA']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUnusedMethod occurrences="3">
+      <code>addPoint</code>
+      <code>doublePoint</code>
+      <code>recoverX</code>
+    </PossiblyUnusedMethod>
+    <PropertyNotSetInConstructor occurrences="9">
+      <code>Ed25519</code>
+      <code>Ed25519</code>
+      <code>Ed25519</code>
+      <code>Ed25519</code>
+      <code>Ed25519</code>
+      <code>Ed25519</code>
+      <code>Ed25519</code>
+      <code>Ed25519</code>
+      <code>Ed25519</code>
+    </PropertyNotSetInConstructor>
+    <UndefinedDocblockClass occurrences="4">
+      <code>$this-&gt;factory</code>
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+      <code>Integer[]</code>
+    </UndefinedDocblockClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/Ed448.php">
+    <InvalidReturnStatement occurrences="1">
+      <code>clone $this-&gt;zero</code>
+    </InvalidReturnStatement>
+    <LessSpecificReturnStatement occurrences="1">
+      <code>[clone $this-&gt;zero, clone $this-&gt;one, clone $this-&gt;one]</code>
+    </LessSpecificReturnStatement>
+    <MixedAssignment occurrences="7">
+      <code>$u</code>
+      <code>$v</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x2</code>
+      <code>$y</code>
+      <code>$y2</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="3">
+      <code>BigInteger</code>
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="14">
+      <code>divide</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>isOdd</code>
+      <code>isOdd</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>negate</code>
+      <code>pow</code>
+      <code>subtract</code>
+      <code>subtract</code>
+      <code>subtract</code>
+      <code>toBytes</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="1">
+      <code>$y-&gt;toBytes()</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="1">
+      <code>$this-&gt;extractSecret(Random::string(57))['dA']</code>
+    </MixedReturnStatement>
+    <MixedReturnTypeCoercion occurrences="5">
+      <code>$p</code>
+      <code>$p</code>
+      <code>Integer[]</code>
+      <code>[$x, $y]</code>
+      <code>object[]</code>
+    </MixedReturnTypeCoercion>
+    <PossiblyUndefinedStringArrayOffset occurrences="1">
+      <code>$this-&gt;extractSecret(Random::string(57))['dA']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUnusedMethod occurrences="4">
+      <code>addPoint</code>
+      <code>doublePoint</code>
+      <code>encodePoint</code>
+      <code>recoverX</code>
+    </PossiblyUnusedMethod>
+    <PropertyNotSetInConstructor occurrences="9">
+      <code>Ed448</code>
+      <code>Ed448</code>
+      <code>Ed448</code>
+      <code>Ed448</code>
+      <code>Ed448</code>
+      <code>Ed448</code>
+      <code>Ed448</code>
+      <code>Ed448</code>
+      <code>Ed448</code>
+    </PropertyNotSetInConstructor>
+    <UndefinedDocblockClass occurrences="3">
+      <code>$this-&gt;factory</code>
+      <code>FiniteField[]</code>
+      <code>FiniteField[]</code>
+    </UndefinedDocblockClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/brainpoolP160r1.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>brainpoolP160r1</code>
+      <code>brainpoolP160r1</code>
+      <code>brainpoolP160r1</code>
+      <code>brainpoolP160r1</code>
+      <code>brainpoolP160r1</code>
+      <code>brainpoolP160r1</code>
+      <code>brainpoolP160r1</code>
+      <code>brainpoolP160r1</code>
+      <code>brainpoolP160r1</code>
+      <code>brainpoolP160r1</code>
+      <code>brainpoolP160r1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>brainpoolP160r1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/brainpoolP160t1.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>brainpoolP160t1</code>
+      <code>brainpoolP160t1</code>
+      <code>brainpoolP160t1</code>
+      <code>brainpoolP160t1</code>
+      <code>brainpoolP160t1</code>
+      <code>brainpoolP160t1</code>
+      <code>brainpoolP160t1</code>
+      <code>brainpoolP160t1</code>
+      <code>brainpoolP160t1</code>
+      <code>brainpoolP160t1</code>
+      <code>brainpoolP160t1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>brainpoolP160t1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/brainpoolP192r1.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>brainpoolP192r1</code>
+      <code>brainpoolP192r1</code>
+      <code>brainpoolP192r1</code>
+      <code>brainpoolP192r1</code>
+      <code>brainpoolP192r1</code>
+      <code>brainpoolP192r1</code>
+      <code>brainpoolP192r1</code>
+      <code>brainpoolP192r1</code>
+      <code>brainpoolP192r1</code>
+      <code>brainpoolP192r1</code>
+      <code>brainpoolP192r1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>brainpoolP192r1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/brainpoolP192t1.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>brainpoolP192t1</code>
+      <code>brainpoolP192t1</code>
+      <code>brainpoolP192t1</code>
+      <code>brainpoolP192t1</code>
+      <code>brainpoolP192t1</code>
+      <code>brainpoolP192t1</code>
+      <code>brainpoolP192t1</code>
+      <code>brainpoolP192t1</code>
+      <code>brainpoolP192t1</code>
+      <code>brainpoolP192t1</code>
+      <code>brainpoolP192t1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>brainpoolP192t1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/brainpoolP224r1.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>brainpoolP224r1</code>
+      <code>brainpoolP224r1</code>
+      <code>brainpoolP224r1</code>
+      <code>brainpoolP224r1</code>
+      <code>brainpoolP224r1</code>
+      <code>brainpoolP224r1</code>
+      <code>brainpoolP224r1</code>
+      <code>brainpoolP224r1</code>
+      <code>brainpoolP224r1</code>
+      <code>brainpoolP224r1</code>
+      <code>brainpoolP224r1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>brainpoolP224r1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/brainpoolP224t1.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>brainpoolP224t1</code>
+      <code>brainpoolP224t1</code>
+      <code>brainpoolP224t1</code>
+      <code>brainpoolP224t1</code>
+      <code>brainpoolP224t1</code>
+      <code>brainpoolP224t1</code>
+      <code>brainpoolP224t1</code>
+      <code>brainpoolP224t1</code>
+      <code>brainpoolP224t1</code>
+      <code>brainpoolP224t1</code>
+      <code>brainpoolP224t1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>brainpoolP224t1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/brainpoolP256r1.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>brainpoolP256r1</code>
+      <code>brainpoolP256r1</code>
+      <code>brainpoolP256r1</code>
+      <code>brainpoolP256r1</code>
+      <code>brainpoolP256r1</code>
+      <code>brainpoolP256r1</code>
+      <code>brainpoolP256r1</code>
+      <code>brainpoolP256r1</code>
+      <code>brainpoolP256r1</code>
+      <code>brainpoolP256r1</code>
+      <code>brainpoolP256r1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>brainpoolP256r1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/brainpoolP256t1.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>brainpoolP256t1</code>
+      <code>brainpoolP256t1</code>
+      <code>brainpoolP256t1</code>
+      <code>brainpoolP256t1</code>
+      <code>brainpoolP256t1</code>
+      <code>brainpoolP256t1</code>
+      <code>brainpoolP256t1</code>
+      <code>brainpoolP256t1</code>
+      <code>brainpoolP256t1</code>
+      <code>brainpoolP256t1</code>
+      <code>brainpoolP256t1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>brainpoolP256t1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/brainpoolP320r1.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>brainpoolP320r1</code>
+      <code>brainpoolP320r1</code>
+      <code>brainpoolP320r1</code>
+      <code>brainpoolP320r1</code>
+      <code>brainpoolP320r1</code>
+      <code>brainpoolP320r1</code>
+      <code>brainpoolP320r1</code>
+      <code>brainpoolP320r1</code>
+      <code>brainpoolP320r1</code>
+      <code>brainpoolP320r1</code>
+      <code>brainpoolP320r1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>brainpoolP320r1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/brainpoolP320t1.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>brainpoolP320t1</code>
+      <code>brainpoolP320t1</code>
+      <code>brainpoolP320t1</code>
+      <code>brainpoolP320t1</code>
+      <code>brainpoolP320t1</code>
+      <code>brainpoolP320t1</code>
+      <code>brainpoolP320t1</code>
+      <code>brainpoolP320t1</code>
+      <code>brainpoolP320t1</code>
+      <code>brainpoolP320t1</code>
+      <code>brainpoolP320t1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>brainpoolP320t1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/brainpoolP384r1.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>brainpoolP384r1</code>
+      <code>brainpoolP384r1</code>
+      <code>brainpoolP384r1</code>
+      <code>brainpoolP384r1</code>
+      <code>brainpoolP384r1</code>
+      <code>brainpoolP384r1</code>
+      <code>brainpoolP384r1</code>
+      <code>brainpoolP384r1</code>
+      <code>brainpoolP384r1</code>
+      <code>brainpoolP384r1</code>
+      <code>brainpoolP384r1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>brainpoolP384r1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/brainpoolP384t1.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>brainpoolP384t1</code>
+      <code>brainpoolP384t1</code>
+      <code>brainpoolP384t1</code>
+      <code>brainpoolP384t1</code>
+      <code>brainpoolP384t1</code>
+      <code>brainpoolP384t1</code>
+      <code>brainpoolP384t1</code>
+      <code>brainpoolP384t1</code>
+      <code>brainpoolP384t1</code>
+      <code>brainpoolP384t1</code>
+      <code>brainpoolP384t1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>brainpoolP384t1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/brainpoolP512r1.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>brainpoolP512r1</code>
+      <code>brainpoolP512r1</code>
+      <code>brainpoolP512r1</code>
+      <code>brainpoolP512r1</code>
+      <code>brainpoolP512r1</code>
+      <code>brainpoolP512r1</code>
+      <code>brainpoolP512r1</code>
+      <code>brainpoolP512r1</code>
+      <code>brainpoolP512r1</code>
+      <code>brainpoolP512r1</code>
+      <code>brainpoolP512r1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>brainpoolP512r1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/brainpoolP512t1.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>brainpoolP512t1</code>
+      <code>brainpoolP512t1</code>
+      <code>brainpoolP512t1</code>
+      <code>brainpoolP512t1</code>
+      <code>brainpoolP512t1</code>
+      <code>brainpoolP512t1</code>
+      <code>brainpoolP512t1</code>
+      <code>brainpoolP512t1</code>
+      <code>brainpoolP512t1</code>
+      <code>brainpoolP512t1</code>
+      <code>brainpoolP512t1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>brainpoolP512t1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/nistb233.php">
+    <UnusedClass occurrences="1">
+      <code>nistb233</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/nistb409.php">
+    <UnusedClass occurrences="1">
+      <code>nistb409</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/nistk163.php">
+    <UnusedClass occurrences="1">
+      <code>nistk163</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/nistk233.php">
+    <UnusedClass occurrences="1">
+      <code>nistk233</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/nistk283.php">
+    <UnusedClass occurrences="1">
+      <code>nistk283</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/nistk409.php">
+    <UnusedClass occurrences="1">
+      <code>nistk409</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/nistp192.php">
+    <UnusedClass occurrences="1">
+      <code>nistp192</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/nistp224.php">
+    <UnusedClass occurrences="1">
+      <code>nistp224</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/nistp256.php">
+    <UnusedClass occurrences="1">
+      <code>nistp256</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/nistp384.php">
+    <UnusedClass occurrences="1">
+      <code>nistp384</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/nistp521.php">
+    <UnusedClass occurrences="1">
+      <code>nistp521</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/nistt571.php">
+    <UnusedClass occurrences="1">
+      <code>nistt571</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/prime192v1.php">
+    <UnusedClass occurrences="1">
+      <code>prime192v1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/prime192v2.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>prime192v2</code>
+      <code>prime192v2</code>
+      <code>prime192v2</code>
+      <code>prime192v2</code>
+      <code>prime192v2</code>
+      <code>prime192v2</code>
+      <code>prime192v2</code>
+      <code>prime192v2</code>
+      <code>prime192v2</code>
+      <code>prime192v2</code>
+      <code>prime192v2</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>prime192v2</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/prime192v3.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>prime192v3</code>
+      <code>prime192v3</code>
+      <code>prime192v3</code>
+      <code>prime192v3</code>
+      <code>prime192v3</code>
+      <code>prime192v3</code>
+      <code>prime192v3</code>
+      <code>prime192v3</code>
+      <code>prime192v3</code>
+      <code>prime192v3</code>
+      <code>prime192v3</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>prime192v3</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/prime239v1.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>prime239v1</code>
+      <code>prime239v1</code>
+      <code>prime239v1</code>
+      <code>prime239v1</code>
+      <code>prime239v1</code>
+      <code>prime239v1</code>
+      <code>prime239v1</code>
+      <code>prime239v1</code>
+      <code>prime239v1</code>
+      <code>prime239v1</code>
+      <code>prime239v1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>prime239v1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/prime239v2.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>prime239v2</code>
+      <code>prime239v2</code>
+      <code>prime239v2</code>
+      <code>prime239v2</code>
+      <code>prime239v2</code>
+      <code>prime239v2</code>
+      <code>prime239v2</code>
+      <code>prime239v2</code>
+      <code>prime239v2</code>
+      <code>prime239v2</code>
+      <code>prime239v2</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>prime239v2</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/prime239v3.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>prime239v3</code>
+      <code>prime239v3</code>
+      <code>prime239v3</code>
+      <code>prime239v3</code>
+      <code>prime239v3</code>
+      <code>prime239v3</code>
+      <code>prime239v3</code>
+      <code>prime239v3</code>
+      <code>prime239v3</code>
+      <code>prime239v3</code>
+      <code>prime239v3</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>prime239v3</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/prime256v1.php">
+    <UnusedClass occurrences="1">
+      <code>prime256v1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/secp112r1.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>secp112r1</code>
+      <code>secp112r1</code>
+      <code>secp112r1</code>
+      <code>secp112r1</code>
+      <code>secp112r1</code>
+      <code>secp112r1</code>
+      <code>secp112r1</code>
+      <code>secp112r1</code>
+      <code>secp112r1</code>
+      <code>secp112r1</code>
+      <code>secp112r1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>secp112r1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/secp112r2.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>secp112r2</code>
+      <code>secp112r2</code>
+      <code>secp112r2</code>
+      <code>secp112r2</code>
+      <code>secp112r2</code>
+      <code>secp112r2</code>
+      <code>secp112r2</code>
+      <code>secp112r2</code>
+      <code>secp112r2</code>
+      <code>secp112r2</code>
+      <code>secp112r2</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>secp112r2</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/secp128r1.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>secp128r1</code>
+      <code>secp128r1</code>
+      <code>secp128r1</code>
+      <code>secp128r1</code>
+      <code>secp128r1</code>
+      <code>secp128r1</code>
+      <code>secp128r1</code>
+      <code>secp128r1</code>
+      <code>secp128r1</code>
+      <code>secp128r1</code>
+      <code>secp128r1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>secp128r1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/secp128r2.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>secp128r2</code>
+      <code>secp128r2</code>
+      <code>secp128r2</code>
+      <code>secp128r2</code>
+      <code>secp128r2</code>
+      <code>secp128r2</code>
+      <code>secp128r2</code>
+      <code>secp128r2</code>
+      <code>secp128r2</code>
+      <code>secp128r2</code>
+      <code>secp128r2</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>secp128r2</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/secp160k1.php">
+    <MixedAssignment occurrences="1">
+      <code>$this-&gt;beta</code>
+    </MixedAssignment>
+    <PossiblyNullReference occurrences="1">
+      <code>newInteger</code>
+    </PossiblyNullReference>
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>secp160k1</code>
+      <code>secp160k1</code>
+      <code>secp160k1</code>
+      <code>secp160k1</code>
+      <code>secp160k1</code>
+      <code>secp160k1</code>
+      <code>secp160k1</code>
+      <code>secp160k1</code>
+      <code>secp160k1</code>
+      <code>secp160k1</code>
+      <code>secp160k1</code>
+    </PropertyNotSetInConstructor>
+    <UndefinedDocblockClass occurrences="1">
+      <code>$this-&gt;factory</code>
+    </UndefinedDocblockClass>
+    <UninitializedProperty occurrences="1">
+      <code>$this-&gt;factory</code>
+    </UninitializedProperty>
+    <UnusedClass occurrences="1">
+      <code>secp160k1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/secp160r1.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>secp160r1</code>
+      <code>secp160r1</code>
+      <code>secp160r1</code>
+      <code>secp160r1</code>
+      <code>secp160r1</code>
+      <code>secp160r1</code>
+      <code>secp160r1</code>
+      <code>secp160r1</code>
+      <code>secp160r1</code>
+      <code>secp160r1</code>
+      <code>secp160r1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>secp160r1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/secp160r2.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>secp160r2</code>
+      <code>secp160r2</code>
+      <code>secp160r2</code>
+      <code>secp160r2</code>
+      <code>secp160r2</code>
+      <code>secp160r2</code>
+      <code>secp160r2</code>
+      <code>secp160r2</code>
+      <code>secp160r2</code>
+      <code>secp160r2</code>
+      <code>secp160r2</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>secp160r2</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/secp192k1.php">
+    <MixedAssignment occurrences="1">
+      <code>$this-&gt;beta</code>
+    </MixedAssignment>
+    <PossiblyNullReference occurrences="1">
+      <code>newInteger</code>
+    </PossiblyNullReference>
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>secp192k1</code>
+      <code>secp192k1</code>
+      <code>secp192k1</code>
+      <code>secp192k1</code>
+      <code>secp192k1</code>
+      <code>secp192k1</code>
+      <code>secp192k1</code>
+      <code>secp192k1</code>
+      <code>secp192k1</code>
+      <code>secp192k1</code>
+      <code>secp192k1</code>
+    </PropertyNotSetInConstructor>
+    <UndefinedDocblockClass occurrences="1">
+      <code>$this-&gt;factory</code>
+    </UndefinedDocblockClass>
+    <UninitializedProperty occurrences="1">
+      <code>$this-&gt;factory</code>
+    </UninitializedProperty>
+    <UnusedClass occurrences="1">
+      <code>secp192k1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/secp192r1.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>secp192r1</code>
+      <code>secp192r1</code>
+      <code>secp192r1</code>
+      <code>secp192r1</code>
+      <code>secp192r1</code>
+      <code>secp192r1</code>
+      <code>secp192r1</code>
+      <code>secp192r1</code>
+      <code>secp192r1</code>
+      <code>secp192r1</code>
+      <code>secp192r1</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/secp224k1.php">
+    <MixedAssignment occurrences="1">
+      <code>$this-&gt;beta</code>
+    </MixedAssignment>
+    <PossiblyNullReference occurrences="1">
+      <code>newInteger</code>
+    </PossiblyNullReference>
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>secp224k1</code>
+      <code>secp224k1</code>
+      <code>secp224k1</code>
+      <code>secp224k1</code>
+      <code>secp224k1</code>
+      <code>secp224k1</code>
+      <code>secp224k1</code>
+      <code>secp224k1</code>
+      <code>secp224k1</code>
+      <code>secp224k1</code>
+      <code>secp224k1</code>
+    </PropertyNotSetInConstructor>
+    <UndefinedDocblockClass occurrences="1">
+      <code>$this-&gt;factory</code>
+    </UndefinedDocblockClass>
+    <UninitializedProperty occurrences="1">
+      <code>$this-&gt;factory</code>
+    </UninitializedProperty>
+    <UnusedClass occurrences="1">
+      <code>secp224k1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/secp224r1.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>secp224r1</code>
+      <code>secp224r1</code>
+      <code>secp224r1</code>
+      <code>secp224r1</code>
+      <code>secp224r1</code>
+      <code>secp224r1</code>
+      <code>secp224r1</code>
+      <code>secp224r1</code>
+      <code>secp224r1</code>
+      <code>secp224r1</code>
+      <code>secp224r1</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/secp256k1.php">
+    <MixedAssignment occurrences="1">
+      <code>$this-&gt;beta</code>
+    </MixedAssignment>
+    <PossiblyNullReference occurrences="1">
+      <code>newInteger</code>
+    </PossiblyNullReference>
+    <PossiblyUnusedMethod occurrences="1">
+      <code>__construct</code>
+    </PossiblyUnusedMethod>
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>secp256k1</code>
+      <code>secp256k1</code>
+      <code>secp256k1</code>
+      <code>secp256k1</code>
+      <code>secp256k1</code>
+      <code>secp256k1</code>
+      <code>secp256k1</code>
+      <code>secp256k1</code>
+      <code>secp256k1</code>
+      <code>secp256k1</code>
+      <code>secp256k1</code>
+    </PropertyNotSetInConstructor>
+    <UndefinedDocblockClass occurrences="1">
+      <code>$this-&gt;factory</code>
+    </UndefinedDocblockClass>
+    <UninitializedProperty occurrences="1">
+      <code>$this-&gt;factory</code>
+    </UninitializedProperty>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/secp256r1.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>secp256r1</code>
+      <code>secp256r1</code>
+      <code>secp256r1</code>
+      <code>secp256r1</code>
+      <code>secp256r1</code>
+      <code>secp256r1</code>
+      <code>secp256r1</code>
+      <code>secp256r1</code>
+      <code>secp256r1</code>
+      <code>secp256r1</code>
+      <code>secp256r1</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/secp384r1.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>secp384r1</code>
+      <code>secp384r1</code>
+      <code>secp384r1</code>
+      <code>secp384r1</code>
+      <code>secp384r1</code>
+      <code>secp384r1</code>
+      <code>secp384r1</code>
+      <code>secp384r1</code>
+      <code>secp384r1</code>
+      <code>secp384r1</code>
+      <code>secp384r1</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/secp521r1.php">
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>secp521r1</code>
+      <code>secp521r1</code>
+      <code>secp521r1</code>
+      <code>secp521r1</code>
+      <code>secp521r1</code>
+      <code>secp521r1</code>
+      <code>secp521r1</code>
+      <code>secp521r1</code>
+      <code>secp521r1</code>
+      <code>secp521r1</code>
+      <code>secp521r1</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/sect113r1.php">
+    <PropertyNotSetInConstructor occurrences="7">
+      <code>sect113r1</code>
+      <code>sect113r1</code>
+      <code>sect113r1</code>
+      <code>sect113r1</code>
+      <code>sect113r1</code>
+      <code>sect113r1</code>
+      <code>sect113r1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>sect113r1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/sect113r2.php">
+    <PropertyNotSetInConstructor occurrences="7">
+      <code>sect113r2</code>
+      <code>sect113r2</code>
+      <code>sect113r2</code>
+      <code>sect113r2</code>
+      <code>sect113r2</code>
+      <code>sect113r2</code>
+      <code>sect113r2</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>sect113r2</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/sect131r1.php">
+    <PropertyNotSetInConstructor occurrences="7">
+      <code>sect131r1</code>
+      <code>sect131r1</code>
+      <code>sect131r1</code>
+      <code>sect131r1</code>
+      <code>sect131r1</code>
+      <code>sect131r1</code>
+      <code>sect131r1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>sect131r1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/sect131r2.php">
+    <PropertyNotSetInConstructor occurrences="7">
+      <code>sect131r2</code>
+      <code>sect131r2</code>
+      <code>sect131r2</code>
+      <code>sect131r2</code>
+      <code>sect131r2</code>
+      <code>sect131r2</code>
+      <code>sect131r2</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>sect131r2</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/sect163k1.php">
+    <PropertyNotSetInConstructor occurrences="7">
+      <code>sect163k1</code>
+      <code>sect163k1</code>
+      <code>sect163k1</code>
+      <code>sect163k1</code>
+      <code>sect163k1</code>
+      <code>sect163k1</code>
+      <code>sect163k1</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/sect163r1.php">
+    <PropertyNotSetInConstructor occurrences="7">
+      <code>sect163r1</code>
+      <code>sect163r1</code>
+      <code>sect163r1</code>
+      <code>sect163r1</code>
+      <code>sect163r1</code>
+      <code>sect163r1</code>
+      <code>sect163r1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>sect163r1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/sect163r2.php">
+    <PropertyNotSetInConstructor occurrences="7">
+      <code>sect163r2</code>
+      <code>sect163r2</code>
+      <code>sect163r2</code>
+      <code>sect163r2</code>
+      <code>sect163r2</code>
+      <code>sect163r2</code>
+      <code>sect163r2</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>sect163r2</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/sect193r1.php">
+    <PropertyNotSetInConstructor occurrences="7">
+      <code>sect193r1</code>
+      <code>sect193r1</code>
+      <code>sect193r1</code>
+      <code>sect193r1</code>
+      <code>sect193r1</code>
+      <code>sect193r1</code>
+      <code>sect193r1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>sect193r1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/sect193r2.php">
+    <PropertyNotSetInConstructor occurrences="7">
+      <code>sect193r2</code>
+      <code>sect193r2</code>
+      <code>sect193r2</code>
+      <code>sect193r2</code>
+      <code>sect193r2</code>
+      <code>sect193r2</code>
+      <code>sect193r2</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>sect193r2</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/sect233k1.php">
+    <PropertyNotSetInConstructor occurrences="7">
+      <code>sect233k1</code>
+      <code>sect233k1</code>
+      <code>sect233k1</code>
+      <code>sect233k1</code>
+      <code>sect233k1</code>
+      <code>sect233k1</code>
+      <code>sect233k1</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/sect233r1.php">
+    <PropertyNotSetInConstructor occurrences="7">
+      <code>sect233r1</code>
+      <code>sect233r1</code>
+      <code>sect233r1</code>
+      <code>sect233r1</code>
+      <code>sect233r1</code>
+      <code>sect233r1</code>
+      <code>sect233r1</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/sect239k1.php">
+    <PropertyNotSetInConstructor occurrences="7">
+      <code>sect239k1</code>
+      <code>sect239k1</code>
+      <code>sect239k1</code>
+      <code>sect239k1</code>
+      <code>sect239k1</code>
+      <code>sect239k1</code>
+      <code>sect239k1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>sect239k1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/sect283k1.php">
+    <PropertyNotSetInConstructor occurrences="7">
+      <code>sect283k1</code>
+      <code>sect283k1</code>
+      <code>sect283k1</code>
+      <code>sect283k1</code>
+      <code>sect283k1</code>
+      <code>sect283k1</code>
+      <code>sect283k1</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/sect283r1.php">
+    <PropertyNotSetInConstructor occurrences="7">
+      <code>sect283r1</code>
+      <code>sect283r1</code>
+      <code>sect283r1</code>
+      <code>sect283r1</code>
+      <code>sect283r1</code>
+      <code>sect283r1</code>
+      <code>sect283r1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>sect283r1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/sect409k1.php">
+    <PropertyNotSetInConstructor occurrences="7">
+      <code>sect409k1</code>
+      <code>sect409k1</code>
+      <code>sect409k1</code>
+      <code>sect409k1</code>
+      <code>sect409k1</code>
+      <code>sect409k1</code>
+      <code>sect409k1</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/sect409r1.php">
+    <PropertyNotSetInConstructor occurrences="7">
+      <code>sect409r1</code>
+      <code>sect409r1</code>
+      <code>sect409r1</code>
+      <code>sect409r1</code>
+      <code>sect409r1</code>
+      <code>sect409r1</code>
+      <code>sect409r1</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/sect571k1.php">
+    <PropertyNotSetInConstructor occurrences="7">
+      <code>sect571k1</code>
+      <code>sect571k1</code>
+      <code>sect571k1</code>
+      <code>sect571k1</code>
+      <code>sect571k1</code>
+      <code>sect571k1</code>
+      <code>sect571k1</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Curves/sect571r1.php">
+    <PropertyNotSetInConstructor occurrences="7">
+      <code>sect571r1</code>
+      <code>sect571r1</code>
+      <code>sect571r1</code>
+      <code>sect571r1</code>
+      <code>sect571r1</code>
+      <code>sect571r1</code>
+      <code>sect571r1</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>sect571r1</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Formats/Keys/Common.php">
+    <ArgumentTypeCoercion occurrences="3">
+      <code>$class</code>
+      <code>$point</code>
+      <code>$point</code>
+    </ArgumentTypeCoercion>
+    <InvalidReturnType occurrences="1">
+      <code>string|false</code>
+    </InvalidReturnType>
+    <InvalidStringClass occurrences="1">
+      <code>new $class()</code>
+    </InvalidStringClass>
+    <MixedArgument occurrences="18">
+      <code>$curve-&gt;getModulo()</code>
+      <code>$data['curve']['a']</code>
+      <code>$data['curve']['a']</code>
+      <code>$data['curve']['b']</code>
+      <code>$data['curve']['b']</code>
+      <code>$data['fieldID']['parameters']</code>
+      <code>$data['fieldID']['parameters']</code>
+      <code>$data['order']</code>
+      <code>$data['order']</code>
+      <code>$m</code>
+      <code>$modulo[0]</code>
+      <code>$modulo[0]</code>
+      <code>$modulo[1]</code>
+      <code>$modulo[2]</code>
+      <code>$params['parameters']</code>
+      <code>$params[0]</code>
+      <code>$point</code>
+      <code>$temp[0]</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="18">
+      <code>$curveX</code>
+      <code>$curveX</code>
+      <code>$curveY</code>
+      <code>$curveY</code>
+      <code>$data['base']</code>
+      <code>$data['base']</code>
+      <code>$data['curve']</code>
+      <code>$data['curve']</code>
+      <code>$data['curve']</code>
+      <code>$data['curve']</code>
+      <code>$data['fieldID']</code>
+      <code>$data['fieldID']</code>
+      <code>$data['fieldID']</code>
+      <code>$data['fieldID']</code>
+      <code>$data['order']</code>
+      <code>$data['order']</code>
+      <code>$point[0]</code>
+      <code>$point[1]</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="9">
+      <code>$data</code>
+      <code>$m</code>
+      <code>$point</code>
+      <code>$point</code>
+      <code>$useNamedCurves</code>
+      <code>$x</code>
+      <code>$y</code>
+      <code>[$curveX, $curveY]</code>
+      <code>[$curveX, $curveY]</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="2">
+      <code>BaseCurve|false</code>
+      <code>object[]</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="20">
+      <code>new $curve()</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toString</code>
+      <code>toString</code>
+      <code>toString</code>
+      <code>toString</code>
+      <code>toString</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="9">
+      <code>$data['base']</code>
+      <code>$data['base']</code>
+      <code>$data['fieldID']['fieldType']</code>
+      <code>$params['namedCurve']</code>
+      <code>$params['namedCurve']</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$y</code>
+      <code>$y</code>
+    </MixedOperand>
+    <PossiblyInvalidArrayAccess occurrences="7">
+      <code>$params['basis']</code>
+      <code>$params['m']</code>
+      <code>$params['parameters']</code>
+      <code>$params['parameters']</code>
+      <code>$temp['k1']</code>
+      <code>$temp['k2']</code>
+      <code>$temp['k3']</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyInvalidArrayOffset occurrences="7">
+      <code>$params['basis']</code>
+      <code>$params['m']</code>
+      <code>$params['parameters']</code>
+      <code>$params['parameters']</code>
+      <code>$temp['k1']</code>
+      <code>$temp['k2']</code>
+      <code>$temp['k3']</code>
+    </PossiblyInvalidArrayOffset>
+    <PossiblyNullArgument occurrences="4">
+      <code>$m</code>
+      <code>$params['parameters']</code>
+      <code>$params[0]</code>
+      <code>$temp[0]</code>
+    </PossiblyNullArgument>
+    <PossiblyNullArrayAccess occurrences="9">
+      <code>$params['basis']</code>
+      <code>$params['m']</code>
+      <code>$params['parameters']</code>
+      <code>$params['parameters']</code>
+      <code>$params[0]</code>
+      <code>$temp['k1']</code>
+      <code>$temp['k2']</code>
+      <code>$temp['k3']</code>
+      <code>$temp[0]</code>
+    </PossiblyNullArrayAccess>
+    <PossiblyNullReference occurrences="12">
+      <code>$params</code>
+      <code>$params</code>
+      <code>$params</code>
+      <code>$params</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>toString</code>
+      <code>toString</code>
+      <code>toString</code>
+      <code>toString</code>
+      <code>toString</code>
+    </PossiblyNullReference>
+    <PossiblyUndefinedIntArrayOffset occurrences="6">
+      <code>$modulo[0]</code>
+      <code>$modulo[0]</code>
+      <code>$modulo[1]</code>
+      <code>$modulo[2]</code>
+      <code>$params[0]</code>
+      <code>$temp[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="7">
+      <code>$params['basis']</code>
+      <code>$params['m']</code>
+      <code>$params['parameters']</code>
+      <code>$params['parameters']</code>
+      <code>$temp['k1']</code>
+      <code>$temp['k2']</code>
+      <code>$temp['k3']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUnusedMethod occurrences="1">
+      <code>setImplicitCurve</code>
+    </PossiblyUnusedMethod>
+    <TypeDoesNotContainType occurrences="2">
+      <code>!$order</code>
+      <code>$order</code>
+    </TypeDoesNotContainType>
+    <UndefinedMethod occurrences="19">
+      <code>$params</code>
+      <code>$params</code>
+      <code>$params</code>
+      <code>$params</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>derivePoint</code>
+      <code>getA</code>
+      <code>getA</code>
+      <code>getB</code>
+      <code>getB</code>
+      <code>getBasePoint</code>
+      <code>getBasePoint</code>
+      <code>getBasePoint</code>
+      <code>getModulo</code>
+      <code>getModulo</code>
+      <code>recoverX</code>
+      <code>verifyPoint</code>
+    </UndefinedMethod>
+    <UndefinedPropertyAssignment occurrences="1">
+      <code>self::$implicitCurve</code>
+    </UndefinedPropertyAssignment>
+    <UndefinedPropertyFetch occurrences="1">
+      <code>self::$implicitCurve</code>
+    </UndefinedPropertyFetch>
+    <UnusedVariable occurrences="1">
+      <code>$len</code>
+    </UnusedVariable>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Formats/Keys/JWK.php">
+    <InvalidStringClass occurrences="1">
+      <code>new $curve()</code>
+    </InvalidStringClass>
+    <MixedArgument occurrences="9">
+      <code>$curve-&gt;encodePoint($publicKey)</code>
+      <code>$key-&gt;crv</code>
+      <code>$key-&gt;d</code>
+      <code>$key-&gt;d</code>
+      <code>$key-&gt;x</code>
+      <code>$key-&gt;x</code>
+      <code>$key-&gt;y</code>
+      <code>$publicKey[0]-&gt;toBytes()</code>
+      <code>$publicKey[1]-&gt;toBytes()</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="1">
+      <code>$arr</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>array</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="4">
+      <code>convertInteger</code>
+      <code>convertInteger</code>
+      <code>rangeCheck</code>
+      <code>verifyPoint</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="3">
+      <code>$arr</code>
+      <code>$key-&gt;crv</code>
+      <code>$key-&gt;crv</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="1">
+      <code>compact('curve', 'QA') + $arr</code>
+    </MixedReturnStatement>
+    <PossiblyNullArgument occurrences="1">
+      <code>$key['d']</code>
+    </PossiblyNullArgument>
+    <PossiblyUndefinedIntArrayOffset occurrences="2">
+      <code>$publicKey[0]</code>
+      <code>$publicKey[1]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedMethod occurrences="1">
+      <code>encodePoint</code>
+    </PossiblyUndefinedMethod>
+    <UndefinedMethod occurrences="3">
+      <code>extractSecret</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+    </UndefinedMethod>
+    <UnusedClass occurrences="1">
+      <code>JWK</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Formats/Keys/MontgomeryPrivate.php">
+    <MixedArgument occurrences="1">
+      <code>$publicKey[0]-&gt;toBytes()</code>
+    </MixedArgument>
+    <PossiblyUndefinedIntArrayOffset occurrences="1">
+      <code>$publicKey[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <RedundantCondition occurrences="2">
+      <code>!empty($password) &amp;&amp; is_string($password)</code>
+      <code>is_string($password)</code>
+    </RedundantCondition>
+    <UndefinedMethod occurrences="1">
+      <code>toBytes</code>
+    </UndefinedMethod>
+    <UnusedClass occurrences="1">
+      <code>MontgomeryPrivate</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Formats/Keys/MontgomeryPublic.php">
+    <MixedArgument occurrences="1">
+      <code>$publicKey[0]-&gt;toBytes()</code>
+    </MixedArgument>
+    <PossiblyUndefinedIntArrayOffset occurrences="1">
+      <code>$publicKey[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <UndefinedMethod occurrences="1">
+      <code>toBytes</code>
+    </UndefinedMethod>
+    <UnusedClass occurrences="1">
+      <code>MontgomeryPublic</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Formats/Keys/OpenSSH.php">
+    <ArgumentTypeCoercion occurrences="1">
+      <code>$curve</code>
+    </ArgumentTypeCoercion>
+    <ImplicitToStringCast occurrences="1">
+      <code>$privateKey</code>
+    </ImplicitToStringCast>
+    <InvalidStringClass occurrences="1">
+      <code>new $curveName()</code>
+    </InvalidStringClass>
+    <MismatchingDocblockParamType occurrences="1">
+      <code>string|false</code>
+    </MismatchingDocblockParamType>
+    <MixedArgument occurrences="6">
+      <code>$key</code>
+      <code>$paddedKey</code>
+      <code>$parsed['publicKey']</code>
+      <code>$parsed['publicKey']</code>
+      <code>$parsed['publicKey']</code>
+      <code>$privateKey</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="4">
+      <code>$comment</code>
+      <code>$key['comment']</code>
+      <code>$oid</code>
+      <code>$paddedKey</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>string</code>
+    </MixedInferredReturnType>
+    <MixedOperand occurrences="4">
+      <code>$comment</code>
+      <code>$comment</code>
+      <code>$curveName</code>
+      <code>$publicKey</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="1">
+      <code>$alias</code>
+    </MixedReturnStatement>
+    <PossiblyFalseReference occurrences="1">
+      <code>rangeCheck</code>
+    </PossiblyFalseReference>
+    <PossiblyNullArgument occurrences="2">
+      <code>$password</code>
+      <code>$password</code>
+    </PossiblyNullArgument>
+    <PossiblyUndefinedIntArrayOffset occurrences="4">
+      <code>$publicKey[0]</code>
+      <code>$publicKey[0]</code>
+      <code>$publicKey[1]</code>
+      <code>$publicKey[1]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="7">
+      <code>$parsed['comment']</code>
+      <code>$parsed['publicKey']</code>
+      <code>$parsed['publicKey']</code>
+      <code>$parsed['publicKey']</code>
+      <code>$parsed['type']</code>
+      <code>$parsed['type']</code>
+      <code>$parsed[type]</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUnusedMethod occurrences="1">
+      <code>savePrivateKey</code>
+    </PossiblyUnusedMethod>
+    <RedundantConditionGivenDocblockType occurrences="1">
+      <code>$curve instanceof Ed25519</code>
+    </RedundantConditionGivenDocblockType>
+    <UndefinedMethod occurrences="4">
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+    </UndefinedMethod>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Formats/Keys/PKCS1.php">
+    <MixedArgument occurrences="12">
+      <code>$components['curve']-&gt;getBasePoint()</code>
+      <code>$components['curve']-&gt;getBasePoint()</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$ecPrivate['parameters']</code>
+      <code>$ecPrivate['privateKey']</code>
+      <code>$ecPrivate['publicKey']</code>
+      <code>$ecPrivate['publicKey']</code>
+      <code>$key['parameters']</code>
+      <code>$key['privateKey']</code>
+    </MixedArgument>
+    <PossiblyFalseArgument occurrences="5">
+      <code>$components['curve']</code>
+      <code>$components['curve']</code>
+      <code>$ecParams</code>
+      <code>$key</code>
+      <code>self::encodeParameters($curve)</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalseReference occurrences="3">
+      <code>getBasePoint</code>
+      <code>multiplyPoint</code>
+      <code>rangeCheck</code>
+    </PossiblyFalseReference>
+    <PossiblyInvalidArgument occurrences="3">
+      <code>$decoded</code>
+      <code>$decoded</code>
+      <code>$key</code>
+    </PossiblyInvalidArgument>
+    <PossiblyNullArgument occurrences="1">
+      <code>$password</code>
+    </PossiblyNullArgument>
+    <PossiblyUndefinedIntArrayOffset occurrences="7">
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$matches[0]</code>
+      <code>$matches[0]</code>
+      <code>$publicKey[0]</code>
+      <code>$publicKey[1]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="2">
+      <code>$ecPrivate['privateKey']</code>
+      <code>$key['privateKey']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUnusedMethod occurrences="2">
+      <code>saveParameters</code>
+      <code>savePrivateKey</code>
+    </PossiblyUnusedMethod>
+    <UndefinedMethod occurrences="4">
+      <code>getBasePoint</code>
+      <code>getBasePoint</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+    </UndefinedMethod>
+    <UndefinedVariable occurrences="1">
+      <code>$ecPrivate</code>
+    </UndefinedVariable>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Formats/Keys/PKCS8.php">
+    <MixedArgument occurrences="12">
+      <code>$components['curve']-&gt;getBasePoint()</code>
+      <code>$components['dA']</code>
+      <code>$curve-&gt;encodePoint($publicKey)</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$key[$type . 'Algorithm']['parameters']-&gt;element</code>
+      <code>$key['privateKey']</code>
+      <code>$key['privateKey']</code>
+      <code>$key['privateKey']</code>
+      <code>$key['privateKey']</code>
+      <code>$key['publicKey']</code>
+      <code>$key['publicKey']</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="4">
+      <code>$key[$type . 'Algorithm']['algorithm']</code>
+      <code>$key[$type . 'Algorithm']['parameters']</code>
+      <code>$key['privateKeyAlgorithm']['algorithm']</code>
+      <code>$key['publicKeyAlgorithm']['algorithm']</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="2">
+      <code>$components['dA']</code>
+      <code>$components['secret']</code>
+    </MixedAssignment>
+    <MixedOperand occurrences="1">
+      <code>$key['publicKey']</code>
+    </MixedOperand>
+    <MixedPropertyFetch occurrences="1">
+      <code>$key[$type . 'Algorithm']['parameters']-&gt;element</code>
+    </MixedPropertyFetch>
+    <PossiblyFalseArgument occurrences="3">
+      <code>$components['curve']</code>
+      <code>self::encodeParameters($curve, false, $options)</code>
+      <code>self::encodeParameters($curve, false, $options)</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalseReference occurrences="1">
+      <code>rangeCheck</code>
+    </PossiblyFalseReference>
+    <PossiblyInvalidArgument occurrences="1">
+      <code>$params</code>
+    </PossiblyInvalidArgument>
+    <PossiblyInvalidArrayAccess occurrences="1">
+      <code>$key['privateKey']</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyInvalidArrayOffset occurrences="1">
+      <code>$key['privateKey']</code>
+    </PossiblyInvalidArrayOffset>
+    <PossiblyNullArgument occurrences="3">
+      <code>$key['privateKey']</code>
+      <code>$password</code>
+      <code>$password</code>
+    </PossiblyNullArgument>
+    <PossiblyNullArrayAccess occurrences="1">
+      <code>$key['privateKey']</code>
+    </PossiblyNullArrayAccess>
+    <PossiblyNullOperand occurrences="1">
+      <code>$secret</code>
+    </PossiblyNullOperand>
+    <PossiblyNullReference occurrences="1">
+      <code>$key</code>
+    </PossiblyNullReference>
+    <PossiblyUndefinedArrayOffset occurrences="2">
+      <code>$components['curve']</code>
+      <code>$components['dA']</code>
+    </PossiblyUndefinedArrayOffset>
+    <PossiblyUndefinedIntArrayOffset occurrences="6">
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$publicKey[0]</code>
+      <code>$publicKey[0]</code>
+      <code>$publicKey[1]</code>
+      <code>$publicKey[1]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="9">
+      <code>$arr['dA']</code>
+      <code>$arr['secret']</code>
+      <code>$key[$type . 'Algorithm']</code>
+      <code>$key[$type . 'Algorithm']</code>
+      <code>$key['privateKey']</code>
+      <code>$key['privateKey']</code>
+      <code>$key['privateKeyAlgorithm']</code>
+      <code>$key['publicKey']</code>
+      <code>$key['publicKeyAlgorithm']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUnusedMethod occurrences="2">
+      <code>savePrivateKey</code>
+      <code>savePublicKey</code>
+    </PossiblyUnusedMethod>
+    <UndefinedMethod occurrences="9">
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>encodePoint</code>
+      <code>getBasePoint</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+    </UndefinedMethod>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Formats/Keys/PuTTY.php">
+    <InvalidArgument occurrences="1">
+      <code>$publicKey</code>
+    </InvalidArgument>
+    <MixedArgument occurrences="6">
+      <code>$components['type']</code>
+      <code>$length</code>
+      <code>$length</code>
+      <code>$private</code>
+      <code>$private</code>
+      <code>$private</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="2">
+      <code>$arr['dA']</code>
+      <code>$arr['secret']</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="4">
+      <code>$arr</code>
+      <code>$components['dA']</code>
+      <code>$components['secret']</code>
+      <code>$private</code>
+    </MixedAssignment>
+    <MixedMethodCall occurrences="1">
+      <code>rangeCheck</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="3">
+      <code>$components['comment']</code>
+      <code>$components['public']</code>
+      <code>$components['type']</code>
+    </MixedOperand>
+    <PossiblyInvalidArrayAccess occurrences="2">
+      <code>$length</code>
+      <code>$length</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyNullArgument occurrences="2">
+      <code>$password</code>
+      <code>$secret</code>
+    </PossiblyNullArgument>
+    <PossiblyUndefinedIntArrayOffset occurrences="2">
+      <code>$public[1]</code>
+      <code>$public[1]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="4">
+      <code>$components['comment']</code>
+      <code>$components['curve']</code>
+      <code>$components['public']</code>
+      <code>$components['type']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUndefinedVariable occurrences="1">
+      <code>$private</code>
+    </PossiblyUndefinedVariable>
+    <PossiblyUnusedMethod occurrences="2">
+      <code>savePrivateKey</code>
+      <code>savePublicKey</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedProperty occurrences="1">
+      <code>$types</code>
+    </PossiblyUnusedProperty>
+    <UndefinedMethod occurrences="1">
+      <code>extractSecret</code>
+    </UndefinedMethod>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Formats/Keys/XML.php">
+    <ArgumentTypeCoercion occurrences="3">
+      <code>$key</code>
+      <code>$point</code>
+      <code>$xml</code>
+    </ArgumentTypeCoercion>
+    <InvalidArrayAccess occurrences="3">
+      <code>$result['namedCurve']</code>
+      <code>$result['specifiedCurve']</code>
+      <code>$result['specifiedCurve']</code>
+    </InvalidArrayAccess>
+    <InvalidArrayOffset occurrences="3">
+      <code>$result['namedCurve']</code>
+      <code>$result['specifiedCurve']</code>
+      <code>$result['specifiedCurve']</code>
+    </InvalidArrayOffset>
+    <InvalidNullableReturnType occurrences="1">
+      <code>\DOMNodeList|string</code>
+    </InvalidNullableReturnType>
+    <InvalidOperand occurrences="2">
+      <code>$publicKey[0]</code>
+      <code>$publicKey[1]</code>
+    </InvalidOperand>
+    <LessSpecificReturnStatement occurrences="1">
+      <code>new $curve()</code>
+    </LessSpecificReturnStatement>
+    <LessSpecificReturnType occurrences="2">
+      <code>BaseCurve|false</code>
+      <code>string|false</code>
+    </LessSpecificReturnType>
+    <MissingReturnType occurrences="1">
+      <code>isolateNamespace</code>
+    </MissingReturnType>
+    <MixedArgument occurrences="12">
+      <code>$key</code>
+      <code>$key</code>
+      <code>$oid</code>
+      <code>$p</code>
+      <code>$p</code>
+      <code>$temp['base']</code>
+      <code>$temp['curve']['a']</code>
+      <code>$temp['curve']['b']</code>
+      <code>$temp['fieldID']['parameters']-&gt;toBytes()</code>
+      <code>$temp['order']</code>
+      <code>$x-&gt;item(0)-&gt;getAttribute('Value')</code>
+      <code>$y-&gt;item(0)-&gt;getAttribute('Value')</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="12">
+      <code>$temp['base']</code>
+      <code>$temp['curve']</code>
+      <code>$temp['curve']</code>
+      <code>$temp['fieldID']</code>
+      <code>$temp['fieldID']</code>
+      <code>$temp['fieldID']</code>
+      <code>$temp['fieldID']</code>
+      <code>$temp['fieldID']</code>
+      <code>$temp['fieldID']</code>
+      <code>$temp['order']</code>
+      <code>$x</code>
+      <code>$y</code>
+    </MixedArrayAccess>
+    <MixedArrayOffset occurrences="1">
+      <code>self::$curveOIDs[$result['namedCurve']]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="10">
+      <code>$a</code>
+      <code>$b</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$oid</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>[$x, $y]</code>
+    </MixedAssignment>
+    <MixedMethodCall occurrences="2">
+      <code>new $curve()</code>
+      <code>toBytes</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="8">
+      <code>$a</code>
+      <code>$b</code>
+      <code>$temp['fieldID']['fieldType']</code>
+      <code>$temp['fieldID']['fieldType']</code>
+      <code>$temp['fieldID']['parameters']</code>
+      <code>$x</code>
+      <code>$y</code>
+      <code>self::$curveOIDs[$result['namedCurve']]</code>
+    </MixedOperand>
+    <MoreSpecificReturnType occurrences="1">
+      <code>BaseCurve|false</code>
+    </MoreSpecificReturnType>
+    <NullableReturnStatement occurrences="1">
+      <code>$decode ? self::decodeValue($result-&gt;item(0)-&gt;textContent) : $result-&gt;item(0)-&gt;textContent</code>
+    </NullableReturnStatement>
+    <PossiblyFalseArgument occurrences="2">
+      <code>$curve</code>
+      <code>$curve</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalseOperand occurrences="2">
+      <code>self::encodeXMLParameters($curve, $pre, $options)</code>
+      <code>self::encodeXMLParameters($curve, $pre, $options)</code>
+    </PossiblyFalseOperand>
+    <PossiblyInvalidArgument occurrences="8">
+      <code>$a</code>
+      <code>$a</code>
+      <code>$b</code>
+      <code>$b</code>
+      <code>$order</code>
+      <code>$order</code>
+      <code>$x</code>
+      <code>$y</code>
+    </PossiblyInvalidArgument>
+    <PossiblyInvalidMethodCall occurrences="7">
+      <code>item</code>
+      <code>item</code>
+      <code>item</code>
+      <code>item</code>
+      <code>item</code>
+      <code>item</code>
+      <code>item</code>
+    </PossiblyInvalidMethodCall>
+    <PossiblyInvalidOperand occurrences="2">
+      <code>$base</code>
+      <code>$pubkey</code>
+    </PossiblyInvalidOperand>
+    <PossiblyInvalidPropertyFetch occurrences="8">
+      <code>$namedCurve-&gt;length</code>
+      <code>$params-&gt;length</code>
+      <code>$params-&gt;length</code>
+      <code>$result-&gt;length</code>
+      <code>$result-&gt;length</code>
+      <code>$x-&gt;length</code>
+      <code>$y-&gt;length</code>
+      <code>self::query($xpath, 'ecdsakeyvalue')-&gt;length</code>
+    </PossiblyInvalidPropertyFetch>
+    <PossiblyNullArgument occurrences="2">
+      <code>$result-&gt;item(0)-&gt;textContent</code>
+      <code>$result-&gt;item(0)-&gt;textContent</code>
+    </PossiblyNullArgument>
+    <PossiblyNullOperand occurrences="1">
+      <code>$oid</code>
+    </PossiblyNullOperand>
+    <PossiblyNullPropertyFetch occurrences="4">
+      <code>$result-&gt;item(0)-&gt;textContent</code>
+      <code>$result-&gt;item(0)-&gt;textContent</code>
+      <code>$result-&gt;item(0)-&gt;textContent</code>
+      <code>$result-&gt;item(0)-&gt;textContent</code>
+    </PossiblyNullPropertyFetch>
+    <PossiblyNullReference occurrences="6">
+      <code>getAttribute</code>
+      <code>getAttribute</code>
+      <code>getAttribute</code>
+      <code>hasAttribute</code>
+      <code>hasAttribute</code>
+      <code>lookupPrefix</code>
+    </PossiblyNullReference>
+    <PossiblyUndefinedIntArrayOffset occurrences="4">
+      <code>$publicKey[0]</code>
+      <code>$publicKey[0]</code>
+      <code>$publicKey[1]</code>
+      <code>$publicKey[1]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUnusedMethod occurrences="4">
+      <code>disableRFC4050Syntax</code>
+      <code>load</code>
+      <code>savePublicKey</code>
+      <code>setNamespace</code>
+    </PossiblyUnusedMethod>
+    <UndefinedMethod occurrences="12">
+      <code>getA</code>
+      <code>getAttribute</code>
+      <code>getAttribute</code>
+      <code>getAttribute</code>
+      <code>getB</code>
+      <code>getBasePoint</code>
+      <code>hasAttribute</code>
+      <code>hasAttribute</code>
+      <code>removeAttributeNS</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>verifyPoint</code>
+    </UndefinedMethod>
+    <UndefinedVariable occurrences="2">
+      <code>$p</code>
+      <code>$p</code>
+    </UndefinedVariable>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Formats/Keys/libsodium.php">
+    <DocblockTypeContradiction occurrences="1">
+      <code>$curve-&gt;multiplyPoint($curve-&gt;getBasePoint(), $components['dA'])</code>
+    </DocblockTypeContradiction>
+    <MixedArgument occurrences="2">
+      <code>$components['dA']</code>
+      <code>$private</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="2">
+      <code>$components['dA']</code>
+      <code>$components['secret']</code>
+    </MixedAssignment>
+    <PossiblyUndefinedArrayOffset occurrences="1">
+      <code>$components['dA']</code>
+    </PossiblyUndefinedArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="2">
+      <code>$arr['dA']</code>
+      <code>$arr['secret']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUnusedMethod occurrences="2">
+      <code>savePrivateKey</code>
+      <code>savePublicKey</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedParam occurrences="1">
+      <code>$password</code>
+    </PossiblyUnusedParam>
+    <RedundantCondition occurrences="2">
+      <code>!empty($password) &amp;&amp; is_string($password)</code>
+      <code>is_string($password)</code>
+    </RedundantCondition>
+    <RedundantConditionGivenDocblockType occurrences="1">
+      <code>isset($public)</code>
+    </RedundantConditionGivenDocblockType>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Formats/Signature/ASN1.php">
+    <FalsableReturnStatement occurrences="2">
+      <code>false</code>
+      <code>false</code>
+    </FalsableReturnStatement>
+    <InvalidReturnStatement occurrences="1">
+      <code>$components</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="1">
+      <code>array</code>
+    </InvalidReturnType>
+    <MixedArgument occurrences="1">
+      <code>$decoded[0]</code>
+    </MixedArgument>
+    <NullableReturnStatement occurrences="1">
+      <code>$components</code>
+    </NullableReturnStatement>
+    <PossiblyUndefinedIntArrayOffset occurrences="1">
+      <code>$decoded[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <TypeDoesNotContainType occurrences="1">
+      <code>is_string($sig)</code>
+    </TypeDoesNotContainType>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Formats/Signature/Raw.php">
+    <UnusedClass occurrences="1">
+      <code>Raw</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Formats/Signature/SSH2.php">
+    <FalsableReturnStatement occurrences="1">
+      <code>false</code>
+    </FalsableReturnStatement>
+    <ImplicitToStringCast occurrences="2">
+      <code>$r</code>
+      <code>$s</code>
+    </ImplicitToStringCast>
+    <InvalidFalsableReturnType occurrences="1">
+      <code>string</code>
+    </InvalidFalsableReturnType>
+    <MissingReturnType occurrences="1">
+      <code>load</code>
+    </MissingReturnType>
+    <MixedArgument occurrences="1">
+      <code>$blob</code>
+    </MixedArgument>
+    <PossiblyUndefinedIntArrayOffset occurrences="2">
+      <code>$result[0]</code>
+      <code>$result[1]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <TypeDoesNotContainType occurrences="3">
+      <code>$result === false</code>
+      <code>$result === false</code>
+      <code>is_string($sig)</code>
+    </TypeDoesNotContainType>
+    <UnusedClass occurrences="1">
+      <code>SSH2</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/EC/Parameters.php">
+    <MixedAssignment occurrences="1">
+      <code>$type</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>string</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="1">
+      <code>$type::saveParameters($this-&gt;curve, $options)</code>
+    </MixedMethodCall>
+    <MixedReturnStatement occurrences="1">
+      <code>$type::saveParameters($this-&gt;curve, $options)</code>
+    </MixedReturnStatement>
+    <PropertyNotSetInConstructor occurrences="6">
+      <code>Parameters</code>
+      <code>Parameters</code>
+      <code>Parameters</code>
+      <code>Parameters</code>
+      <code>Parameters</code>
+      <code>Parameters</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Crypt/EC/PrivateKey.php">
+    <ArgumentTypeCoercion occurrences="3">
+      <code>$dA</code>
+      <code>$this-&gt;dA</code>
+      <code>$this-&gt;dA</code>
+    </ArgumentTypeCoercion>
+    <DocblockTypeContradiction occurrences="1">
+      <code>$format === false</code>
+    </DocblockTypeContradiction>
+    <InvalidStringClass occurrences="2">
+      <code>$format::save($r, $s)</code>
+      <code>$format::save($r, $s, $this-&gt;getCurve())</code>
+    </InvalidStringClass>
+    <MissingReturnType occurrences="2">
+      <code>getPublicKey</code>
+      <code>sign</code>
+    </MissingReturnType>
+    <MixedArgument occurrences="8">
+      <code>$curve::HASH</code>
+      <code>$curve::SIZE</code>
+      <code>$curve::SIZE</code>
+      <code>$dA-&gt;multiply($r)</code>
+      <code>$key</code>
+      <code>$point[0]-&gt;toBytes(true)</code>
+      <code>$this-&gt;curve-&gt;getBasePoint()</code>
+      <code>$this-&gt;dA-&gt;toBytes()</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="1">
+      <code>$r</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="9">
+      <code>$A</code>
+      <code>$R</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$type</code>
+      <code>$type</code>
+      <code>$x</code>
+      <code>[, $r]</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="2">
+      <code>string</code>
+      <code>string</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="13">
+      <code>$format::save($r, $s)</code>
+      <code>$format::save($r, $s, $this-&gt;getCurve())</code>
+      <code>$type::savePrivateKey($this-&gt;dA, $this-&gt;curve, $this-&gt;QA, $this-&gt;secret, $this-&gt;password, $options)</code>
+      <code>$type::savePublicKey($this-&gt;curve, $this-&gt;QA)</code>
+      <code>divide</code>
+      <code>equals</code>
+      <code>multiply</code>
+      <code>toBigInteger</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>withContext</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="6">
+      <code>$A</code>
+      <code>$R</code>
+      <code>$R</code>
+      <code>$R</code>
+      <code>$point[0]-&gt;toBytes(true)</code>
+      <code>$point[1]-&gt;toBytes(true)</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="2">
+      <code>$this-&gt;curve-&gt;encodePoint($point)</code>
+      <code>$type::savePrivateKey($this-&gt;dA, $this-&gt;curve, $this-&gt;QA, $this-&gt;secret, $this-&gt;password, $options)</code>
+    </MixedReturnStatement>
+    <PossiblyInvalidArgument occurrences="2">
+      <code>$this-&gt;getCurve()</code>
+      <code>$this-&gt;getCurve()</code>
+    </PossiblyInvalidArgument>
+    <PossiblyUndefinedIntArrayOffset occurrences="3">
+      <code>$point[0]</code>
+      <code>$point[0]</code>
+      <code>$point[1]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="3">
+      <code>self::$engines['OpenSSL']</code>
+      <code>self::$engines['libsodium']</code>
+      <code>self::$engines['libsodium']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUndefinedVariable occurrences="4">
+      <code>$r</code>
+      <code>$r</code>
+      <code>$s</code>
+      <code>$s</code>
+    </PossiblyUndefinedVariable>
+    <PropertyNotSetInConstructor occurrences="8">
+      <code>$dA</code>
+      <code>$secret</code>
+      <code>PrivateKey</code>
+      <code>PrivateKey</code>
+      <code>PrivateKey</code>
+      <code>PrivateKey</code>
+      <code>PrivateKey</code>
+      <code>PrivateKey</code>
+    </PropertyNotSetInConstructor>
+    <RedundantPropertyInitializationCheck occurrences="5">
+      <code>!isset($this-&gt;context)</code>
+      <code>$this-&gt;context</code>
+      <code>$this-&gt;curve instanceof Ed25519 &amp;&amp; self::$engines['libsodium'] &amp;&amp; !isset($this-&gt;context)</code>
+      <code>''</code>
+      <code>'SigEd25519 no Ed25519 collisions' . "\0" . chr(strlen($this-&gt;context)) . $this-&gt;context</code>
+    </RedundantPropertyInitializationCheck>
+    <UndefinedConstant occurrences="3">
+      <code>$curve::HASH</code>
+      <code>$curve::SIZE</code>
+      <code>$curve::SIZE</code>
+    </UndefinedConstant>
+    <UndefinedMethod occurrences="5">
+      <code>encodePoint</code>
+      <code>encodePoint</code>
+      <code>encodePoint</code>
+      <code>getBasePoint</code>
+      <code>withSignatureFormat</code>
+    </UndefinedMethod>
+    <UnusedVariable occurrences="1">
+      <code>$y</code>
+    </UnusedVariable>
+  </file>
+  <file src="../phpseclib/Crypt/EC/PublicKey.php">
+    <DocblockTypeContradiction occurrences="1">
+      <code>$format === false</code>
+    </DocblockTypeContradiction>
+    <InvalidMethodCall occurrences="1">
+      <code>toBigInteger</code>
+    </InvalidMethodCall>
+    <InvalidStringClass occurrences="1">
+      <code>$format::load($signature)</code>
+    </InvalidStringClass>
+    <MixedArgument occurrences="18">
+      <code>$Ln</code>
+      <code>$curve::HASH</code>
+      <code>$curve::SIZE</code>
+      <code>$curve::SIZE</code>
+      <code>$curve::SIZE</code>
+      <code>$message</code>
+      <code>$message</code>
+      <code>$order</code>
+      <code>$params</code>
+      <code>$params</code>
+      <code>$r</code>
+      <code>$rhs</code>
+      <code>$s</code>
+      <code>$sig</code>
+      <code>$signature</code>
+      <code>$signature</code>
+      <code>$u2</code>
+      <code>$w</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="2">
+      <code>$u2</code>
+      <code>$x1</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="11">
+      <code>$A</code>
+      <code>$Ln</code>
+      <code>$n_1</code>
+      <code>$params</code>
+      <code>$rhs</code>
+      <code>$sig</code>
+      <code>$type</code>
+      <code>$w</code>
+      <code>$x1</code>
+      <code>[, $u2]</code>
+      <code>[, $x1]</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="2">
+      <code>bool</code>
+      <code>string</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="12">
+      <code>$type::savePublicKey($this-&gt;curve, $this-&gt;QA, $options)</code>
+      <code>between</code>
+      <code>between</code>
+      <code>divide</code>
+      <code>divide</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>getLength</code>
+      <code>modInverse</code>
+      <code>multiply</code>
+      <code>subtract</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="3">
+      <code>$A</code>
+      <code>$curve::SIZE</code>
+      <code>$order-&gt;getLength()</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="2">
+      <code>$type::savePublicKey($this-&gt;curve, $this-&gt;QA, $options)</code>
+      <code>$x1-&gt;equals($r)</code>
+    </MixedReturnStatement>
+    <PossiblyUndefinedIntArrayOffset occurrences="4">
+      <code>$lhs[0]</code>
+      <code>$lhs[1]</code>
+      <code>$rhs[0]</code>
+      <code>$rhs[1]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="1">
+      <code>self::$engines['libsodium']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PropertyNotSetInConstructor occurrences="6">
+      <code>PublicKey</code>
+      <code>PublicKey</code>
+      <code>PublicKey</code>
+      <code>PublicKey</code>
+      <code>PublicKey</code>
+      <code>PublicKey</code>
+    </PropertyNotSetInConstructor>
+    <RedundantPropertyInitializationCheck occurrences="5">
+      <code>!isset($this-&gt;context)</code>
+      <code>$this-&gt;context</code>
+      <code>$this-&gt;curve instanceof Ed25519 &amp;&amp; self::$engines['libsodium'] &amp;&amp; !isset($this-&gt;context)</code>
+      <code>''</code>
+      <code>'SigEd25519 no Ed25519 collisions' . "\0" . chr(strlen($this-&gt;context)) . $this-&gt;context</code>
+    </RedundantPropertyInitializationCheck>
+    <UndefinedConstant occurrences="5">
+      <code>$curve::HASH</code>
+      <code>$curve::SIZE</code>
+      <code>$curve::SIZE</code>
+      <code>$curve::SIZE</code>
+      <code>$curve::SIZE</code>
+    </UndefinedConstant>
+    <UndefinedMethod occurrences="3">
+      <code>addPoint</code>
+      <code>encodePoint</code>
+      <code>getBasePoint</code>
+    </UndefinedMethod>
+  </file>
+  <file src="../phpseclib/Crypt/Hash.php">
+    <DocblockTypeContradiction occurrences="7">
+      <code>!is_string($this-&gt;key)</code>
+      <code>$this-&gt;key === false</code>
+      <code>hash($algo, $text, true)</code>
+      <code>is_array($algo)</code>
+      <code>is_array($this-&gt;algo)</code>
+      <code>is_string($this-&gt;key)</code>
+      <code>is_string($this-&gt;nonce)</code>
+    </DocblockTypeContradiction>
+    <ImplicitToStringCast occurrences="2">
+      <code>$initial[$i]</code>
+      <code>$k[$i]</code>
+    </ImplicitToStringCast>
+    <InvalidOperand occurrences="1">
+      <code>$matches[2]</code>
+    </InvalidOperand>
+    <InvalidParamDefault occurrences="2">
+      <code>string</code>
+      <code>string</code>
+    </InvalidParamDefault>
+    <InvalidPropertyAssignmentValue occurrences="1">
+      <code>$hash = strtolower($hash)</code>
+    </InvalidPropertyAssignmentValue>
+    <InvalidReturnStatement occurrences="1">
+      <code>$this-&gt;hashParam</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="1">
+      <code>string</code>
+    </InvalidReturnType>
+    <MissingClosureParamType occurrences="1">
+      <code>$x</code>
+    </MissingClosureParamType>
+    <MissingClosureReturnType occurrences="1">
+      <code>function ($x) {</code>
+    </MissingClosureReturnType>
+    <MissingParamType occurrences="1">
+      <code>$length</code>
+    </MissingParamType>
+    <MissingPropertyType occurrences="9">
+      <code>$factory128</code>
+      <code>$factory36</code>
+      <code>$factory64</code>
+      <code>$marker128</code>
+      <code>$marker64</code>
+      <code>$maxwordrange128</code>
+      <code>$maxwordrange64</code>
+      <code>$offset128</code>
+      <code>$offset64</code>
+    </MissingPropertyType>
+    <MixedArgument occurrences="24">
+      <code>$algo($temp, ...array_values($this-&gt;parameters))</code>
+      <code>$algo($text, ...array_values($this-&gt;parameters))</code>
+      <code>$b</code>
+      <code>$index</code>
+      <code>$length</code>
+      <code>$m</code>
+      <code>$output</code>
+      <code>$parity[0]</code>
+      <code>$parity[1]</code>
+      <code>$parity[2]</code>
+      <code>$parity[3]</code>
+      <code>$parity[4]</code>
+      <code>$pi</code>
+      <code>$pi</code>
+      <code>$rotationOffsets[$j][$i]</code>
+      <code>$rotationOffsets[$j][$i]</code>
+      <code>$s[$j][$i]</code>
+      <code>$s[$j][$i]</code>
+      <code>$x</code>
+      <code>$y-&gt;toBytes()</code>
+      <code>self::$maxwordrange128</code>
+      <code>self::$maxwordrange64</code>
+      <code>self::$maxwordrange64</code>
+      <code>unpack('C', $index)[1] * $taglen</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="50">
+      <code>$k[$i]</code>
+      <code>$rotationOffsets[$j]</code>
+      <code>$rotationOffsets[$j]</code>
+      <code>$roundConstants[$round]</code>
+      <code>$roundConstants[$round]</code>
+      <code>$roundConstants[$round]</code>
+      <code>$s[$i][$j++]</code>
+      <code>$s[$i][$j++]</code>
+      <code>$s[$i][$j]</code>
+      <code>$s[$i][$j]</code>
+      <code>$s[$i][$j]</code>
+      <code>$s[$i][$j][1]</code>
+      <code>$s[$j][$i]</code>
+      <code>$s[$j][$i]</code>
+      <code>$s[$x][$y++]</code>
+      <code>$s[$x][$y]</code>
+      <code>$s[$x][$y][1]</code>
+      <code>$s[0][$i]</code>
+      <code>$s[0][$i]</code>
+      <code>$s[0][$i]</code>
+      <code>$s[0][0]</code>
+      <code>$s[0][0]</code>
+      <code>$s[0][0][1]</code>
+      <code>$s[1][$i]</code>
+      <code>$s[1][$i]</code>
+      <code>$s[1][$i]</code>
+      <code>$s[2][$i]</code>
+      <code>$s[2][$i]</code>
+      <code>$s[2][$i]</code>
+      <code>$s[3][$i]</code>
+      <code>$s[3][$i]</code>
+      <code>$s[3][$i]</code>
+      <code>$s[4][$i]</code>
+      <code>$s[4][$i]</code>
+      <code>$s[4][$i]</code>
+      <code>$st[$i][0]</code>
+      <code>$st[$i][0]</code>
+      <code>$st[$i][0][1]</code>
+      <code>$st[$i][1]</code>
+      <code>$st[$i][1]</code>
+      <code>$st[$i][1][1]</code>
+      <code>$st[$i][2]</code>
+      <code>$st[$i][2]</code>
+      <code>$st[$i][2][1]</code>
+      <code>$st[$i][3]</code>
+      <code>$st[$i][3]</code>
+      <code>$st[$i][3][1]</code>
+      <code>$st[$i][4]</code>
+      <code>$st[$i][4]</code>
+      <code>$st[$i][4][1]</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="16">
+      <code>$s[$i][$j]</code>
+      <code>$s[$i][$j]</code>
+      <code>$s[$i][$j]</code>
+      <code>$s[$i][0]</code>
+      <code>$s[$i][1]</code>
+      <code>$s[$i][2]</code>
+      <code>$s[$i][3]</code>
+      <code>$s[$i][4]</code>
+      <code>$s[$x][$y++]</code>
+      <code>$s[$x][$y]</code>
+      <code>$s[$x][$y]</code>
+      <code>$s[0][0]</code>
+      <code>$s[0][0]</code>
+      <code>$s[0][0]</code>
+      <code>$st[(2 * $i + 3 * $j) % 5][$j]</code>
+      <code>$st[(2 * $i + 3 * $j) % 5][$j]</code>
+    </MixedArrayAssignment>
+    <MixedAssignment occurrences="61">
+      <code>$a</code>
+      <code>$a</code>
+      <code>$b</code>
+      <code>$b</code>
+      <code>$c</code>
+      <code>$c</code>
+      <code>$ch</code>
+      <code>$d</code>
+      <code>$d</code>
+      <code>$e</code>
+      <code>$e</code>
+      <code>$f</code>
+      <code>$f</code>
+      <code>$factory</code>
+      <code>$factory</code>
+      <code>$factory</code>
+      <code>$g</code>
+      <code>$g</code>
+      <code>$h</code>
+      <code>$h</code>
+      <code>$k</code>
+      <code>$k_i</code>
+      <code>$m</code>
+      <code>$m</code>
+      <code>$m_i</code>
+      <code>$maj</code>
+      <code>$maj</code>
+      <code>$marker</code>
+      <code>$marker</code>
+      <code>$offset</code>
+      <code>$offset</code>
+      <code>$output</code>
+      <code>$parity[]</code>
+      <code>$pi</code>
+      <code>$pi</code>
+      <code>$s0</code>
+      <code>$s0</code>
+      <code>$s1</code>
+      <code>$s1</code>
+      <code>$s[$i][$j]</code>
+      <code>$s[$i][$j][0]</code>
+      <code>$s[$i][$j][1]</code>
+      <code>$s[$x][$y++]</code>
+      <code>$s[$x][$y][0]</code>
+      <code>$s[$x][$y][1]</code>
+      <code>$s[0][0]</code>
+      <code>$s[0][0][0]</code>
+      <code>$s[0][0][1]</code>
+      <code>$subpi</code>
+      <code>$t1</code>
+      <code>$t1</code>
+      <code>$t1</code>
+      <code>$t1</code>
+      <code>$t2</code>
+      <code>$this-&gt;computedKey</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$y</code>
+    </MixedAssignment>
+    <MixedClone occurrences="14">
+      <code>clone $a</code>
+      <code>clone $b</code>
+      <code>clone $c</code>
+      <code>clone $e</code>
+      <code>clone $f</code>
+      <code>clone $g</code>
+      <code>clone $hash[0]</code>
+      <code>clone $hash[1]</code>
+      <code>clone $hash[2]</code>
+      <code>clone $hash[3]</code>
+      <code>clone $hash[4]</code>
+      <code>clone $hash[5]</code>
+      <code>clone $hash[6]</code>
+      <code>clone $hash[7]</code>
+    </MixedClone>
+    <MixedFunctionCall occurrences="4">
+      <code>$algo($output, ...array_values($this-&gt;parameters))</code>
+      <code>$algo($temp, ...array_values($this-&gt;parameters))</code>
+      <code>$algo($text, ...array_values($this-&gt;parameters))</code>
+      <code>call_user_func($this-&gt;algo, $this-&gt;key)</code>
+    </MixedFunctionCall>
+    <MixedInferredReturnType occurrences="1">
+      <code>string</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="60">
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>bitwise_and</code>
+      <code>bitwise_and</code>
+      <code>bitwise_and</code>
+      <code>bitwise_and</code>
+      <code>bitwise_and</code>
+      <code>bitwise_not</code>
+      <code>bitwise_rightRotate</code>
+      <code>bitwise_rightRotate</code>
+      <code>bitwise_rightRotate</code>
+      <code>bitwise_rightRotate</code>
+      <code>bitwise_rightRotate</code>
+      <code>bitwise_rightRotate</code>
+      <code>bitwise_xor</code>
+      <code>bitwise_xor</code>
+      <code>bitwise_xor</code>
+      <code>bitwise_xor</code>
+      <code>bitwise_xor</code>
+      <code>bitwise_xor</code>
+      <code>bitwise_xor</code>
+      <code>compare</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>newInteger</code>
+      <code>newInteger</code>
+      <code>newInteger</code>
+      <code>newInteger</code>
+      <code>newInteger</code>
+      <code>newInteger</code>
+      <code>subtract</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="69">
+      <code>$hash[0]-&gt;toBytes()</code>
+      <code>$hash[2]-&gt;toBytes()</code>
+      <code>$hash[3]-&gt;toBytes()</code>
+      <code>$hash[4]-&gt;toBytes()</code>
+      <code>$hash[5]-&gt;toBytes()</code>
+      <code>$hash[6]-&gt;toBytes()</code>
+      <code>$hash[7]-&gt;toBytes()</code>
+      <code>$hi</code>
+      <code>$hi</code>
+      <code>$lo</code>
+      <code>$lo</code>
+      <code>$parity[0]</code>
+      <code>$parity[0][0]</code>
+      <code>$parity[0][1]</code>
+      <code>$parity[1]</code>
+      <code>$parity[1][0]</code>
+      <code>$parity[1][1]</code>
+      <code>$parity[2]</code>
+      <code>$parity[2][0]</code>
+      <code>$parity[2][1]</code>
+      <code>$parity[3]</code>
+      <code>$parity[3][0]</code>
+      <code>$parity[3][1]</code>
+      <code>$parity[4]</code>
+      <code>$parity[4][0]</code>
+      <code>$parity[4][1]</code>
+      <code>$s[$i][$j]</code>
+      <code>$s[$i][$j][0]</code>
+      <code>$s[$i][$j][1]</code>
+      <code>$s[$x][$y++]</code>
+      <code>$s[$x][$y][0]</code>
+      <code>$s[$x][$y][1]</code>
+      <code>$s[0][$i]</code>
+      <code>$s[0][$i][0]</code>
+      <code>$s[0][$i][1]</code>
+      <code>$s[0][0]</code>
+      <code>$s[0][0][0]</code>
+      <code>$s[0][0][1]</code>
+      <code>$st[$i][0]</code>
+      <code>$st[$i][0][0]</code>
+      <code>$st[$i][0][1]</code>
+      <code>$st[$i][1]</code>
+      <code>$st[$i][1][0]</code>
+      <code>$st[$i][1][1]</code>
+      <code>$st[$i][2]</code>
+      <code>$st[$i][2][0]</code>
+      <code>$st[$i][2][1]</code>
+      <code>$st[$i][3]</code>
+      <code>$st[$i][3][0]</code>
+      <code>$st[$i][3][1]</code>
+      <code>$st[$i][4]</code>
+      <code>$st[$i][4][0]</code>
+      <code>$st[$i][4][1]</code>
+      <code>unpack('C', $index)[1]</code>
+      <code>~$st[$i][0]</code>
+      <code>~$st[$i][0][0]</code>
+      <code>~$st[$i][0][1]</code>
+      <code>~$st[$i][1]</code>
+      <code>~$st[$i][1][0]</code>
+      <code>~$st[$i][1][1]</code>
+      <code>~$st[$i][2]</code>
+      <code>~$st[$i][2][0]</code>
+      <code>~$st[$i][2][1]</code>
+      <code>~$st[$i][3]</code>
+      <code>~$st[$i][3][0]</code>
+      <code>~$st[$i][3][1]</code>
+      <code>~$st[$i][4]</code>
+      <code>~$st[$i][4][0]</code>
+      <code>~$st[$i][4][1]</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="1">
+      <code>$y-&gt;toBytes()</code>
+    </MixedReturnStatement>
+    <PossiblyFalseArgument occurrences="6">
+      <code>$m[$i]</code>
+      <code>$m[$i]</code>
+      <code>$m[$i]</code>
+      <code>$m[$i]</code>
+      <code>$m[$i] ?? ''</code>
+      <code>pack('N4', 0, $index, 0, 1)</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalseIterator occurrences="4">
+      <code>$m_i</code>
+      <code>$p</code>
+      <code>$p</code>
+      <code>$pi</code>
+    </PossiblyFalseIterator>
+    <PossiblyFalseOperand occurrences="3">
+      <code>pack('N4', 0, 0, 0, $length &lt;&lt; 3)</code>
+      <code>pack('P', $s[$i][$j++])</code>
+      <code>pack('V2', $s[$i][$j][1], $s[$i][$j++][0])</code>
+    </PossiblyFalseOperand>
+    <PossiblyFalsePropertyAssignmentValue occurrences="4">
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+    </PossiblyFalsePropertyAssignmentValue>
+    <PossiblyInvalidArrayAccess occurrences="3">
+      <code>$pi[$i + 1]</code>
+      <code>$pi[$i]</code>
+      <code>unpack('C', $index)[1]</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyInvalidOperand occurrences="5">
+      <code>~$st[$i][0]</code>
+      <code>~$st[$i][1]</code>
+      <code>~$st[$i][2]</code>
+      <code>~$st[$i][3]</code>
+      <code>~$st[$i][4]</code>
+    </PossiblyInvalidOperand>
+    <PossiblyInvalidPropertyAssignmentValue occurrences="2">
+      <code>$hash</code>
+      <code>$matches[2] &gt;&gt; 3</code>
+    </PossiblyInvalidPropertyAssignmentValue>
+    <PossiblyUndefinedIntArrayOffset occurrences="62">
+      <code>$hash[0]</code>
+      <code>$hash[0]</code>
+      <code>$hash[1]</code>
+      <code>$hash[1]</code>
+      <code>$hash[2]</code>
+      <code>$hash[2]</code>
+      <code>$hash[3]</code>
+      <code>$hash[3]</code>
+      <code>$hash[4]</code>
+      <code>$hash[4]</code>
+      <code>$hash[5]</code>
+      <code>$hash[5]</code>
+      <code>$hash[6]</code>
+      <code>$hash[6]</code>
+      <code>$hash[7]</code>
+      <code>$hash[7]</code>
+      <code>$matches[1]</code>
+      <code>$matches[2]</code>
+      <code>$parity[1]</code>
+      <code>$parity[1]</code>
+      <code>$parity[2]</code>
+      <code>$parity[2]</code>
+      <code>$parity[3]</code>
+      <code>$parity[3]</code>
+      <code>$parity[4]</code>
+      <code>$parity[4]</code>
+      <code>$rotated[0][0]</code>
+      <code>$rotated[0][1]</code>
+      <code>$rotated[1]</code>
+      <code>$rotated[1][1]</code>
+      <code>$rotated[2]</code>
+      <code>$rotated[2][1]</code>
+      <code>$rotated[3]</code>
+      <code>$rotated[3][1]</code>
+      <code>$rotated[4]</code>
+      <code>$rotated[4][1]</code>
+      <code>$s[0]</code>
+      <code>$s[0]</code>
+      <code>$s[1]</code>
+      <code>$s[1]</code>
+      <code>$s[2]</code>
+      <code>$s[2]</code>
+      <code>$s[3]</code>
+      <code>$s[3]</code>
+      <code>$s[4]</code>
+      <code>$s[4]</code>
+      <code>$st[$i][0]</code>
+      <code>$st[$i][0]</code>
+      <code>$st[$i][0][1]</code>
+      <code>$st[$i][1]</code>
+      <code>$st[$i][1]</code>
+      <code>$st[$i][1][1]</code>
+      <code>$st[$i][2]</code>
+      <code>$st[$i][2]</code>
+      <code>$st[$i][2][1]</code>
+      <code>$st[$i][3]</code>
+      <code>$st[$i][3]</code>
+      <code>$st[$i][3][1]</code>
+      <code>$st[$i][4]</code>
+      <code>$st[$i][4]</code>
+      <code>$st[$i][4][1]</code>
+      <code>unpack('C', $index)[1]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedVariable occurrences="1">
+      <code>$index</code>
+    </PossiblyUndefinedVariable>
+    <PropertyNotSetInConstructor occurrences="9">
+      <code>$algo</code>
+      <code>$blockSize</code>
+      <code>$c</code>
+      <code>$hashParam</code>
+      <code>$ipad</code>
+      <code>$length</code>
+      <code>$opad</code>
+      <code>$pad</code>
+      <code>$recomputeAESKey</code>
+    </PropertyNotSetInConstructor>
+    <RedundantConditionGivenDocblockType occurrences="2">
+      <code>hash($this-&gt;algo, $this-&gt;key, true)</code>
+      <code>is_string($this-&gt;key)</code>
+    </RedundantConditionGivenDocblockType>
+    <UndefinedVariable occurrences="1">
+      <code>$b</code>
+    </UndefinedVariable>
+    <UnusedMethod occurrences="3">
+      <code>sha3_32</code>
+      <code>sha3_64</code>
+      <code>sha512</code>
+    </UnusedMethod>
+    <UnusedParam occurrences="2">
+      <code>$c</code>
+      <code>$c</code>
+    </UnusedParam>
+    <UnusedVariable occurrences="4">
+      <code>$k</code>
+      <code>$n</code>
+      <code>$n</code>
+      <code>$num_ints</code>
+    </UnusedVariable>
+  </file>
+  <file src="../phpseclib/Crypt/PublicKeyLoader.php">
+    <MixedAssignment occurrences="1">
+      <code>$key</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>AsymmetricKey</code>
+    </MixedInferredReturnType>
+    <MixedReturnStatement occurrences="1">
+      <code>$key</code>
+    </MixedReturnStatement>
+    <PossiblyUnusedMethod occurrences="2">
+      <code>loadParameters</code>
+      <code>loadPublicKey</code>
+    </PossiblyUnusedMethod>
+  </file>
+  <file src="../phpseclib/Crypt/RC2.php">
+    <FalsableReturnStatement occurrences="2">
+      <code>pack('vvvv', $r0, $r1, $r2, $r3)</code>
+      <code>pack('vvvv', $r0, $r1, $r2, $r3)</code>
+    </FalsableReturnStatement>
+    <InvalidFalsableReturnType occurrences="2">
+      <code>string</code>
+      <code>string</code>
+    </InvalidFalsableReturnType>
+    <InvalidPropertyAssignmentValue occurrences="2">
+      <code>$length &gt;&gt; 3</code>
+    </InvalidPropertyAssignmentValue>
+    <MixedArgument occurrences="1">
+      <code>$l</code>
+    </MixedArgument>
+    <MixedArrayOffset occurrences="13">
+      <code>$keys[$r0 &amp; 0x3F]</code>
+      <code>$keys[$r0 &amp; 0x3F]</code>
+      <code>$keys[$r1 &amp; 0x3F]</code>
+      <code>$keys[$r1 &amp; 0x3F]</code>
+      <code>$keys[$r2 &amp; 0x3F]</code>
+      <code>$keys[$r2 &amp; 0x3F]</code>
+      <code>$keys[$r3 &amp; 0x3F]</code>
+      <code>$keys[$r3 &amp; 0x3F]</code>
+      <code>$pitable[$l[$i + 1] ^ $l[$i + $t8]]</code>
+      <code>$pitable[$l[$i - 1] + $l[$i - $t]]</code>
+      <code>$pitable[$l[$i] &amp; $tm]</code>
+      <code>self::$invpitable[$l[0]]</code>
+      <code>self::$pitable[$l['a']]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="28">
+      <code>$l[$i]</code>
+      <code>$l[$i]</code>
+      <code>$l[$i]</code>
+      <code>$l[0]</code>
+      <code>$r0</code>
+      <code>$r0</code>
+      <code>$r0</code>
+      <code>$r0</code>
+      <code>$r0</code>
+      <code>$r0</code>
+      <code>$r1</code>
+      <code>$r1</code>
+      <code>$r1</code>
+      <code>$r1</code>
+      <code>$r1</code>
+      <code>$r1</code>
+      <code>$r2</code>
+      <code>$r2</code>
+      <code>$r2</code>
+      <code>$r2</code>
+      <code>$r2</code>
+      <code>$r2</code>
+      <code>$r3</code>
+      <code>$r3</code>
+      <code>$r3</code>
+      <code>$r3</code>
+      <code>$r3</code>
+      <code>$r3</code>
+    </MixedAssignment>
+    <MixedOperand occurrences="73">
+      <code>$keys[$j++]</code>
+      <code>$keys[$j++]</code>
+      <code>$keys[$j++]</code>
+      <code>$keys[$j++]</code>
+      <code>$keys[--$j]</code>
+      <code>$keys[--$j]</code>
+      <code>$keys[--$j]</code>
+      <code>$keys[--$j]</code>
+      <code>$l[$i + 1]</code>
+      <code>$l[$i - 1]</code>
+      <code>$l[$i]</code>
+      <code>$l['b']</code>
+      <code>$r0</code>
+      <code>$r0</code>
+      <code>$r0</code>
+      <code>$r0</code>
+      <code>$r0</code>
+      <code>$r0</code>
+      <code>$r0</code>
+      <code>$r0</code>
+      <code>$r0</code>
+      <code>$r0</code>
+      <code>$r0</code>
+      <code>$r0</code>
+      <code>$r1</code>
+      <code>$r1</code>
+      <code>$r1</code>
+      <code>$r1</code>
+      <code>$r1</code>
+      <code>$r1</code>
+      <code>$r1</code>
+      <code>$r1</code>
+      <code>$r1</code>
+      <code>$r1</code>
+      <code>$r1</code>
+      <code>$r1</code>
+      <code>$r2</code>
+      <code>$r2</code>
+      <code>$r2</code>
+      <code>$r2</code>
+      <code>$r2</code>
+      <code>$r2</code>
+      <code>$r2</code>
+      <code>$r2</code>
+      <code>$r2</code>
+      <code>$r2</code>
+      <code>$r2</code>
+      <code>$r2</code>
+      <code>$r3</code>
+      <code>$r3</code>
+      <code>$r3</code>
+      <code>$r3</code>
+      <code>$r3</code>
+      <code>$r3</code>
+      <code>$r3</code>
+      <code>$r3</code>
+      <code>$r3</code>
+      <code>$r3</code>
+      <code>$r3</code>
+      <code>$r3</code>
+      <code>($r0 + $keys[$j++] + ((($r1 ^ $r2) &amp; $r3) ^ $r1)) &amp; 0xFFFF</code>
+      <code>($r0 ^ $r1) &amp; $r2</code>
+      <code>($r0 ^ $r1) &amp; $r2</code>
+      <code>($r1 + $keys[$j++] + ((($r2 ^ $r3) &amp; $r0) ^ $r2)) &amp; 0xFFFF</code>
+      <code>($r1 ^ $r2) &amp; $r3</code>
+      <code>($r1 ^ $r2) &amp; $r3</code>
+      <code>($r2 + $keys[$j++] + ((($r3 ^ $r0) &amp; $r1) ^ $r3)) &amp; 0xFFFF</code>
+      <code>($r2 ^ $r3) &amp; $r0</code>
+      <code>($r2 ^ $r3) &amp; $r0</code>
+      <code>($r3 + $keys[$j++] + ((($r0 ^ $r1) &amp; $r2) ^ $r0)) &amp; 0xFFFF</code>
+      <code>($r3 ^ $r0) &amp; $r1</code>
+      <code>($r3 ^ $r0) &amp; $r1</code>
+      <code>self::$pitable[$l['a']]</code>
+    </MixedOperand>
+    <PossiblyFalseArgument occurrences="5">
+      <code>$l</code>
+      <code>$this-&gt;key</code>
+      <code>unpack('C*', $key)</code>
+      <code>unpack('v*', $in)</code>
+      <code>unpack('v*', $in)</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalsePropertyAssignmentValue occurrences="1">
+      <code>pack(...$l)</code>
+    </PossiblyFalsePropertyAssignmentValue>
+    <PossiblyInvalidArrayAccess occurrences="2">
+      <code>$l['a']</code>
+      <code>$l['b']</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyNullOperand occurrences="1">
+      <code>$this-&gt;openssl_translate_mode()</code>
+    </PossiblyNullOperand>
+    <PossiblyUndefinedIntArrayOffset occurrences="1">
+      <code>$l[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="2">
+      <code>$l['a']</code>
+      <code>$l['b']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUnusedMethod occurrences="1">
+      <code>setupInlineCrypt</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedProperty occurrences="1">
+      <code>$key_length</code>
+    </PossiblyUnusedProperty>
+    <PropertyNotSetInConstructor occurrences="13">
+      <code>$current_key_length</code>
+      <code>$key</code>
+      <code>$keys</code>
+      <code>$orig_key</code>
+      <code>RC2</code>
+      <code>RC2</code>
+      <code>RC2</code>
+      <code>RC2</code>
+      <code>RC2</code>
+      <code>RC2</code>
+      <code>RC2</code>
+      <code>RC2</code>
+      <code>RC2</code>
+    </PropertyNotSetInConstructor>
+    <RedundantPropertyInitializationCheck occurrences="1">
+      <code>isset($this-&gt;key)</code>
+    </RedundantPropertyInitializationCheck>
+    <TypeDoesNotContainType occurrences="8">
+      <code>$limit === 0</code>
+      <code>$limit === 0</code>
+      <code>$limit === 0</code>
+      <code>$limit === 0</code>
+      <code>$limit === 64</code>
+      <code>$limit === 64</code>
+      <code>$limit === 64</code>
+      <code>$limit === 64</code>
+    </TypeDoesNotContainType>
+  </file>
+  <file src="../phpseclib/Crypt/RC4.php">
+    <MixedArgument occurrences="1">
+      <code>$keyStream[($ksj + $ksi) &amp; 255]</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="9">
+      <code>$keyStream[$i]</code>
+      <code>$keyStream[$j]</code>
+      <code>$keyStream[($ksj + $ksi) &amp; 255]</code>
+      <code>$stream[0]</code>
+      <code>$stream[0]</code>
+      <code>$stream[1]</code>
+      <code>$stream[1]</code>
+      <code>$stream[2]</code>
+      <code>$stream[2]</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="2">
+      <code>$keyStream[$i]</code>
+      <code>$keyStream[$j]</code>
+    </MixedArrayAssignment>
+    <MixedArrayOffset occurrences="5">
+      <code>$keyStream[$i]</code>
+      <code>$keyStream[$i]</code>
+      <code>$keyStream[$j]</code>
+      <code>$keyStream[$j]</code>
+      <code>$keyStream[($ksj + $ksi) &amp; 255]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="13">
+      <code>$i</code>
+      <code>$i</code>
+      <code>$i</code>
+      <code>$j</code>
+      <code>$j</code>
+      <code>$j</code>
+      <code>$keyStream</code>
+      <code>$keyStream</code>
+      <code>$keyStream[$i]</code>
+      <code>$keyStream[$j]</code>
+      <code>$ksi</code>
+      <code>$ksj</code>
+      <code>$stream</code>
+    </MixedAssignment>
+    <MixedOperand occurrences="3">
+      <code>$i</code>
+      <code>$j</code>
+      <code>$ksj</code>
+    </MixedOperand>
+    <PossiblyUnusedProperty occurrences="1">
+      <code>$key_length</code>
+    </PossiblyUnusedProperty>
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>$key</code>
+      <code>$stream</code>
+      <code>RC4</code>
+      <code>RC4</code>
+      <code>RC4</code>
+      <code>RC4</code>
+      <code>RC4</code>
+      <code>RC4</code>
+      <code>RC4</code>
+      <code>RC4</code>
+      <code>RC4</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Crypt/RSA.php">
+    <LessSpecificReturnStatement occurrences="1">
+      <code>RSA::load($privatekeystr)</code>
+    </LessSpecificReturnStatement>
+    <MixedArgument occurrences="15">
+      <code>$bits</code>
+      <code>$components['MGFHash']</code>
+      <code>$components['hash']</code>
+      <code>$components['saltLength']</code>
+      <code>$e</code>
+      <code>$lcm['bottom']</code>
+      <code>$n</code>
+      <code>$primes[$i]</code>
+      <code>$primes[$i]</code>
+      <code>$primes[1]</code>
+      <code>$regSize</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>self::$one</code>
+      <code>self::$one</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="8">
+      <code>$lcm['bottom']</code>
+      <code>$lcm['bottom']</code>
+      <code>$lcm['top']</code>
+      <code>$lcm['top']</code>
+      <code>$primes[$i]</code>
+      <code>$primes[1]</code>
+      <code>$primes[2]</code>
+      <code>$temp</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="7">
+      <code>$coefficients[$i]</code>
+      <code>$coefficients[2]</code>
+      <code>$exponents[$i]</code>
+      <code>$lcm['bottom']</code>
+      <code>$lcm['top']</code>
+      <code>$primes[$i]</code>
+      <code>$primes[$i]</code>
+    </MixedArrayAssignment>
+    <MixedArrayOffset occurrences="5">
+      <code>$coefficients[$i]</code>
+      <code>$exponents[$i]</code>
+      <code>$primes[$i]</code>
+      <code>$primes[$i]</code>
+      <code>$primes[$i]</code>
+    </MixedArrayOffset>
+    <MixedArrayTypeCoercion occurrences="1">
+      <code>$primes[$i]</code>
+    </MixedArrayTypeCoercion>
+    <MixedAssignment occurrences="22">
+      <code>$coefficients[2]</code>
+      <code>$i</code>
+      <code>$i</code>
+      <code>$key-&gt;coefficients</code>
+      <code>$key-&gt;exponent</code>
+      <code>$key-&gt;exponent</code>
+      <code>$key-&gt;exponents</code>
+      <code>$key-&gt;k</code>
+      <code>$key-&gt;modulus</code>
+      <code>$key-&gt;primes</code>
+      <code>$key-&gt;privateExponent</code>
+      <code>$key-&gt;publicExponent</code>
+      <code>$lcm['bottom']</code>
+      <code>$lcm['top']</code>
+      <code>$prime</code>
+      <code>$privatekey-&gt;coefficients</code>
+      <code>$privatekey-&gt;exponents</code>
+      <code>$privatekey-&gt;k</code>
+      <code>$privatekey-&gt;primes</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>[$temp]</code>
+    </MixedAssignment>
+    <MixedMethodCall occurrences="7">
+      <code>divide</code>
+      <code>gcd</code>
+      <code>getLengthInBytes</code>
+      <code>modInverse</code>
+      <code>multiply</code>
+      <code>subtract</code>
+      <code>subtract</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="3">
+      <code>$bits</code>
+      <code>$i</code>
+      <code>$t</code>
+    </MixedOperand>
+    <MoreSpecificReturnType occurrences="1">
+      <code>PrivateKey</code>
+    </MoreSpecificReturnType>
+    <PossiblyFalseArgument occurrences="4">
+      <code>$primes[$i]</code>
+      <code>$primes[$i]</code>
+      <code>$primes[1]</code>
+      <code>$rsa</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalseOperand occurrences="1">
+      <code>$c</code>
+    </PossiblyFalseOperand>
+    <PossiblyFalseReference occurrences="3">
+      <code>gcd</code>
+      <code>modInverse</code>
+      <code>subtract</code>
+    </PossiblyFalseReference>
+    <PossiblyUndefinedIntArrayOffset occurrences="2">
+      <code>$primes[1]</code>
+      <code>$primes[2]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="9">
+      <code>$components['coefficients']</code>
+      <code>$components['exponents']</code>
+      <code>$components['format']</code>
+      <code>$components['isPublicKey']</code>
+      <code>$components['modulus']</code>
+      <code>$components['primes']</code>
+      <code>$components['publicExponent']</code>
+      <code>self::$engines['OpenSSL']</code>
+      <code>self::$engines['OpenSSL']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUndefinedVariable occurrences="1">
+      <code>$t</code>
+    </PossiblyUndefinedVariable>
+    <PossiblyUnusedMethod occurrences="8">
+      <code>disableBlinding</code>
+      <code>enableBlinding</code>
+      <code>getEngine</code>
+      <code>getLabel</code>
+      <code>getMGFHash</code>
+      <code>onLoad</code>
+      <code>setExponent</code>
+      <code>setOpenSSLConfigPath</code>
+    </PossiblyUnusedMethod>
+    <PropertyNotSetInConstructor occurrences="5">
+      <code>$exponent</code>
+      <code>$k</code>
+      <code>$modulus</code>
+      <code>$publicExponent</code>
+      <code>RSA</code>
+    </PropertyNotSetInConstructor>
+    <RedundantPropertyInitializationCheck occurrences="2">
+      <code>!isset($this-&gt;modulus)</code>
+      <code>$this-&gt;modulus-&gt;getLength()</code>
+    </RedundantPropertyInitializationCheck>
+    <UndefinedPropertyAssignment occurrences="4">
+      <code>$key-&gt;coefficients</code>
+      <code>$key-&gt;exponents</code>
+      <code>$key-&gt;primes</code>
+      <code>$key-&gt;privateExponent</code>
+    </UndefinedPropertyAssignment>
+    <UnusedVariable occurrences="1">
+      <code>$i0</code>
+    </UnusedVariable>
+  </file>
+  <file src="../phpseclib/Crypt/RSA/Formats/Keys/JWK.php">
+    <MixedArgument occurrences="6">
+      <code>$coefficients[2]-&gt;toBytes()</code>
+      <code>$exponents[1]-&gt;toBytes()</code>
+      <code>$exponents[2]-&gt;toBytes()</code>
+      <code>$key-&gt;$var</code>
+      <code>$primes[1]-&gt;toBytes()</code>
+      <code>$primes[2]-&gt;toBytes()</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="5">
+      <code>$components['coefficients']</code>
+      <code>$components['exponents']</code>
+      <code>$components['exponents']</code>
+      <code>$components['primes']</code>
+      <code>$components['primes']</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="8">
+      <code>$components['coefficients']</code>
+      <code>$components['exponents']</code>
+      <code>$components['exponents']</code>
+      <code>$components['modulus']</code>
+      <code>$components['primes']</code>
+      <code>$components['primes']</code>
+      <code>$components['privateExponent']</code>
+      <code>$components['publicExponent']</code>
+    </MixedArrayAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>array</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="5">
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="2">
+      <code>$components</code>
+      <code>$components</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="2">
+      <code>$components + ['isPublicKey' =&gt; false]</code>
+      <code>$components + ['isPublicKey' =&gt; true]</code>
+    </MixedReturnStatement>
+    <PossiblyUndefinedIntArrayOffset occurrences="5">
+      <code>$coefficients[2]</code>
+      <code>$exponents[1]</code>
+      <code>$exponents[2]</code>
+      <code>$primes[1]</code>
+      <code>$primes[2]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedVariable occurrences="8">
+      <code>$components</code>
+      <code>$components</code>
+      <code>$components</code>
+      <code>$components</code>
+      <code>$components</code>
+      <code>$components</code>
+      <code>$components</code>
+      <code>$components</code>
+    </PossiblyUndefinedVariable>
+    <UnusedClass occurrences="1">
+      <code>JWK</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/RSA/Formats/Keys/MSBLOB.php">
+    <MixedArgument occurrences="7">
+      <code>$coefficients[2]-&gt;toBytes()</code>
+      <code>$exponents[1]-&gt;toBytes()</code>
+      <code>$exponents[2]-&gt;toBytes()</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$primes[1]-&gt;toBytes()</code>
+      <code>$primes[2]-&gt;toBytes()</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="2">
+      <code>$components['isPublicKey']</code>
+      <code>$components['privateExponent']</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="11">
+      <code>$components[$components['isPublicKey'] ? 'publicExponent' : 'privateExponent']</code>
+      <code>$components['coefficients']</code>
+      <code>$components['exponents']</code>
+      <code>$components['exponents']</code>
+      <code>$components['isPublicKey']</code>
+      <code>$components['isPublicKey']</code>
+      <code>$components['modulus']</code>
+      <code>$components['primes']</code>
+      <code>$components['primes']</code>
+      <code>$components['privateExponent']</code>
+      <code>$components['publicExponent']</code>
+    </MixedArrayAssignment>
+    <MixedAssignment occurrences="1">
+      <code>$components['publicExponent']</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>array</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="5">
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+    </MixedMethodCall>
+    <MixedReturnStatement occurrences="2">
+      <code>$components</code>
+      <code>$components</code>
+    </MixedReturnStatement>
+    <PossiblyFalseArgument occurrences="2">
+      <code>unpack('Vmagic/Vbitlen/a4pubexp', Strings::shift($key, 12))</code>
+      <code>unpack('atype/aversion/vreserved/Valgo', Strings::shift($key, 8))</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalseOperand occurrences="4">
+      <code>$key</code>
+      <code>$key</code>
+      <code>pack('VVa*', self::RSA1, 8 * strlen($n), $e)</code>
+      <code>pack('VVa*', self::RSA2, 8 * strlen($n), $e)</code>
+    </PossiblyFalseOperand>
+    <PossiblyInvalidArgument occurrences="7">
+      <code>$bitlen / 16</code>
+      <code>$bitlen / 16</code>
+      <code>$bitlen / 16</code>
+      <code>$bitlen / 16</code>
+      <code>$bitlen / 16</code>
+      <code>$bitlen / 8</code>
+      <code>$bitlen / 8</code>
+    </PossiblyInvalidArgument>
+    <PossiblyUndefinedIntArrayOffset occurrences="5">
+      <code>$coefficients[2]</code>
+      <code>$exponents[1]</code>
+      <code>$exponents[2]</code>
+      <code>$primes[1]</code>
+      <code>$primes[2]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <RedundantCondition occurrences="2">
+      <code>!empty($password) &amp;&amp; is_string($password)</code>
+      <code>is_string($password)</code>
+    </RedundantCondition>
+    <TypeDoesNotContainType occurrences="1">
+      <code>is_string($key)</code>
+    </TypeDoesNotContainType>
+    <UnusedClass occurrences="1">
+      <code>MSBLOB</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/RSA/Formats/Keys/OpenSSH.php">
+    <ImplicitToStringCast occurrences="5">
+      <code>$d</code>
+      <code>$e</code>
+      <code>$e</code>
+      <code>$n</code>
+      <code>$n</code>
+    </ImplicitToStringCast>
+    <MixedArgument occurrences="6">
+      <code>$coefficients[2]</code>
+      <code>$parsed['paddedKey']</code>
+      <code>$parsed['paddedKey']</code>
+      <code>$parsed['publicKey']</code>
+      <code>$primes[1]</code>
+      <code>$primes[2]</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="4">
+      <code>$comment</code>
+      <code>$exponents[]</code>
+      <code>$temp</code>
+      <code>$temp</code>
+    </MixedAssignment>
+    <MixedMethodCall occurrences="4">
+      <code>modInverse</code>
+      <code>modInverse</code>
+      <code>subtract</code>
+      <code>subtract</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="1">
+      <code>$comment</code>
+    </MixedOperand>
+    <PossiblyNullArgument occurrences="1">
+      <code>$password</code>
+    </PossiblyNullArgument>
+    <PossiblyUndefinedIntArrayOffset occurrences="3">
+      <code>$coefficients[2]</code>
+      <code>$primes[1]</code>
+      <code>$primes[2]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="4">
+      <code>$parsed['comment']</code>
+      <code>$parsed['publicKey']</code>
+      <code>$parsed['type']</code>
+      <code>$parsed[type]</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUnusedMethod occurrences="1">
+      <code>savePrivateKey</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedProperty occurrences="1">
+      <code>$types</code>
+    </PossiblyUnusedProperty>
+  </file>
+  <file src="../phpseclib/Crypt/RSA/Formats/Keys/PKCS1.php">
+    <MismatchingDocblockParamType occurrences="2">
+      <code>string|false</code>
+      <code>string|false</code>
+    </MismatchingDocblockParamType>
+    <MixedArgument occurrences="2">
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="3">
+      <code>$primeInfo['coefficient']</code>
+      <code>$primeInfo['exponent']</code>
+      <code>$primeInfo['prime']</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="3">
+      <code>$components['coefficients'][]</code>
+      <code>$components['exponents'][]</code>
+      <code>$components['primes'][]</code>
+    </MixedArrayAssignment>
+    <MixedAssignment occurrences="4">
+      <code>$components['coefficients'][]</code>
+      <code>$components['exponents'][]</code>
+      <code>$components['primes'][]</code>
+      <code>$primeInfo</code>
+    </MixedAssignment>
+    <PossiblyFalseArgument occurrences="1">
+      <code>$password</code>
+    </PossiblyFalseArgument>
+    <PossiblyInvalidArgument occurrences="1">
+      <code>$key</code>
+    </PossiblyInvalidArgument>
+    <PossiblyNullArgument occurrences="1">
+      <code>$password</code>
+    </PossiblyNullArgument>
+    <PossiblyUndefinedIntArrayOffset occurrences="6">
+      <code>$coefficients[2]</code>
+      <code>$decoded[0]</code>
+      <code>$exponents[1]</code>
+      <code>$exponents[2]</code>
+      <code>$primes[1]</code>
+      <code>$primes[2]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="10">
+      <code>$key['coefficient']</code>
+      <code>$key['exponent1']</code>
+      <code>$key['exponent2']</code>
+      <code>$key['modulus']</code>
+      <code>$key['otherPrimeInfos']</code>
+      <code>$key['prime1']</code>
+      <code>$key['prime2']</code>
+      <code>$key['privateExponent']</code>
+      <code>$key['publicExponent']</code>
+      <code>$key['version']</code>
+    </PossiblyUndefinedStringArrayOffset>
+  </file>
+  <file src="../phpseclib/Crypt/RSA/Formats/Keys/PKCS8.php">
+    <MixedArgument occurrences="1">
+      <code>$key[$type . 'Key']</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="1">
+      <code>$result['meta']</code>
+    </MixedAssignment>
+    <PossiblyNullArgument occurrences="1">
+      <code>$password</code>
+    </PossiblyNullArgument>
+    <PossiblyUnusedMethod occurrences="1">
+      <code>savePrivateKey</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedParam occurrences="1">
+      <code>$options</code>
+    </PossiblyUnusedParam>
+    <PossiblyUnusedProperty occurrences="1">
+      <code>$childOIDsLoaded</code>
+    </PossiblyUnusedProperty>
+  </file>
+  <file src="../phpseclib/Crypt/RSA/Formats/Keys/PSS.php">
+    <InvalidArrayOffset occurrences="2">
+      <code>$params['hashAlgorithm']</code>
+      <code>$params['maskGenAlgorithm']</code>
+    </InvalidArrayOffset>
+    <InvalidReturnStatement occurrences="1">
+      <code>new ASN1\Element(ASN1::encodeDER($params, Maps\RSASSA_PSS_params::MAP))</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="1">
+      <code>string</code>
+    </InvalidReturnType>
+    <MixedArgument occurrences="8">
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$key[$type . 'Key']</code>
+      <code>$key[$type . 'KeyAlgorithm']['parameters']</code>
+      <code>$options['saltLength']</code>
+      <code>$params['hashAlgorithm']['algorithm']</code>
+      <code>$params['maskGenAlgorithm']['parameters']</code>
+      <code>$params['maskGenAlgorithm']['parameters']['algorithm']</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="3">
+      <code>$key[$type . 'KeyAlgorithm']['parameters']</code>
+      <code>$params['hashAlgorithm']['algorithm']</code>
+      <code>$params['maskGenAlgorithm']['parameters']</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="1">
+      <code>$params['hashAlgorithm']['algorithm']</code>
+    </MixedArrayAssignment>
+    <MixedAssignment occurrences="1">
+      <code>$result['meta']</code>
+    </MixedAssignment>
+    <MixedMethodCall occurrences="1">
+      <code>toString</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="2">
+      <code>$options['MGFHash']</code>
+      <code>$options['hash']</code>
+    </MixedOperand>
+    <PossiblyInvalidArrayAccess occurrences="2">
+      <code>$params['hashAlgorithm']</code>
+      <code>$params['maskGenAlgorithm']</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyInvalidArrayAssignment occurrences="2">
+      <code>$params['hashAlgorithm']</code>
+      <code>$params['maskGenAlgorithm']</code>
+    </PossiblyInvalidArrayAssignment>
+    <PossiblyInvalidArrayOffset occurrences="2">
+      <code>$params['hashAlgorithm']</code>
+      <code>$params['maskGenAlgorithm']</code>
+    </PossiblyInvalidArrayOffset>
+    <PossiblyInvalidMethodCall occurrences="1">
+      <code>toString</code>
+    </PossiblyInvalidMethodCall>
+    <PossiblyNullArgument occurrences="5">
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$params['hashAlgorithm']['algorithm']</code>
+      <code>$params['maskGenAlgorithm']['parameters']['algorithm']</code>
+      <code>$password</code>
+    </PossiblyNullArgument>
+    <PossiblyNullArrayAccess occurrences="4">
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$params['hashAlgorithm']</code>
+      <code>$params['maskGenAlgorithm']</code>
+    </PossiblyNullArrayAccess>
+    <PossiblyNullArrayAssignment occurrences="1">
+      <code>$params['hashAlgorithm']</code>
+    </PossiblyNullArrayAssignment>
+    <PossiblyNullReference occurrences="4">
+      <code>$params</code>
+      <code>$params</code>
+      <code>$params</code>
+      <code>$params</code>
+    </PossiblyNullReference>
+    <PossiblyUndefinedIntArrayOffset occurrences="2">
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedMethod occurrences="1">
+      <code>toString</code>
+    </PossiblyUndefinedMethod>
+    <PossiblyUndefinedStringArrayOffset occurrences="4">
+      <code>$key[$type . 'Key']</code>
+      <code>$key[$type . 'KeyAlgorithm']</code>
+      <code>$params['hashAlgorithm']</code>
+      <code>$params['maskGenAlgorithm']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUnusedMethod occurrences="2">
+      <code>savePrivateKey</code>
+      <code>savePublicKey</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedProperty occurrences="1">
+      <code>$childOIDsLoaded</code>
+    </PossiblyUnusedProperty>
+    <TypeDoesNotContainType occurrences="2">
+      <code>$decoded === false</code>
+      <code>$decoded === false</code>
+    </TypeDoesNotContainType>
+    <UndefinedMethod occurrences="7">
+      <code>$params</code>
+      <code>$params</code>
+      <code>$params</code>
+      <code>$params</code>
+      <code>$params</code>
+      <code>$params</code>
+      <code>$params</code>
+    </UndefinedMethod>
+  </file>
+  <file src="../phpseclib/Crypt/RSA/Formats/Keys/PuTTY.php">
+    <ImplicitToStringCast occurrences="5">
+      <code>$d</code>
+      <code>$e</code>
+      <code>$e</code>
+      <code>$n</code>
+      <code>$n</code>
+    </ImplicitToStringCast>
+    <MixedArgument occurrences="3">
+      <code>$coefficients[2]</code>
+      <code>$primes[1]</code>
+      <code>$primes[2]</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="1">
+      <code>$components['public']</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="3">
+      <code>$exponents[]</code>
+      <code>$temp</code>
+      <code>$temp</code>
+    </MixedAssignment>
+    <MixedMethodCall occurrences="4">
+      <code>modInverse</code>
+      <code>modInverse</code>
+      <code>subtract</code>
+      <code>subtract</code>
+    </MixedMethodCall>
+    <NullReference occurrences="2">
+      <code>$private</code>
+      <code>$public</code>
+    </NullReference>
+    <PossiblyNullArgument occurrences="1">
+      <code>$password</code>
+    </PossiblyNullArgument>
+    <PossiblyUndefinedIntArrayOffset occurrences="3">
+      <code>$coefficients[2]</code>
+      <code>$primes[1]</code>
+      <code>$primes[2]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUnusedMethod occurrences="2">
+      <code>savePrivateKey</code>
+      <code>savePublicKey</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedProperty occurrences="1">
+      <code>$types</code>
+    </PossiblyUnusedProperty>
+    <TypeDoesNotContainType occurrences="2">
+      <code>$result === false</code>
+      <code>$result === false</code>
+    </TypeDoesNotContainType>
+  </file>
+  <file src="../phpseclib/Crypt/RSA/Formats/Keys/Raw.php">
+    <MissingClosureReturnType occurrences="3">
+      <code>fn ($var) =&gt; clone $var</code>
+      <code>fn ($var) =&gt; clone $var</code>
+      <code>fn ($var) =&gt; clone $var</code>
+    </MissingClosureReturnType>
+    <MixedArrayAccess occurrences="4">
+      <code>$components['primes'][1]</code>
+      <code>$components['primes'][1]</code>
+      <code>$components['primes'][2]</code>
+      <code>$components['primes'][2]</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="9">
+      <code>$components['coefficients']</code>
+      <code>$components['exponents']</code>
+      <code>$components['modulus']</code>
+      <code>$components['primes']</code>
+      <code>$components['privateExponent']</code>
+      <code>$components['publicExponent']</code>
+      <code>$exponents[]</code>
+      <code>$temp</code>
+      <code>$temp</code>
+    </MixedAssignment>
+    <MixedClone occurrences="3">
+      <code>clone $var</code>
+      <code>clone $var</code>
+      <code>clone $var</code>
+    </MixedClone>
+    <MixedMethodCall occurrences="5">
+      <code>modInverse</code>
+      <code>modInverse</code>
+      <code>modInverse</code>
+      <code>subtract</code>
+      <code>subtract</code>
+    </MixedMethodCall>
+    <RedundantCondition occurrences="2">
+      <code>!empty($password) &amp;&amp; is_string($password)</code>
+      <code>is_string($password)</code>
+    </RedundantCondition>
+    <UnusedClass occurrences="1">
+      <code>Raw</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/RSA/Formats/Keys/XML.php">
+    <ArgumentTypeCoercion occurrences="1">
+      <code>$key</code>
+    </ArgumentTypeCoercion>
+    <MixedArgument occurrences="5">
+      <code>$coefficients[2]-&gt;toBytes()</code>
+      <code>$exponents[1]-&gt;toBytes()</code>
+      <code>$exponents[2]-&gt;toBytes()</code>
+      <code>$primes[1]-&gt;toBytes()</code>
+      <code>$primes[2]-&gt;toBytes()</code>
+    </MixedArgument>
+    <MixedMethodCall occurrences="5">
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+    </MixedMethodCall>
+    <PossiblyNullArgument occurrences="1">
+      <code>$temp-&gt;item(0)-&gt;nodeValue</code>
+    </PossiblyNullArgument>
+    <PossiblyNullPropertyFetch occurrences="1">
+      <code>$temp-&gt;item(0)-&gt;nodeValue</code>
+    </PossiblyNullPropertyFetch>
+    <PossiblyUndefinedIntArrayOffset occurrences="5">
+      <code>$coefficients[2]</code>
+      <code>$exponents[1]</code>
+      <code>$exponents[2]</code>
+      <code>$primes[1]</code>
+      <code>$primes[2]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <RedundantCondition occurrences="2">
+      <code>!empty($password) &amp;&amp; is_string($password)</code>
+      <code>is_string($password)</code>
+    </RedundantCondition>
+    <UnusedClass occurrences="1">
+      <code>XML</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Crypt/RSA/PrivateKey.php">
+    <DocblockTypeContradiction occurrences="1">
+      <code>empty($this-&gt;publicExponent)</code>
+    </DocblockTypeContradiction>
+    <InvalidOperand occurrences="3">
+      <code>!$hashesMatch</code>
+      <code>$m[$i] === "\0"</code>
+      <code>$m[$i] === "\1"</code>
+    </InvalidOperand>
+    <InvalidReturnStatement occurrences="2">
+      <code>$this-&gt;rsassa_pkcs1_v1_5_sign($message)</code>
+      <code>$this-&gt;rsassa_pss_sign($message)</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="1">
+      <code>string</code>
+    </InvalidReturnType>
+    <MixedArgument occurrences="26">
+      <code>$key</code>
+      <code>$r</code>
+      <code>$r-&gt;multiply($h)</code>
+      <code>$smallest-&gt;subtract(self::$one)</code>
+      <code>$this-&gt;coefficients[$i]</code>
+      <code>$this-&gt;coefficients[$i]</code>
+      <code>$this-&gt;coefficients[2]</code>
+      <code>$this-&gt;coefficients[2]</code>
+      <code>$this-&gt;exponents[$i]</code>
+      <code>$this-&gt;exponents[$i]</code>
+      <code>$this-&gt;exponents[1]</code>
+      <code>$this-&gt;exponents[2]</code>
+      <code>$this-&gt;primes[$i - 1]</code>
+      <code>$this-&gt;primes[$i]</code>
+      <code>$this-&gt;primes[$i]</code>
+      <code>$this-&gt;primes[$i]</code>
+      <code>$this-&gt;primes[$i]</code>
+      <code>$this-&gt;primes[$i]</code>
+      <code>$this-&gt;primes[$i]</code>
+      <code>$this-&gt;primes[$i]</code>
+      <code>$this-&gt;primes[1]</code>
+      <code>$this-&gt;primes[1]</code>
+      <code>$this-&gt;primes[1]</code>
+      <code>$this-&gt;primes[2]</code>
+      <code>$this-&gt;primes[2]</code>
+      <code>$this-&gt;primes[2]</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="8">
+      <code>$key</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$smallest</code>
+      <code>$smallest</code>
+      <code>$type</code>
+      <code>$type</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>string</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="10">
+      <code>$type::savePrivateKey($this-&gt;modulus, $this-&gt;publicExponent, $this-&gt;exponent, $this-&gt;primes, $this-&gt;exponents, $this-&gt;coefficients, $this-&gt;password, $options)</code>
+      <code>$type::savePublicKey($this-&gt;modulus, $this-&gt;exponent, $options)</code>
+      <code>$type::savePublicKey($this-&gt;modulus, $this-&gt;publicExponent)</code>
+      <code>compare</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>subtract</code>
+    </MixedMethodCall>
+    <MixedReturnStatement occurrences="2">
+      <code>$type::savePrivateKey($this-&gt;modulus, $this-&gt;publicExponent, $this-&gt;exponent, $this-&gt;primes, $this-&gt;exponents, $this-&gt;coefficients, $this-&gt;password, $options)</code>
+      <code>$type::savePublicKey($this-&gt;modulus, $this-&gt;exponent, $options)</code>
+    </MixedReturnStatement>
+    <PossiblyFalseOperand occurrences="1">
+      <code>strpos($em, chr(0), 2)</code>
+    </PossiblyFalseOperand>
+    <PossiblyInvalidArgument occurrences="5">
+      <code>$m</code>
+      <code>$m</code>
+      <code>$s</code>
+      <code>$s</code>
+      <code>$temp</code>
+    </PossiblyInvalidArgument>
+    <PossiblyUndefinedIntArrayOffset occurrences="11">
+      <code>$this-&gt;coefficients[2]</code>
+      <code>$this-&gt;coefficients[2]</code>
+      <code>$this-&gt;coefficients[2]</code>
+      <code>$this-&gt;exponents[1]</code>
+      <code>$this-&gt;exponents[1]</code>
+      <code>$this-&gt;exponents[2]</code>
+      <code>$this-&gt;primes[1]</code>
+      <code>$this-&gt;primes[1]</code>
+      <code>$this-&gt;primes[1]</code>
+      <code>$this-&gt;primes[2]</code>
+      <code>$this-&gt;primes[2]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PropertyNotSetInConstructor occurrences="9">
+      <code>$coefficients</code>
+      <code>$exponents</code>
+      <code>$primes</code>
+      <code>$privateExponent</code>
+      <code>PrivateKey</code>
+      <code>PrivateKey</code>
+      <code>PrivateKey</code>
+      <code>PrivateKey</code>
+      <code>PrivateKey</code>
+    </PropertyNotSetInConstructor>
+    <UnusedVariable occurrences="1">
+      <code>$y</code>
+    </UnusedVariable>
+  </file>
+  <file src="../phpseclib/Crypt/RSA/PublicKey.php">
+    <FalsableReturnStatement occurrences="4">
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+    </FalsableReturnStatement>
+    <InvalidReturnStatement occurrences="2">
+      <code>$this-&gt;rsassa_pss_verify($message, $signature)</code>
+      <code>hash_equals($h, $h2)</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="2">
+      <code>bool</code>
+      <code>string</code>
+    </InvalidReturnType>
+    <MixedArgument occurrences="3">
+      <code>$decoded[0]</code>
+      <code>$em2</code>
+      <code>$hash</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="2">
+      <code>$decoded['digestAlgorithm']['algorithm']</code>
+      <code>$decoded[0]['length']</code>
+    </MixedArrayAccess>
+    <MixedArrayOffset occurrences="1">
+      <code>$oids[$decoded['digestAlgorithm']['algorithm']]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="3">
+      <code>$em2</code>
+      <code>$hash</code>
+      <code>$type</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>string</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="1">
+      <code>$type::savePublicKey($this-&gt;modulus, $this-&gt;publicExponent, $options)</code>
+    </MixedMethodCall>
+    <MixedReturnStatement occurrences="1">
+      <code>$type::savePublicKey($this-&gt;modulus, $this-&gt;publicExponent, $options)</code>
+    </MixedReturnStatement>
+    <PossiblyInvalidArgument occurrences="6">
+      <code>$c</code>
+      <code>$c</code>
+      <code>$m2</code>
+      <code>$m2</code>
+      <code>$m2</code>
+      <code>$temp</code>
+    </PossiblyInvalidArgument>
+    <PossiblyInvalidArrayAccess occurrences="2">
+      <code>$decoded['digest']</code>
+      <code>$decoded['digestAlgorithm']</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyInvalidArrayOffset occurrences="2">
+      <code>$decoded['digest']</code>
+      <code>$decoded['digestAlgorithm']</code>
+    </PossiblyInvalidArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="2">
+      <code>$decoded['digest']</code>
+      <code>$decoded['digestAlgorithm']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUndefinedVariable occurrences="2">
+      <code>$r1</code>
+      <code>$r2</code>
+    </PossiblyUndefinedVariable>
+    <PropertyNotSetInConstructor occurrences="5">
+      <code>PublicKey</code>
+      <code>PublicKey</code>
+      <code>PublicKey</code>
+      <code>PublicKey</code>
+      <code>PublicKey</code>
+    </PropertyNotSetInConstructor>
+    <TypeDoesNotContainType occurrences="3">
+      <code>$em === false</code>
+      <code>$em === false</code>
+      <code>$em === false</code>
+    </TypeDoesNotContainType>
+    <UndefinedMethod occurrences="4">
+      <code>$decoded</code>
+      <code>$decoded</code>
+      <code>$decoded</code>
+      <code>$decoded</code>
+    </UndefinedMethod>
+    <UnusedParam occurrences="1">
+      <code>$pkcs15_compat</code>
+    </UnusedParam>
+  </file>
+  <file src="../phpseclib/Crypt/Random.php">
+    <ArgumentTypeCoercion occurrences="1">
+      <code>$length</code>
+    </ArgumentTypeCoercion>
+    <InvalidArgument occurrences="1">
+      <code>1</code>
+    </InvalidArgument>
+    <MissingParamType occurrences="1">
+      <code>$arr</code>
+    </MissingParamType>
+    <MixedArrayAccess occurrences="1">
+      <code>$_SESSION['count']</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="3">
+      <code>$_SESSION['count']</code>
+      <code>$_SESSION['count']</code>
+      <code>$_SESSION['seed']</code>
+    </MixedArrayAssignment>
+    <MixedAssignment occurrences="4">
+      <code>$_SESSION['count']</code>
+      <code>$i</code>
+      <code>$r</code>
+      <code>$v</code>
+    </MixedAssignment>
+    <MixedMethodCall occurrences="3">
+      <code>encrypt</code>
+      <code>encrypt</code>
+      <code>encrypt</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="4">
+      <code>$_SESSION['count']</code>
+      <code>$i</code>
+      <code>$r</code>
+      <code>$r</code>
+    </MixedOperand>
+    <PossiblyFalseArgument occurrences="1">
+      <code>$old_session_id</code>
+    </PossiblyFalseArgument>
+    <RedundantCondition occurrences="4">
+      <code>isset($_COOKIE)</code>
+      <code>isset($_GET)</code>
+      <code>isset($_POST)</code>
+      <code>isset($_SERVER)</code>
+    </RedundantCondition>
+    <TypeDoesNotContainNull occurrences="4">
+      <code>''</code>
+      <code>''</code>
+      <code>''</code>
+      <code>''</code>
+    </TypeDoesNotContainNull>
+  </file>
+  <file src="../phpseclib/Crypt/Rijndael.php">
+    <DocblockTypeContradiction occurrences="2">
+      <code>$this-&gt;oldtag === false</code>
+      <code>$this-&gt;oldtag === false</code>
+    </DocblockTypeContradiction>
+    <FalsableReturnStatement occurrences="3">
+      <code>pack('N*', ...$temp)</code>
+      <code>pack('N*', ...$temp)</code>
+    </FalsableReturnStatement>
+    <InvalidFalsableReturnType occurrences="3">
+      <code>string</code>
+      <code>string</code>
+      <code>string</code>
+    </InvalidFalsableReturnType>
+    <InvalidOperand occurrences="7">
+      <code>0x000000FF</code>
+      <code>0x000000FF</code>
+      <code>0x000000FF</code>
+      <code>0x000000FF</code>
+      <code>8</code>
+      <code>16</code>
+      <code>24</code>
+    </InvalidOperand>
+    <InvalidPropertyAssignmentValue occurrences="1"/>
+    <LoopInvalidation occurrences="1">
+      <code>$col</code>
+    </LoopInvalidation>
+    <MixedArgument occurrences="3">
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$this-&gt;w[$row][$j]</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="35">
+      <code>$dt0[$dw &gt;&gt; 24 &amp; 0x000000FF]</code>
+      <code>$dt0[$state[$i] &gt;&gt; 24 &amp; 0x000000FF]</code>
+      <code>$dt1[$dw &gt;&gt; 16 &amp; 0x000000FF]</code>
+      <code>$dt1[$state[$j] &gt;&gt; 16 &amp; 0x000000FF]</code>
+      <code>$dt2[$dw &gt;&gt;  8 &amp; 0x000000FF]</code>
+      <code>$dt2[$state[$k] &gt;&gt;  8 &amp; 0x000000FF]</code>
+      <code>$dt3[$dw       &amp; 0x000000FF]</code>
+      <code>$dt3[$state[$l]       &amp; 0x000000FF]</code>
+      <code>$invtables[0]</code>
+      <code>$invtables[1]</code>
+      <code>$invtables[2]</code>
+      <code>$invtables[3]</code>
+      <code>$invtables[4]</code>
+      <code>$isbox[$word       &amp; 0x000000FF]</code>
+      <code>$isbox[$word &gt;&gt;  8 &amp; 0x000000FF]</code>
+      <code>$isbox[$word &gt;&gt; 16 &amp; 0x000000FF]</code>
+      <code>$isbox[$word &gt;&gt; 24 &amp; 0x000000FF]</code>
+      <code>$rcon[$i / $this-&gt;Nk]</code>
+      <code>$sbox[$state[$i]       &amp; 0x000000FF]</code>
+      <code>$sbox[$state[$i] &gt;&gt;  8 &amp; 0x000000FF]</code>
+      <code>$sbox[$state[$i] &gt;&gt; 16 &amp; 0x000000FF]</code>
+      <code>$sbox[$state[$i] &gt;&gt; 24 &amp; 0x000000FF]</code>
+      <code>$sbox[$word       &amp; 0x000000FF]</code>
+      <code>$sbox[$word &gt;&gt;  8 &amp; 0x000000FF]</code>
+      <code>$sbox[$word &gt;&gt; 16 &amp; 0x000000FF]</code>
+      <code>$sbox[$word &gt;&gt; 24 &amp; 0x000000FF]</code>
+      <code>$t0[$state[$i] &gt;&gt; 24 &amp; 0x000000FF]</code>
+      <code>$t1[$state[$j] &gt;&gt; 16 &amp; 0x000000FF]</code>
+      <code>$t2[$state[$k] &gt;&gt;  8 &amp; 0x000000FF]</code>
+      <code>$t3[$state[$l]       &amp; 0x000000FF]</code>
+      <code>$tables[0]</code>
+      <code>$tables[1]</code>
+      <code>$tables[2]</code>
+      <code>$tables[3]</code>
+      <code>$tables[4]</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="6">
+      <code>$dt0[]</code>
+      <code>$dt1[]</code>
+      <code>$dt2[]</code>
+      <code>$t0[]</code>
+      <code>$t1[]</code>
+      <code>$t2[]</code>
+    </MixedArrayAssignment>
+    <MixedArrayOffset occurrences="28">
+      <code>$dt0[$state[$i] &gt;&gt; 24 &amp; 0x000000FF]</code>
+      <code>$dt1[$state[$j] &gt;&gt; 16 &amp; 0x000000FF]</code>
+      <code>$dt2[$state[$k] &gt;&gt;  8 &amp; 0x000000FF]</code>
+      <code>$dt3[$state[$l]       &amp; 0x000000FF]</code>
+      <code>$isbox[$word       &amp; 0x000000FF]</code>
+      <code>$isbox[$word &gt;&gt;  8 &amp; 0x000000FF]</code>
+      <code>$isbox[$word &gt;&gt; 16 &amp; 0x000000FF]</code>
+      <code>$isbox[$word &gt;&gt; 24 &amp; 0x000000FF]</code>
+      <code>$sbox[$state[$i]       &amp; 0x000000FF]</code>
+      <code>$sbox[$state[$i] &gt;&gt;  8 &amp; 0x000000FF]</code>
+      <code>$sbox[$state[$i] &gt;&gt; 16 &amp; 0x000000FF]</code>
+      <code>$sbox[$state[$i] &gt;&gt; 24 &amp; 0x000000FF]</code>
+      <code>$state[$j]</code>
+      <code>$state[$j]</code>
+      <code>$state[$j]</code>
+      <code>$state[$j]</code>
+      <code>$state[$k]</code>
+      <code>$state[$k]</code>
+      <code>$state[$k]</code>
+      <code>$state[$k]</code>
+      <code>$state[$l]</code>
+      <code>$state[$l]</code>
+      <code>$state[$l]</code>
+      <code>$state[$l]</code>
+      <code>$t0[$state[$i] &gt;&gt; 24 &amp; 0x000000FF]</code>
+      <code>$t1[$state[$j] &gt;&gt; 16 &amp; 0x000000FF]</code>
+      <code>$t2[$state[$k] &gt;&gt;  8 &amp; 0x000000FF]</code>
+      <code>$t3[$state[$l]       &amp; 0x000000FF]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="52">
+      <code>$dt0</code>
+      <code>$dt1</code>
+      <code>$dt2</code>
+      <code>$dt3</code>
+      <code>$dw[]</code>
+      <code>$isbox</code>
+      <code>$j</code>
+      <code>$j</code>
+      <code>$j</code>
+      <code>$j</code>
+      <code>$j</code>
+      <code>$j</code>
+      <code>$j</code>
+      <code>$j</code>
+      <code>$k</code>
+      <code>$k</code>
+      <code>$k</code>
+      <code>$k</code>
+      <code>$k</code>
+      <code>$k</code>
+      <code>$k</code>
+      <code>$k</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$sbox</code>
+      <code>$state[$i]</code>
+      <code>$state[]</code>
+      <code>$state[]</code>
+      <code>$t0</code>
+      <code>$t1</code>
+      <code>$t2</code>
+      <code>$t3</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp[$i]</code>
+      <code>$temp[$i]</code>
+      <code>$temp[$i]</code>
+      <code>$temp[$i]</code>
+      <code>$temp[$j]</code>
+      <code>$w[$i]</code>
+      <code>$w[]</code>
+      <code>$wc</code>
+      <code>$word</code>
+      <code>$word</code>
+      <code>$word</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="3">
+      <code>array</code>
+      <code>array</code>
+      <code>array</code>
+    </MixedInferredReturnType>
+    <MixedOperand occurrences="109">
+      <code>$Nb + $i - $c[1]</code>
+      <code>$Nb + $i - $c[1]</code>
+      <code>$Nb + $i - $c[2]</code>
+      <code>$Nb + $i - $c[2]</code>
+      <code>$Nb + $i - $c[3]</code>
+      <code>$Nb + $i - $c[3]</code>
+      <code>$c[1]</code>
+      <code>$c[1]</code>
+      <code>$c[1]</code>
+      <code>$c[1]</code>
+      <code>$c[1]</code>
+      <code>$c[1]</code>
+      <code>$c[2]</code>
+      <code>$c[2]</code>
+      <code>$c[2]</code>
+      <code>$c[2]</code>
+      <code>$c[2]</code>
+      <code>$c[2]</code>
+      <code>$c[3]</code>
+      <code>$c[3]</code>
+      <code>$c[3]</code>
+      <code>$c[3]</code>
+      <code>$c[3]</code>
+      <code>$c[3]</code>
+      <code>$dt0[$dw &gt;&gt; 24 &amp; 0x000000FF]</code>
+      <code>$dt0[$state[$i] &gt;&gt; 24 &amp; 0x000000FF]</code>
+      <code>$dw[$i]</code>
+      <code>$dw[$i]</code>
+      <code>$dw[++$wc]</code>
+      <code>$dw[++$wc]</code>
+      <code>$i + $c[1]</code>
+      <code>$i + $c[1]</code>
+      <code>$i + $c[2]</code>
+      <code>$i + $c[2]</code>
+      <code>$i + $c[3]</code>
+      <code>$i + $c[3]</code>
+      <code>$isbox[$word       &amp; 0x000000FF]</code>
+      <code>$isbox[$word &gt;&gt;  8 &amp; 0x000000FF]</code>
+      <code>$isbox[$word &gt;&gt; 16 &amp; 0x000000FF]</code>
+      <code>$isbox[$word &gt;&gt; 24 &amp; 0x000000FF]</code>
+      <code>$j</code>
+      <code>$j</code>
+      <code>$j</code>
+      <code>$j</code>
+      <code>$k</code>
+      <code>$k</code>
+      <code>$k</code>
+      <code>$k</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$l</code>
+      <code>$rcon[$i / $this-&gt;Nk]</code>
+      <code>$sbox[$state[$i]       &amp; 0x000000FF]</code>
+      <code>$sbox[$state[$i] &gt;&gt;  8 &amp; 0x000000FF]</code>
+      <code>$sbox[$state[$i] &gt;&gt; 16 &amp; 0x000000FF]</code>
+      <code>$sbox[$state[$i] &gt;&gt; 24 &amp; 0x000000FF]</code>
+      <code>$sbox[$word       &amp; 0x000000FF]</code>
+      <code>$sbox[$word &gt;&gt;  8 &amp; 0x000000FF]</code>
+      <code>$sbox[$word &gt;&gt; 16 &amp; 0x000000FF]</code>
+      <code>$sbox[$word &gt;&gt; 24 &amp; 0x000000FF]</code>
+      <code>$state[$i]</code>
+      <code>$state[$i]</code>
+      <code>$state[$i]</code>
+      <code>$state[$i]</code>
+      <code>$state[$i]</code>
+      <code>$state[$i]</code>
+      <code>$state[$i]</code>
+      <code>$state[$i]</code>
+      <code>$state[$j]</code>
+      <code>$state[$j]</code>
+      <code>$state[$j]</code>
+      <code>$state[$j]</code>
+      <code>$state[$k]</code>
+      <code>$state[$k]</code>
+      <code>$state[$k]</code>
+      <code>$state[$k]</code>
+      <code>$state[$l]</code>
+      <code>$state[$l]</code>
+      <code>$state[$l]</code>
+      <code>$state[$l]</code>
+      <code>$t0[$state[$i] &gt;&gt; 24 &amp; 0x000000FF]</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$w[$i - $this-&gt;Nk]</code>
+      <code>$w[$i]</code>
+      <code>$w[++$wc]</code>
+      <code>$w[++$wc]</code>
+      <code>$word</code>
+      <code>$word</code>
+      <code>$word</code>
+      <code>$word</code>
+      <code>$word</code>
+      <code>$word</code>
+      <code>($Nb + $i - $c[1]) % $Nb</code>
+      <code>($Nb + $i - $c[1]) % $Nb</code>
+      <code>($Nb + $i - $c[2]) % $Nb</code>
+      <code>($Nb + $i - $c[2]) % $Nb</code>
+      <code>($Nb + $i - $c[3]) % $Nb</code>
+      <code>($Nb + $i - $c[3]) % $Nb</code>
+      <code>($i + $c[1]) % $Nb</code>
+      <code>($i + $c[1]) % $Nb</code>
+      <code>($i + $c[2]) % $Nb</code>
+      <code>($i + $c[2]) % $Nb</code>
+      <code>($i + $c[3]) % $Nb</code>
+      <code>($i + $c[3]) % $Nb</code>
+      <code>($temp &lt;&lt; 8) &amp; intval(0xFFFFFF00)</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="3">
+      <code>$tables</code>
+      <code>$tables</code>
+    </MixedReturnStatement>
+    <PossiblyFalseArgument occurrences="1">
+      <code>unpack('N*words', $this-&gt;key)</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalseIterator occurrences="2">
+      <code>$words</code>
+      <code>$words</code>
+    </PossiblyFalseIterator>
+    <PossiblyFalsePropertyAssignmentValue occurrences="2">
+      <code>false</code>
+      <code>false</code>
+    </PossiblyFalsePropertyAssignmentValue>
+    <PossiblyNullOperand occurrences="1">
+      <code>$this-&gt;openssl_translate_mode()</code>
+    </PossiblyNullOperand>
+    <PossiblyNullPropertyAssignmentValue occurrences="1">
+      <code>$w</code>
+    </PossiblyNullPropertyAssignmentValue>
+    <PossiblyUndefinedIntArrayOffset occurrences="35">
+      <code>$c[1]</code>
+      <code>$c[1]</code>
+      <code>$c[1]</code>
+      <code>$c[1]</code>
+      <code>$c[1]</code>
+      <code>$c[1]</code>
+      <code>$c[1]</code>
+      <code>$c[1]</code>
+      <code>$c[2]</code>
+      <code>$c[2]</code>
+      <code>$c[2]</code>
+      <code>$c[2]</code>
+      <code>$c[2]</code>
+      <code>$c[2]</code>
+      <code>$c[2]</code>
+      <code>$c[2]</code>
+      <code>$c[3]</code>
+      <code>$c[3]</code>
+      <code>$c[3]</code>
+      <code>$c[3]</code>
+      <code>$c[3]</code>
+      <code>$c[3]</code>
+      <code>$c[3]</code>
+      <code>$c[3]</code>
+      <code>$invtables[0]</code>
+      <code>$invtables[1]</code>
+      <code>$invtables[2]</code>
+      <code>$invtables[3]</code>
+      <code>$invtables[4]</code>
+      <code>$tables[0]</code>
+      <code>$tables[1]</code>
+      <code>$tables[2]</code>
+      <code>$tables[3]</code>
+      <code>$tables[4]</code>
+      <code>$this-&gt;w[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="2">
+      <code>$this-&gt;kl['block_size']</code>
+      <code>$this-&gt;kl['key_length']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUndefinedVariable occurrences="6">
+      <code>$dt0</code>
+      <code>$dt1</code>
+      <code>$dt2</code>
+      <code>$t0</code>
+      <code>$t1</code>
+      <code>$t2</code>
+    </PossiblyUndefinedVariable>
+    <PossiblyUnusedMethod occurrences="2">
+      <code>setBlockLength</code>
+      <code>setupInlineCrypt</code>
+    </PossiblyUnusedMethod>
+    <PropertyNotSetInConstructor occurrences="14">
+      <code>$Nr</code>
+      <code>$c</code>
+      <code>$dw</code>
+      <code>$kl</code>
+      <code>$w</code>
+      <code>Rijndael</code>
+      <code>Rijndael</code>
+      <code>Rijndael</code>
+      <code>Rijndael</code>
+      <code>Rijndael</code>
+      <code>Rijndael</code>
+      <code>Rijndael</code>
+      <code>Rijndael</code>
+      <code>Rijndael</code>
+    </PropertyNotSetInConstructor>
+    <RedundantCast occurrences="2">
+      <code>(int)0xFF000000</code>
+      <code>(int)0xFF000000</code>
+    </RedundantCast>
+    <RedundantConditionGivenDocblockType occurrences="1">
+      <code>is_string($this-&gt;iv)</code>
+    </RedundantConditionGivenDocblockType>
+  </file>
+  <file src="../phpseclib/Crypt/Salsa20.php">
+    <DocblockTypeContradiction occurrences="5">
+      <code>$this-&gt;key === false</code>
+      <code>$this-&gt;key === false</code>
+      <code>$this-&gt;nonce === false</code>
+      <code>$this-&gt;nonce === false</code>
+      <code>$this-&gt;oldtag === false</code>
+    </DocblockTypeContradiction>
+    <FalsableReturnStatement occurrences="1"/>
+    <InvalidFalsableReturnType occurrences="1">
+      <code>string</code>
+    </InvalidFalsableReturnType>
+    <MissingReturnType occurrences="1">
+      <code>salsa20</code>
+    </MissingReturnType>
+    <MixedArgument occurrences="21">
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$key</code>
+      <code>$temp</code>
+      <code>$z[10]</code>
+      <code>$z[11]</code>
+      <code>$z[12]</code>
+      <code>$z[13]</code>
+      <code>$z[14]</code>
+      <code>$z[15]</code>
+      <code>$z[16]</code>
+      <code>$z[1]</code>
+      <code>$z[2]</code>
+      <code>$z[3]</code>
+      <code>$z[4]</code>
+      <code>$z[5]</code>
+      <code>$z[6]</code>
+      <code>$z[7]</code>
+      <code>$z[8]</code>
+      <code>$z[9]</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="10">
+      <code>$block</code>
+      <code>$block</code>
+      <code>$block</code>
+      <code>$buffer['counter']</code>
+      <code>$buffer['counter']</code>
+      <code>$buffer['counter']</code>
+      <code>$buffer['counter']</code>
+      <code>$buffer['counter']</code>
+      <code>$temp</code>
+      <code>$x[$i]</code>
+    </MixedAssignment>
+    <MixedOperand occurrences="9">
+      <code>$buffer['counter']</code>
+      <code>$buffer['counter']</code>
+      <code>$buffer['counter']</code>
+      <code>$buffer['counter']</code>
+      <code>$buffer['counter']</code>
+      <code>$x[$i]</code>
+      <code>static::salsa20($this-&gt;p1 . pack('V', $buffer['counter']++) . $this-&gt;p2)</code>
+      <code>static::salsa20($this-&gt;p1 . pack('V', $buffer['counter']++) . $this-&gt;p2)</code>
+      <code>static::salsa20($this-&gt;p1 . pack('V', $i++) . $this-&gt;p2)</code>
+    </MixedOperand>
+    <PossiblyFalseArgument occurrences="1">
+      <code>$encrypted</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalseOperand occurrences="21">
+      <code>$this-&gt;p1</code>
+      <code>$this-&gt;p1</code>
+      <code>$this-&gt;p1</code>
+      <code>$this-&gt;p1</code>
+      <code>$this-&gt;p2</code>
+      <code>$this-&gt;p2</code>
+      <code>$this-&gt;p2</code>
+      <code>$this-&gt;p2</code>
+      <code>$this-&gt;p2</code>
+      <code>$this-&gt;p2</code>
+      <code>$this-&gt;p2</code>
+      <code>pack('V', $buffer['counter'])</code>
+      <code>pack('V', $buffer['counter'])</code>
+      <code>pack('V', $buffer['counter']++)</code>
+      <code>pack('V', $buffer['counter']++)</code>
+      <code>pack('V', $buffer['counter']++)</code>
+      <code>pack('V', $i++)</code>
+      <code>pack('V', $this-&gt;counter)</code>
+      <code>pack('V', strlen($text))</code>
+      <code>pack('V', strlen($this-&gt;aad))</code>
+    </PossiblyFalseOperand>
+    <PossiblyFalsePropertyAssignmentValue occurrences="2">
+      <code>false</code>
+      <code>false</code>
+    </PossiblyFalsePropertyAssignmentValue>
+    <PossiblyInvalidArrayAccess occurrences="18">
+      <code>$x[$i]</code>
+      <code>$z[$i]</code>
+      <code>$z[10]</code>
+      <code>$z[11]</code>
+      <code>$z[12]</code>
+      <code>$z[13]</code>
+      <code>$z[14]</code>
+      <code>$z[15]</code>
+      <code>$z[16]</code>
+      <code>$z[1]</code>
+      <code>$z[2]</code>
+      <code>$z[3]</code>
+      <code>$z[4]</code>
+      <code>$z[5]</code>
+      <code>$z[6]</code>
+      <code>$z[7]</code>
+      <code>$z[8]</code>
+      <code>$z[9]</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyInvalidArrayAssignment occurrences="1">
+      <code>$x[$i]</code>
+    </PossiblyInvalidArrayAssignment>
+    <PossiblyUndefinedIntArrayOffset occurrences="16">
+      <code>$z[10]</code>
+      <code>$z[11]</code>
+      <code>$z[12]</code>
+      <code>$z[13]</code>
+      <code>$z[14]</code>
+      <code>$z[15]</code>
+      <code>$z[16]</code>
+      <code>$z[1]</code>
+      <code>$z[2]</code>
+      <code>$z[3]</code>
+      <code>$z[4]</code>
+      <code>$z[5]</code>
+      <code>$z[6]</code>
+      <code>$z[7]</code>
+      <code>$z[8]</code>
+      <code>$z[9]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="8">
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['ciphertext']</code>
+      <code>$buffer['counter']</code>
+      <code>$buffer['counter']</code>
+      <code>$buffer['counter']</code>
+      <code>$buffer['counter']</code>
+      <code>$buffer['counter']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PropertyNotSetInConstructor occurrences="9">
+      <code>$debuffer</code>
+      <code>$enbuffer</code>
+      <code>Salsa20</code>
+      <code>Salsa20</code>
+      <code>Salsa20</code>
+      <code>Salsa20</code>
+      <code>Salsa20</code>
+      <code>Salsa20</code>
+      <code>Salsa20</code>
+    </PropertyNotSetInConstructor>
+    <RedundantCast occurrences="1">
+      <code>(int) $x</code>
+    </RedundantCast>
+    <RedundantPropertyInitializationCheck occurrences="3">
+      <code>$this-&gt;usePoly1305 &amp;&amp; !isset($this-&gt;poly1305Key)</code>
+      <code>isset($this-&gt;poly1305Key)</code>
+      <code>isset($this-&gt;poly1305Key)</code>
+    </RedundantPropertyInitializationCheck>
+    <UndefinedVariable occurrences="1">
+      <code>$key</code>
+    </UndefinedVariable>
+  </file>
+  <file src="../phpseclib/Crypt/TripleDES.php">
+    <InvalidPropertyAssignmentValue occurrences="1">
+      <code>24</code>
+    </InvalidPropertyAssignmentValue>
+    <MixedArgument occurrences="1"/>
+    <MixedInferredReturnType occurrences="1">
+      <code>string</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="24">
+      <code>decrypt</code>
+      <code>decrypt</code>
+      <code>decrypt</code>
+      <code>disableContinuousBuffer</code>
+      <code>disableContinuousBuffer</code>
+      <code>disableContinuousBuffer</code>
+      <code>enableContinuousBuffer</code>
+      <code>enableContinuousBuffer</code>
+      <code>enableContinuousBuffer</code>
+      <code>encrypt</code>
+      <code>encrypt</code>
+      <code>encrypt</code>
+      <code>setIV</code>
+      <code>setIV</code>
+      <code>setIV</code>
+      <code>setKey</code>
+      <code>setKey</code>
+      <code>setKey</code>
+      <code>setPreferredEngine</code>
+      <code>setPreferredEngine</code>
+      <code>setPreferredEngine</code>
+      <code>setupKey</code>
+      <code>setupKey</code>
+      <code>setupKey</code>
+    </MixedMethodCall>
+    <MixedReturnStatement occurrences="1"/>
+    <PossiblyNullOperand occurrences="1">
+      <code>$mode</code>
+    </PossiblyNullOperand>
+    <PossiblyUndefinedIntArrayOffset occurrences="24">
+      <code>$this-&gt;des[0]</code>
+      <code>$this-&gt;des[0]</code>
+      <code>$this-&gt;des[0]</code>
+      <code>$this-&gt;des[0]</code>
+      <code>$this-&gt;des[0]</code>
+      <code>$this-&gt;des[0]</code>
+      <code>$this-&gt;des[0]</code>
+      <code>$this-&gt;des[0]</code>
+      <code>$this-&gt;des[1]</code>
+      <code>$this-&gt;des[1]</code>
+      <code>$this-&gt;des[1]</code>
+      <code>$this-&gt;des[1]</code>
+      <code>$this-&gt;des[1]</code>
+      <code>$this-&gt;des[1]</code>
+      <code>$this-&gt;des[1]</code>
+      <code>$this-&gt;des[1]</code>
+      <code>$this-&gt;des[2]</code>
+      <code>$this-&gt;des[2]</code>
+      <code>$this-&gt;des[2]</code>
+      <code>$this-&gt;des[2]</code>
+      <code>$this-&gt;des[2]</code>
+      <code>$this-&gt;des[2]</code>
+      <code>$this-&gt;des[2]</code>
+      <code>$this-&gt;des[2]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>$des</code>
+      <code>$mode_3cbc</code>
+      <code>TripleDES</code>
+      <code>TripleDES</code>
+      <code>TripleDES</code>
+      <code>TripleDES</code>
+      <code>TripleDES</code>
+      <code>TripleDES</code>
+      <code>TripleDES</code>
+      <code>TripleDES</code>
+      <code>TripleDES</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Crypt/Twofish.php">
+    <FalsableReturnStatement occurrences="2"/>
+    <InvalidFalsableReturnType occurrences="2">
+      <code>string</code>
+      <code>string</code>
+    </InvalidFalsableReturnType>
+    <InvalidPropertyAssignmentValue occurrences="1"/>
+    <MixedArgument occurrences="18">
+      <code>$le_longs[1]</code>
+      <code>$le_longs[1]</code>
+      <code>$le_longs[1]</code>
+      <code>$le_longs[2]</code>
+      <code>$le_longs[2]</code>
+      <code>$le_longs[2]</code>
+      <code>$le_longs[3]</code>
+      <code>$le_longs[3]</code>
+      <code>$le_longs[3]</code>
+      <code>$le_longs[4]</code>
+      <code>$le_longs[4]</code>
+      <code>$le_longs[4]</code>
+      <code>$le_longs[5]</code>
+      <code>$le_longs[5]</code>
+      <code>$le_longs[6]</code>
+      <code>$le_longs[6]</code>
+      <code>$le_longs[7]</code>
+      <code>$le_longs[8]</code>
+    </MixedArgument>
+    <MixedArrayOffset occurrences="140">
+      <code>$S0[ $R0        &amp; 0xff]</code>
+      <code>$S0[ $R2        &amp; 0xff]</code>
+      <code>$S0[$R0       &amp; 0xff]</code>
+      <code>$S0[$R1 &gt;&gt; 24 &amp; 0xff]</code>
+      <code>$S0[$R2       &amp; 0xff]</code>
+      <code>$S0[$R3 &gt;&gt; 24 &amp; 0xff]</code>
+      <code>$S0[($R1 &gt;&gt; 24) &amp; 0xff]</code>
+      <code>$S0[($R3 &gt;&gt; 24) &amp; 0xff]</code>
+      <code>$S1[ $R1        &amp; 0xff]</code>
+      <code>$S1[ $R3        &amp; 0xff]</code>
+      <code>$S1[$R0 &gt;&gt;  8 &amp; 0xff]</code>
+      <code>$S1[$R1       &amp; 0xff]</code>
+      <code>$S1[$R2 &gt;&gt;  8 &amp; 0xff]</code>
+      <code>$S1[$R3       &amp; 0xff]</code>
+      <code>$S1[($R0 &gt;&gt;  8) &amp; 0xff]</code>
+      <code>$S1[($R2 &gt;&gt;  8) &amp; 0xff]</code>
+      <code>$S2[$R0 &gt;&gt; 16 &amp; 0xff]</code>
+      <code>$S2[$R1 &gt;&gt;  8 &amp; 0xff]</code>
+      <code>$S2[$R2 &gt;&gt; 16 &amp; 0xff]</code>
+      <code>$S2[$R3 &gt;&gt;  8 &amp; 0xff]</code>
+      <code>$S2[($R0 &gt;&gt; 16) &amp; 0xff]</code>
+      <code>$S2[($R1 &gt;&gt;  8) &amp; 0xff]</code>
+      <code>$S2[($R2 &gt;&gt; 16) &amp; 0xff]</code>
+      <code>$S2[($R3 &gt;&gt;  8) &amp; 0xff]</code>
+      <code>$S3[$R0 &gt;&gt; 24 &amp; 0xff]</code>
+      <code>$S3[$R1 &gt;&gt; 16 &amp; 0xff]</code>
+      <code>$S3[$R2 &gt;&gt; 24 &amp; 0xff]</code>
+      <code>$S3[$R3 &gt;&gt; 16 &amp; 0xff]</code>
+      <code>$S3[($R0 &gt;&gt; 24) &amp; 0xff]</code>
+      <code>$S3[($R1 &gt;&gt; 16) &amp; 0xff]</code>
+      <code>$S3[($R2 &gt;&gt; 24) &amp; 0xff]</code>
+      <code>$S3[($R3 &gt;&gt; 16) &amp; 0xff]</code>
+      <code>$m0[$q0[$q0[$i] ^ $key[ 9]] ^ $key[1]]</code>
+      <code>$m0[$q0[$q0[$i] ^ $s4] ^ $s0]</code>
+      <code>$m0[$q0[$q0[$j] ^ $key[13]] ^ $key[5]]</code>
+      <code>$m0[$q0[$q0[$q1[$i] ^ $key[17]] ^ $key[ 9]] ^ $key[1]]</code>
+      <code>$m0[$q0[$q0[$q1[$i] ^ $s8] ^ $s4] ^ $s0]</code>
+      <code>$m0[$q0[$q0[$q1[$j] ^ $key[21]] ^ $key[13]] ^ $key[5]]</code>
+      <code>$m0[$q0[$q0[$q1[$q1[$i] ^ $key[25]] ^ $key[17]] ^ $key[ 9]] ^ $key[1]]</code>
+      <code>$m0[$q0[$q0[$q1[$q1[$i] ^ $sc] ^ $s8] ^ $s4] ^ $s0]</code>
+      <code>$m0[$q0[$q0[$q1[$q1[$j] ^ $key[29]] ^ $key[21]] ^ $key[13]] ^ $key[5]]</code>
+      <code>$m1[$q0[$q1[$i] ^ $key[10]] ^ $key[2]]</code>
+      <code>$m1[$q0[$q1[$i] ^ $s5] ^ $s1]</code>
+      <code>$m1[$q0[$q1[$j] ^ $key[14]] ^ $key[6]]</code>
+      <code>$m1[$q0[$q1[$q1[$i] ^ $key[18]] ^ $key[10]] ^ $key[2]]</code>
+      <code>$m1[$q0[$q1[$q1[$i] ^ $s9] ^ $s5] ^ $s1]</code>
+      <code>$m1[$q0[$q1[$q1[$j] ^ $key[22]] ^ $key[14]] ^ $key[6]]</code>
+      <code>$m1[$q0[$q1[$q1[$q0[$i] ^ $key[26]] ^ $key[18]] ^ $key[10]] ^ $key[2]]</code>
+      <code>$m1[$q0[$q1[$q1[$q0[$i] ^ $sd] ^ $s9] ^ $s5] ^ $s1]</code>
+      <code>$m1[$q0[$q1[$q1[$q0[$j] ^ $key[30]] ^ $key[22]] ^ $key[14]] ^ $key[6]]</code>
+      <code>$m2[$q1[$q0[$i] ^ $key[11]] ^ $key[3]]</code>
+      <code>$m2[$q1[$q0[$i] ^ $s6] ^ $s2]</code>
+      <code>$m2[$q1[$q0[$j] ^ $key[15]] ^ $key[7]]</code>
+      <code>$m2[$q1[$q0[$q0[$i] ^ $key[19]] ^ $key[11]] ^ $key[3]]</code>
+      <code>$m2[$q1[$q0[$q0[$i] ^ $sa] ^ $s6] ^ $s2]</code>
+      <code>$m2[$q1[$q0[$q0[$j] ^ $key[23]] ^ $key[15]] ^ $key[7]]</code>
+      <code>$m2[$q1[$q0[$q0[$q0[$i] ^ $key[27]] ^ $key[19]] ^ $key[11]] ^ $key[3]]</code>
+      <code>$m2[$q1[$q0[$q0[$q0[$i] ^ $se] ^ $sa] ^ $s6] ^ $s2]</code>
+      <code>$m2[$q1[$q0[$q0[$q0[$j] ^ $key[31]] ^ $key[23]] ^ $key[15]] ^ $key[7]]</code>
+      <code>$m3[$q1[$q1[$i] ^ $key[12]] ^ $key[4]]</code>
+      <code>$m3[$q1[$q1[$i] ^ $s7] ^ $s3]</code>
+      <code>$m3[$q1[$q1[$j] ^ $key[16]] ^ $key[8]]</code>
+      <code>$m3[$q1[$q1[$q0[$i] ^ $key[20]] ^ $key[12]] ^ $key[4]]</code>
+      <code>$m3[$q1[$q1[$q0[$i] ^ $sb] ^ $s7] ^ $s3]</code>
+      <code>$m3[$q1[$q1[$q0[$j] ^ $key[24]] ^ $key[16]] ^ $key[8]]</code>
+      <code>$m3[$q1[$q1[$q0[$q1[$i] ^ $key[28]] ^ $key[20]] ^ $key[12]] ^ $key[4]]</code>
+      <code>$m3[$q1[$q1[$q0[$q1[$i] ^ $sf] ^ $sb] ^ $s7] ^ $s3]</code>
+      <code>$m3[$q1[$q1[$q0[$q1[$j] ^ $key[32]] ^ $key[24]] ^ $key[16]] ^ $key[8]]</code>
+      <code>$q0[$q0[$i] ^ $key[ 9]]</code>
+      <code>$q0[$q0[$i] ^ $key[19]]</code>
+      <code>$q0[$q0[$i] ^ $key[27]]</code>
+      <code>$q0[$q0[$i] ^ $s4]</code>
+      <code>$q0[$q0[$i] ^ $sa]</code>
+      <code>$q0[$q0[$i] ^ $se]</code>
+      <code>$q0[$q0[$j] ^ $key[13]]</code>
+      <code>$q0[$q0[$j] ^ $key[23]]</code>
+      <code>$q0[$q0[$j] ^ $key[31]]</code>
+      <code>$q0[$q0[$q0[$i] ^ $key[27]] ^ $key[19]]</code>
+      <code>$q0[$q0[$q0[$i] ^ $se] ^ $sa]</code>
+      <code>$q0[$q0[$q0[$j] ^ $key[31]] ^ $key[23]]</code>
+      <code>$q0[$q0[$q1[$i] ^ $key[17]] ^ $key[ 9]]</code>
+      <code>$q0[$q0[$q1[$i] ^ $s8] ^ $s4]</code>
+      <code>$q0[$q0[$q1[$j] ^ $key[21]] ^ $key[13]]</code>
+      <code>$q0[$q0[$q1[$q1[$i] ^ $key[25]] ^ $key[17]] ^ $key[ 9]]</code>
+      <code>$q0[$q0[$q1[$q1[$i] ^ $sc] ^ $s8] ^ $s4]</code>
+      <code>$q0[$q0[$q1[$q1[$j] ^ $key[29]] ^ $key[21]] ^ $key[13]]</code>
+      <code>$q0[$q1[$i] ^ $key[10]]</code>
+      <code>$q0[$q1[$i] ^ $key[17]]</code>
+      <code>$q0[$q1[$i] ^ $key[28]]</code>
+      <code>$q0[$q1[$i] ^ $s5]</code>
+      <code>$q0[$q1[$i] ^ $s8]</code>
+      <code>$q0[$q1[$i] ^ $sf]</code>
+      <code>$q0[$q1[$j] ^ $key[14]]</code>
+      <code>$q0[$q1[$j] ^ $key[21]]</code>
+      <code>$q0[$q1[$j] ^ $key[32]]</code>
+      <code>$q0[$q1[$q1[$i] ^ $key[18]] ^ $key[10]]</code>
+      <code>$q0[$q1[$q1[$i] ^ $key[25]] ^ $key[17]]</code>
+      <code>$q0[$q1[$q1[$i] ^ $s9] ^ $s5]</code>
+      <code>$q0[$q1[$q1[$i] ^ $sc] ^ $s8]</code>
+      <code>$q0[$q1[$q1[$j] ^ $key[22]] ^ $key[14]]</code>
+      <code>$q0[$q1[$q1[$j] ^ $key[29]] ^ $key[21]]</code>
+      <code>$q0[$q1[$q1[$q0[$i] ^ $key[26]] ^ $key[18]] ^ $key[10]]</code>
+      <code>$q0[$q1[$q1[$q0[$i] ^ $sd] ^ $s9] ^ $s5]</code>
+      <code>$q0[$q1[$q1[$q0[$j] ^ $key[30]] ^ $key[22]] ^ $key[14]]</code>
+      <code>$q1[$q0[$i] ^ $key[11]]</code>
+      <code>$q1[$q0[$i] ^ $key[20]]</code>
+      <code>$q1[$q0[$i] ^ $key[26]]</code>
+      <code>$q1[$q0[$i] ^ $s6]</code>
+      <code>$q1[$q0[$i] ^ $sb]</code>
+      <code>$q1[$q0[$i] ^ $sd]</code>
+      <code>$q1[$q0[$j] ^ $key[15]]</code>
+      <code>$q1[$q0[$j] ^ $key[24]]</code>
+      <code>$q1[$q0[$j] ^ $key[30]]</code>
+      <code>$q1[$q0[$q0[$i] ^ $key[19]] ^ $key[11]]</code>
+      <code>$q1[$q0[$q0[$i] ^ $sa] ^ $s6]</code>
+      <code>$q1[$q0[$q0[$j] ^ $key[23]] ^ $key[15]]</code>
+      <code>$q1[$q0[$q0[$q0[$i] ^ $key[27]] ^ $key[19]] ^ $key[11]]</code>
+      <code>$q1[$q0[$q0[$q0[$i] ^ $se] ^ $sa] ^ $s6]</code>
+      <code>$q1[$q0[$q0[$q0[$j] ^ $key[31]] ^ $key[23]] ^ $key[15]]</code>
+      <code>$q1[$q0[$q1[$i] ^ $key[28]] ^ $key[20]]</code>
+      <code>$q1[$q0[$q1[$i] ^ $sf] ^ $sb]</code>
+      <code>$q1[$q0[$q1[$j] ^ $key[32]] ^ $key[24]]</code>
+      <code>$q1[$q1[$i] ^ $key[12]]</code>
+      <code>$q1[$q1[$i] ^ $key[18]]</code>
+      <code>$q1[$q1[$i] ^ $key[25]]</code>
+      <code>$q1[$q1[$i] ^ $s7]</code>
+      <code>$q1[$q1[$i] ^ $s9]</code>
+      <code>$q1[$q1[$i] ^ $sc]</code>
+      <code>$q1[$q1[$j] ^ $key[16]]</code>
+      <code>$q1[$q1[$j] ^ $key[22]]</code>
+      <code>$q1[$q1[$j] ^ $key[29]]</code>
+      <code>$q1[$q1[$q0[$i] ^ $key[20]] ^ $key[12]]</code>
+      <code>$q1[$q1[$q0[$i] ^ $key[26]] ^ $key[18]]</code>
+      <code>$q1[$q1[$q0[$i] ^ $sb] ^ $s7]</code>
+      <code>$q1[$q1[$q0[$i] ^ $sd] ^ $s9]</code>
+      <code>$q1[$q1[$q0[$j] ^ $key[24]] ^ $key[16]]</code>
+      <code>$q1[$q1[$q0[$j] ^ $key[30]] ^ $key[22]]</code>
+      <code>$q1[$q1[$q0[$q1[$i] ^ $key[28]] ^ $key[20]] ^ $key[12]]</code>
+      <code>$q1[$q1[$q0[$q1[$i] ^ $sf] ^ $sb] ^ $s7]</code>
+      <code>$q1[$q1[$q0[$q1[$j] ^ $key[32]] ^ $key[24]] ^ $key[16]]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="61">
+      <code>$A</code>
+      <code>$A</code>
+      <code>$A</code>
+      <code>$A</code>
+      <code>$A</code>
+      <code>$A</code>
+      <code>$A</code>
+      <code>$A</code>
+      <code>$A</code>
+      <code>$B</code>
+      <code>$B</code>
+      <code>$B</code>
+      <code>$B</code>
+      <code>$B</code>
+      <code>$B</code>
+      <code>$K[]</code>
+      <code>$K[]</code>
+      <code>$K[]</code>
+      <code>$K[]</code>
+      <code>$K[]</code>
+      <code>$K[]</code>
+      <code>$R0</code>
+      <code>$R0</code>
+      <code>$R0</code>
+      <code>$R0</code>
+      <code>$R0</code>
+      <code>$R1</code>
+      <code>$R1</code>
+      <code>$R1</code>
+      <code>$R1</code>
+      <code>$R1</code>
+      <code>$R2</code>
+      <code>$R2</code>
+      <code>$R2</code>
+      <code>$R2</code>
+      <code>$R2</code>
+      <code>$R3</code>
+      <code>$R3</code>
+      <code>$R3</code>
+      <code>$R3</code>
+      <code>$R3</code>
+      <code>$S0[$i]</code>
+      <code>$S0[$i]</code>
+      <code>$S0[$i]</code>
+      <code>$S1[$i]</code>
+      <code>$S1[$i]</code>
+      <code>$S1[$i]</code>
+      <code>$S2[$i]</code>
+      <code>$S2[$i]</code>
+      <code>$S2[$i]</code>
+      <code>$S3[$i]</code>
+      <code>$S3[$i]</code>
+      <code>$S3[$i]</code>
+      <code>$t0</code>
+      <code>$t0</code>
+      <code>$t0</code>
+      <code>$t0</code>
+      <code>$t1</code>
+      <code>$t1</code>
+      <code>$t1</code>
+      <code>$t1</code>
+    </MixedAssignment>
+    <MixedOperand occurrences="248">
+      <code>$A</code>
+      <code>$A</code>
+      <code>$A</code>
+      <code>$A</code>
+      <code>$A</code>
+      <code>$A</code>
+      <code>$A</code>
+      <code>$A</code>
+      <code>$A</code>
+      <code>$A</code>
+      <code>$A</code>
+      <code>$A</code>
+      <code>$B</code>
+      <code>$B</code>
+      <code>$B</code>
+      <code>$B</code>
+      <code>$B</code>
+      <code>$B</code>
+      <code>$K[++$ki]</code>
+      <code>$K[++$ki]</code>
+      <code>$K[++$ki]</code>
+      <code>$K[++$ki]</code>
+      <code>$K[--$ki]</code>
+      <code>$K[--$ki]</code>
+      <code>$K[--$ki]</code>
+      <code>$K[--$ki]</code>
+      <code>$K[0]</code>
+      <code>$K[0]</code>
+      <code>$K[0]</code>
+      <code>$K[0]</code>
+      <code>$K[1]</code>
+      <code>$K[1]</code>
+      <code>$K[1]</code>
+      <code>$K[1]</code>
+      <code>$K[2]</code>
+      <code>$K[2]</code>
+      <code>$K[2]</code>
+      <code>$K[2]</code>
+      <code>$K[3]</code>
+      <code>$K[3]</code>
+      <code>$K[3]</code>
+      <code>$K[3]</code>
+      <code>$K[4]</code>
+      <code>$K[4]</code>
+      <code>$K[4]</code>
+      <code>$K[4]</code>
+      <code>$K[5]</code>
+      <code>$K[5]</code>
+      <code>$K[5]</code>
+      <code>$K[5]</code>
+      <code>$K[6]</code>
+      <code>$K[6]</code>
+      <code>$K[6]</code>
+      <code>$K[6]</code>
+      <code>$K[7]</code>
+      <code>$K[7]</code>
+      <code>$K[7]</code>
+      <code>$K[7]</code>
+      <code>$R0</code>
+      <code>$R0</code>
+      <code>$R0</code>
+      <code>$R0</code>
+      <code>$R0</code>
+      <code>$R0</code>
+      <code>$R0</code>
+      <code>$R0</code>
+      <code>$R0</code>
+      <code>$R0</code>
+      <code>$R0</code>
+      <code>$R0</code>
+      <code>$R0</code>
+      <code>$R1</code>
+      <code>$R1</code>
+      <code>$R1</code>
+      <code>$R1</code>
+      <code>$R1</code>
+      <code>$R1</code>
+      <code>$R1</code>
+      <code>$R1</code>
+      <code>$R1</code>
+      <code>$R1</code>
+      <code>$R1</code>
+      <code>$R1</code>
+      <code>$R1</code>
+      <code>$R2</code>
+      <code>$R2</code>
+      <code>$R2</code>
+      <code>$R2</code>
+      <code>$R2</code>
+      <code>$R2</code>
+      <code>$R2</code>
+      <code>$R2</code>
+      <code>$R2</code>
+      <code>$R2</code>
+      <code>$R2</code>
+      <code>$R2</code>
+      <code>$R2</code>
+      <code>$R3</code>
+      <code>$R3</code>
+      <code>$R3</code>
+      <code>$R3</code>
+      <code>$R3</code>
+      <code>$R3</code>
+      <code>$R3</code>
+      <code>$R3</code>
+      <code>$R3</code>
+      <code>$R3</code>
+      <code>$R3</code>
+      <code>$R3</code>
+      <code>$R3</code>
+      <code>$S0[ $R0        &amp; 0xff]</code>
+      <code>$S0[ $R2        &amp; 0xff]</code>
+      <code>$S0[$R0       &amp; 0xff]</code>
+      <code>$S0[$R1 &gt;&gt; 24 &amp; 0xff]</code>
+      <code>$S0[$R2       &amp; 0xff]</code>
+      <code>$S0[$R3 &gt;&gt; 24 &amp; 0xff]</code>
+      <code>$S0[($R1 &gt;&gt; 24) &amp; 0xff]</code>
+      <code>$S0[($R3 &gt;&gt; 24) &amp; 0xff]</code>
+      <code>$m0[$q0[$q0[$i] ^ $key[ 9]] ^ $key[1]]</code>
+      <code>$m0[$q0[$q0[$j] ^ $key[13]] ^ $key[5]]</code>
+      <code>$m0[$q0[$q0[$q1[$i] ^ $key[17]] ^ $key[ 9]] ^ $key[1]]</code>
+      <code>$m0[$q0[$q0[$q1[$j] ^ $key[21]] ^ $key[13]] ^ $key[5]]</code>
+      <code>$m0[$q0[$q0[$q1[$q1[$i] ^ $key[25]] ^ $key[17]] ^ $key[ 9]] ^ $key[1]]</code>
+      <code>$m0[$q0[$q0[$q1[$q1[$j] ^ $key[29]] ^ $key[21]] ^ $key[13]] ^ $key[5]]</code>
+      <code>$q0[$i]</code>
+      <code>$q0[$i]</code>
+      <code>$q0[$i]</code>
+      <code>$q0[$i]</code>
+      <code>$q0[$i]</code>
+      <code>$q0[$i]</code>
+      <code>$q0[$i]</code>
+      <code>$q0[$i]</code>
+      <code>$q0[$i]</code>
+      <code>$q0[$i]</code>
+      <code>$q0[$i]</code>
+      <code>$q0[$i]</code>
+      <code>$q0[$j]</code>
+      <code>$q0[$j]</code>
+      <code>$q0[$j]</code>
+      <code>$q0[$j]</code>
+      <code>$q0[$j]</code>
+      <code>$q0[$j]</code>
+      <code>$q0[$q0[$i] ^ $key[ 9]]</code>
+      <code>$q0[$q0[$i] ^ $key[19]]</code>
+      <code>$q0[$q0[$i] ^ $key[27]]</code>
+      <code>$q0[$q0[$i] ^ $s4]</code>
+      <code>$q0[$q0[$i] ^ $sa]</code>
+      <code>$q0[$q0[$i] ^ $se]</code>
+      <code>$q0[$q0[$j] ^ $key[13]]</code>
+      <code>$q0[$q0[$j] ^ $key[23]]</code>
+      <code>$q0[$q0[$j] ^ $key[31]]</code>
+      <code>$q0[$q0[$q0[$i] ^ $key[27]] ^ $key[19]]</code>
+      <code>$q0[$q0[$q0[$i] ^ $se] ^ $sa]</code>
+      <code>$q0[$q0[$q0[$j] ^ $key[31]] ^ $key[23]]</code>
+      <code>$q0[$q0[$q1[$i] ^ $key[17]] ^ $key[ 9]]</code>
+      <code>$q0[$q0[$q1[$i] ^ $s8] ^ $s4]</code>
+      <code>$q0[$q0[$q1[$j] ^ $key[21]] ^ $key[13]]</code>
+      <code>$q0[$q0[$q1[$q1[$i] ^ $key[25]] ^ $key[17]] ^ $key[ 9]]</code>
+      <code>$q0[$q0[$q1[$q1[$i] ^ $sc] ^ $s8] ^ $s4]</code>
+      <code>$q0[$q0[$q1[$q1[$j] ^ $key[29]] ^ $key[21]] ^ $key[13]]</code>
+      <code>$q0[$q1[$i] ^ $key[10]]</code>
+      <code>$q0[$q1[$i] ^ $key[17]]</code>
+      <code>$q0[$q1[$i] ^ $key[28]]</code>
+      <code>$q0[$q1[$i] ^ $s5]</code>
+      <code>$q0[$q1[$i] ^ $s8]</code>
+      <code>$q0[$q1[$i] ^ $sf]</code>
+      <code>$q0[$q1[$j] ^ $key[14]]</code>
+      <code>$q0[$q1[$j] ^ $key[21]]</code>
+      <code>$q0[$q1[$j] ^ $key[32]]</code>
+      <code>$q0[$q1[$q1[$i] ^ $key[18]] ^ $key[10]]</code>
+      <code>$q0[$q1[$q1[$i] ^ $key[25]] ^ $key[17]]</code>
+      <code>$q0[$q1[$q1[$i] ^ $s9] ^ $s5]</code>
+      <code>$q0[$q1[$q1[$i] ^ $sc] ^ $s8]</code>
+      <code>$q0[$q1[$q1[$j] ^ $key[22]] ^ $key[14]]</code>
+      <code>$q0[$q1[$q1[$j] ^ $key[29]] ^ $key[21]]</code>
+      <code>$q0[$q1[$q1[$q0[$i] ^ $key[26]] ^ $key[18]] ^ $key[10]]</code>
+      <code>$q0[$q1[$q1[$q0[$i] ^ $sd] ^ $s9] ^ $s5]</code>
+      <code>$q0[$q1[$q1[$q0[$j] ^ $key[30]] ^ $key[22]] ^ $key[14]]</code>
+      <code>$q1[$i]</code>
+      <code>$q1[$i]</code>
+      <code>$q1[$i]</code>
+      <code>$q1[$i]</code>
+      <code>$q1[$i]</code>
+      <code>$q1[$i]</code>
+      <code>$q1[$i]</code>
+      <code>$q1[$i]</code>
+      <code>$q1[$i]</code>
+      <code>$q1[$i]</code>
+      <code>$q1[$i]</code>
+      <code>$q1[$i]</code>
+      <code>$q1[$j]</code>
+      <code>$q1[$j]</code>
+      <code>$q1[$j]</code>
+      <code>$q1[$j]</code>
+      <code>$q1[$j]</code>
+      <code>$q1[$j]</code>
+      <code>$q1[$q0[$i] ^ $key[11]]</code>
+      <code>$q1[$q0[$i] ^ $key[20]]</code>
+      <code>$q1[$q0[$i] ^ $key[26]]</code>
+      <code>$q1[$q0[$i] ^ $s6]</code>
+      <code>$q1[$q0[$i] ^ $sb]</code>
+      <code>$q1[$q0[$i] ^ $sd]</code>
+      <code>$q1[$q0[$j] ^ $key[15]]</code>
+      <code>$q1[$q0[$j] ^ $key[24]]</code>
+      <code>$q1[$q0[$j] ^ $key[30]]</code>
+      <code>$q1[$q0[$q0[$i] ^ $key[19]] ^ $key[11]]</code>
+      <code>$q1[$q0[$q0[$i] ^ $sa] ^ $s6]</code>
+      <code>$q1[$q0[$q0[$j] ^ $key[23]] ^ $key[15]]</code>
+      <code>$q1[$q0[$q0[$q0[$i] ^ $key[27]] ^ $key[19]] ^ $key[11]]</code>
+      <code>$q1[$q0[$q0[$q0[$i] ^ $se] ^ $sa] ^ $s6]</code>
+      <code>$q1[$q0[$q0[$q0[$j] ^ $key[31]] ^ $key[23]] ^ $key[15]]</code>
+      <code>$q1[$q0[$q1[$i] ^ $key[28]] ^ $key[20]]</code>
+      <code>$q1[$q0[$q1[$i] ^ $sf] ^ $sb]</code>
+      <code>$q1[$q0[$q1[$j] ^ $key[32]] ^ $key[24]]</code>
+      <code>$q1[$q1[$i] ^ $key[12]]</code>
+      <code>$q1[$q1[$i] ^ $key[18]]</code>
+      <code>$q1[$q1[$i] ^ $key[25]]</code>
+      <code>$q1[$q1[$i] ^ $s7]</code>
+      <code>$q1[$q1[$i] ^ $s9]</code>
+      <code>$q1[$q1[$i] ^ $sc]</code>
+      <code>$q1[$q1[$j] ^ $key[16]]</code>
+      <code>$q1[$q1[$j] ^ $key[22]]</code>
+      <code>$q1[$q1[$j] ^ $key[29]]</code>
+      <code>$q1[$q1[$q0[$i] ^ $key[20]] ^ $key[12]]</code>
+      <code>$q1[$q1[$q0[$i] ^ $key[26]] ^ $key[18]]</code>
+      <code>$q1[$q1[$q0[$i] ^ $sb] ^ $s7]</code>
+      <code>$q1[$q1[$q0[$i] ^ $sd] ^ $s9]</code>
+      <code>$q1[$q1[$q0[$j] ^ $key[24]] ^ $key[16]]</code>
+      <code>$q1[$q1[$q0[$j] ^ $key[30]] ^ $key[22]]</code>
+      <code>$q1[$q1[$q0[$q1[$i] ^ $key[28]] ^ $key[20]] ^ $key[12]]</code>
+      <code>$q1[$q1[$q0[$q1[$i] ^ $sf] ^ $sb] ^ $s7]</code>
+      <code>$q1[$q1[$q0[$q1[$j] ^ $key[32]] ^ $key[24]] ^ $key[16]]</code>
+      <code>$t0</code>
+      <code>$t0</code>
+      <code>$t0</code>
+      <code>$t0</code>
+      <code>$t0</code>
+      <code>$t0</code>
+      <code>$t0</code>
+      <code>$t0</code>
+      <code>$t1</code>
+      <code>$t1</code>
+      <code>$t1</code>
+      <code>$t1</code>
+      <code>($R1 &gt;&gt; 31) &amp; 1</code>
+      <code>($R3 &gt;&gt; 31) &amp; 1</code>
+      <code>(($R1 &gt;&gt; 31) &amp; 1) | ($R1 &lt;&lt; 1)</code>
+      <code>(($R3 &gt;&gt; 31) &amp; 1) | ($R3 &lt;&lt; 1)</code>
+    </MixedOperand>
+    <PossiblyInvalidArrayAccess occurrences="98">
+      <code>$in[1]</code>
+      <code>$in[1]</code>
+      <code>$in[2]</code>
+      <code>$in[2]</code>
+      <code>$in[3]</code>
+      <code>$in[3]</code>
+      <code>$in[4]</code>
+      <code>$in[4]</code>
+      <code>$key[ 9]</code>
+      <code>$key[ 9]</code>
+      <code>$key[ 9]</code>
+      <code>$key[10]</code>
+      <code>$key[10]</code>
+      <code>$key[10]</code>
+      <code>$key[11]</code>
+      <code>$key[11]</code>
+      <code>$key[11]</code>
+      <code>$key[12]</code>
+      <code>$key[12]</code>
+      <code>$key[12]</code>
+      <code>$key[13]</code>
+      <code>$key[13]</code>
+      <code>$key[13]</code>
+      <code>$key[14]</code>
+      <code>$key[14]</code>
+      <code>$key[14]</code>
+      <code>$key[15]</code>
+      <code>$key[15]</code>
+      <code>$key[15]</code>
+      <code>$key[16]</code>
+      <code>$key[16]</code>
+      <code>$key[16]</code>
+      <code>$key[17]</code>
+      <code>$key[17]</code>
+      <code>$key[18]</code>
+      <code>$key[18]</code>
+      <code>$key[19]</code>
+      <code>$key[19]</code>
+      <code>$key[1]</code>
+      <code>$key[1]</code>
+      <code>$key[1]</code>
+      <code>$key[20]</code>
+      <code>$key[20]</code>
+      <code>$key[21]</code>
+      <code>$key[21]</code>
+      <code>$key[22]</code>
+      <code>$key[22]</code>
+      <code>$key[23]</code>
+      <code>$key[23]</code>
+      <code>$key[24]</code>
+      <code>$key[24]</code>
+      <code>$key[25]</code>
+      <code>$key[26]</code>
+      <code>$key[27]</code>
+      <code>$key[28]</code>
+      <code>$key[29]</code>
+      <code>$key[2]</code>
+      <code>$key[2]</code>
+      <code>$key[2]</code>
+      <code>$key[30]</code>
+      <code>$key[31]</code>
+      <code>$key[32]</code>
+      <code>$key[3]</code>
+      <code>$key[3]</code>
+      <code>$key[3]</code>
+      <code>$key[4]</code>
+      <code>$key[4]</code>
+      <code>$key[4]</code>
+      <code>$key[5]</code>
+      <code>$key[5]</code>
+      <code>$key[5]</code>
+      <code>$key[6]</code>
+      <code>$key[6]</code>
+      <code>$key[6]</code>
+      <code>$key[7]</code>
+      <code>$key[7]</code>
+      <code>$key[7]</code>
+      <code>$key[8]</code>
+      <code>$key[8]</code>
+      <code>$key[8]</code>
+      <code>$le_longs[1]</code>
+      <code>$le_longs[1]</code>
+      <code>$le_longs[1]</code>
+      <code>$le_longs[2]</code>
+      <code>$le_longs[2]</code>
+      <code>$le_longs[2]</code>
+      <code>$le_longs[3]</code>
+      <code>$le_longs[3]</code>
+      <code>$le_longs[3]</code>
+      <code>$le_longs[4]</code>
+      <code>$le_longs[4]</code>
+      <code>$le_longs[4]</code>
+      <code>$le_longs[5]</code>
+      <code>$le_longs[5]</code>
+      <code>$le_longs[6]</code>
+      <code>$le_longs[6]</code>
+      <code>$le_longs[7]</code>
+      <code>$le_longs[8]</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyUndefinedIntArrayOffset occurrences="123">
+      <code>$K[0]</code>
+      <code>$K[0]</code>
+      <code>$K[0]</code>
+      <code>$K[1]</code>
+      <code>$K[1]</code>
+      <code>$K[1]</code>
+      <code>$K[2]</code>
+      <code>$K[2]</code>
+      <code>$K[2]</code>
+      <code>$K[3]</code>
+      <code>$K[3]</code>
+      <code>$K[3]</code>
+      <code>$K[4]</code>
+      <code>$K[4]</code>
+      <code>$K[4]</code>
+      <code>$K[5]</code>
+      <code>$K[5]</code>
+      <code>$K[5]</code>
+      <code>$K[6]</code>
+      <code>$K[6]</code>
+      <code>$K[6]</code>
+      <code>$K[7]</code>
+      <code>$K[7]</code>
+      <code>$K[7]</code>
+      <code>$in[1]</code>
+      <code>$in[1]</code>
+      <code>$in[2]</code>
+      <code>$in[2]</code>
+      <code>$in[3]</code>
+      <code>$in[3]</code>
+      <code>$in[4]</code>
+      <code>$in[4]</code>
+      <code>$key[ 9]</code>
+      <code>$key[ 9]</code>
+      <code>$key[ 9]</code>
+      <code>$key[10]</code>
+      <code>$key[10]</code>
+      <code>$key[10]</code>
+      <code>$key[11]</code>
+      <code>$key[11]</code>
+      <code>$key[11]</code>
+      <code>$key[12]</code>
+      <code>$key[12]</code>
+      <code>$key[12]</code>
+      <code>$key[13]</code>
+      <code>$key[13]</code>
+      <code>$key[13]</code>
+      <code>$key[14]</code>
+      <code>$key[14]</code>
+      <code>$key[14]</code>
+      <code>$key[15]</code>
+      <code>$key[15]</code>
+      <code>$key[15]</code>
+      <code>$key[16]</code>
+      <code>$key[16]</code>
+      <code>$key[16]</code>
+      <code>$key[17]</code>
+      <code>$key[17]</code>
+      <code>$key[18]</code>
+      <code>$key[18]</code>
+      <code>$key[19]</code>
+      <code>$key[19]</code>
+      <code>$key[1]</code>
+      <code>$key[1]</code>
+      <code>$key[1]</code>
+      <code>$key[20]</code>
+      <code>$key[20]</code>
+      <code>$key[21]</code>
+      <code>$key[21]</code>
+      <code>$key[22]</code>
+      <code>$key[22]</code>
+      <code>$key[23]</code>
+      <code>$key[23]</code>
+      <code>$key[24]</code>
+      <code>$key[24]</code>
+      <code>$key[25]</code>
+      <code>$key[26]</code>
+      <code>$key[27]</code>
+      <code>$key[28]</code>
+      <code>$key[29]</code>
+      <code>$key[2]</code>
+      <code>$key[2]</code>
+      <code>$key[2]</code>
+      <code>$key[30]</code>
+      <code>$key[31]</code>
+      <code>$key[32]</code>
+      <code>$key[3]</code>
+      <code>$key[3]</code>
+      <code>$key[3]</code>
+      <code>$key[4]</code>
+      <code>$key[4]</code>
+      <code>$key[4]</code>
+      <code>$key[5]</code>
+      <code>$key[5]</code>
+      <code>$key[5]</code>
+      <code>$key[6]</code>
+      <code>$key[6]</code>
+      <code>$key[6]</code>
+      <code>$key[7]</code>
+      <code>$key[7]</code>
+      <code>$key[7]</code>
+      <code>$key[8]</code>
+      <code>$key[8]</code>
+      <code>$key[8]</code>
+      <code>$le_longs[1]</code>
+      <code>$le_longs[1]</code>
+      <code>$le_longs[1]</code>
+      <code>$le_longs[2]</code>
+      <code>$le_longs[2]</code>
+      <code>$le_longs[2]</code>
+      <code>$le_longs[3]</code>
+      <code>$le_longs[3]</code>
+      <code>$le_longs[3]</code>
+      <code>$le_longs[4]</code>
+      <code>$le_longs[4]</code>
+      <code>$le_longs[4]</code>
+      <code>$le_longs[5]</code>
+      <code>$le_longs[5]</code>
+      <code>$le_longs[6]</code>
+      <code>$le_longs[6]</code>
+      <code>$le_longs[7]</code>
+      <code>$le_longs[8]</code>
+      <code>self::$m3[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUnusedMethod occurrences="1">
+      <code>setupInlineCrypt</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedProperty occurrences="1">
+      <code>$key_length</code>
+    </PossiblyUnusedProperty>
+    <PropertyNotSetInConstructor occurrences="10">
+      <code>$kl</code>
+      <code>Twofish</code>
+      <code>Twofish</code>
+      <code>Twofish</code>
+      <code>Twofish</code>
+      <code>Twofish</code>
+      <code>Twofish</code>
+      <code>Twofish</code>
+      <code>Twofish</code>
+      <code>Twofish</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/File/ANSI.php">
+    <ArgumentTypeCoercion occurrences="1">
+      <code>$this-&gt;base_attr_cell</code>
+    </ArgumentTypeCoercion>
+    <InvalidOperand occurrences="3">
+      <code>$match[1]</code>
+      <code>$match[1]</code>
+      <code>$match[2]</code>
+    </InvalidOperand>
+    <InvalidScalarArgument occurrences="3">
+      <code>$this-&gt;attrs[$this-&gt;y]</code>
+      <code>$this-&gt;x</code>
+      <code>$this-&gt;x</code>
+    </InvalidScalarArgument>
+    <MixedArgument occurrences="7">
+      <code>$cur_attr</code>
+      <code>$cur_attr</code>
+      <code>$last_attr</code>
+      <code>$last_attr</code>
+      <code>$last_attr</code>
+      <code>$this-&gt;attrs[$this-&gt;y]</code>
+      <code>$this-&gt;history[$i][$j] ?? ''</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="4">
+      <code>$this-&gt;attrs[$i][$j]</code>
+      <code>$this-&gt;attrs[$i][$j]</code>
+      <code>$this-&gt;history_attrs[$i][$j]</code>
+      <code>$this-&gt;history_attrs[$i][$j]</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="2">
+      <code>$this-&gt;attrs[$this-&gt;y][$this-&gt;x]</code>
+      <code>$this-&gt;attrs[$this-&gt;y][$this-&gt;x]</code>
+    </MixedArrayAssignment>
+    <MixedAssignment occurrences="8">
+      <code>$back</code>
+      <code>$cur_attr</code>
+      <code>$cur_attr</code>
+      <code>$front</code>
+      <code>$last_attr</code>
+      <code>$last_attr</code>
+      <code>$temp</code>
+      <code>$this-&gt;base_attr_cell</code>
+    </MixedAssignment>
+    <MixedOperand occurrences="2">
+      <code>$cur_attr-&gt;background</code>
+      <code>$cur_attr-&gt;foreground</code>
+    </MixedOperand>
+    <PossiblyInvalidArgument occurrences="7">
+      <code>$this-&gt;max_x - $this-&gt;x</code>
+      <code>$this-&gt;max_x - ($this-&gt;x - 1)</code>
+      <code>$this-&gt;x</code>
+      <code>$this-&gt;x</code>
+      <code>$this-&gt;x</code>
+      <code>$this-&gt;x</code>
+      <code>$this-&gt;x + 1</code>
+    </PossiblyInvalidArgument>
+    <PossiblyInvalidPropertyAssignmentValue occurrences="9">
+      <code>$match[2] - 1</code>
+      <code>$this-&gt;x</code>
+      <code>$this-&gt;x</code>
+      <code>$this-&gt;x</code>
+      <code>$this-&gt;x</code>
+      <code>$this-&gt;x</code>
+      <code>$this-&gt;x</code>
+      <code>$this-&gt;x += $match[1]</code>
+      <code>$this-&gt;x -= $match[1]</code>
+    </PossiblyInvalidPropertyAssignmentValue>
+    <PossiblyUndefinedIntArrayOffset occurrences="6">
+      <code>$match[1]</code>
+      <code>$match[1]</code>
+      <code>$match[1]</code>
+      <code>$match[1]</code>
+      <code>$match[1]</code>
+      <code>$match[2]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUnusedMethod occurrences="2">
+      <code>getHistory</code>
+      <code>loadString</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedReturnValue occurrences="1">
+      <code>ANSI</code>
+    </PossiblyUnusedReturnValue>
+    <PropertyNotSetInConstructor occurrences="14">
+      <code>$ansi</code>
+      <code>$attr_row</code>
+      <code>$attrs</code>
+      <code>$history</code>
+      <code>$history_attrs</code>
+      <code>$max_history</code>
+      <code>$max_x</code>
+      <code>$max_y</code>
+      <code>$old_x</code>
+      <code>$old_y</code>
+      <code>$screen</code>
+      <code>$tokenization</code>
+      <code>$x</code>
+      <code>$y</code>
+    </PropertyNotSetInConstructor>
+    <PropertyTypeCoercion occurrences="5">
+      <code>$this-&gt;screen</code>
+      <code>$this-&gt;screen</code>
+      <code>$this-&gt;screen</code>
+      <code>$this-&gt;screen</code>
+      <code>$this-&gt;screen</code>
+    </PropertyTypeCoercion>
+    <UnusedProperty occurrences="1">
+      <code>$old_x</code>
+    </UnusedProperty>
+  </file>
+  <file src="../phpseclib/File/ASN1.php">
+    <DocblockTypeContradiction occurrences="4">
+      <code>$current['content'] === false</code>
+      <code>$temp === false</code>
+      <code>$temp === false</code>
+      <code>$temp === false</code>
+    </DocblockTypeContradiction>
+    <FalsableReturnStatement occurrences="14">
+      <code>$temp</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>pack('Ca*', 0x80 | strlen($temp), $temp)</code>
+    </FalsableReturnStatement>
+    <ImplicitToStringCast occurrences="1">
+      <code>$source</code>
+    </ImplicitToStringCast>
+    <InvalidFalsableReturnType occurrences="4">
+      <code>string</code>
+      <code>string</code>
+      <code>string</code>
+      <code>string</code>
+    </InvalidFalsableReturnType>
+    <InvalidScalarArgument occurrences="4">
+      <code>$source</code>
+      <code>$source</code>
+      <code>$source</code>
+      <code>$source</code>
+    </InvalidScalarArgument>
+    <MismatchingDocblockParamType occurrences="1">
+      <code>array|bool</code>
+    </MismatchingDocblockParamType>
+    <MixedArgument occurrences="82">
+      <code>$child</code>
+      <code>$child</code>
+      <code>$child</code>
+      <code>$child</code>
+      <code>$child</code>
+      <code>$child</code>
+      <code>$child</code>
+      <code>$content</code>
+      <code>$content</code>
+      <code>$content</code>
+      <code>$content_pos</code>
+      <code>$content_pos</code>
+      <code>$content_pos</code>
+      <code>$content_pos</code>
+      <code>$content_pos</code>
+      <code>$content_pos + $length</code>
+      <code>$decoded</code>
+      <code>$decoded</code>
+      <code>$decoded</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content'][$i]</code>
+      <code>$decoded['content'][0]</code>
+      <code>$decoded['length']</code>
+      <code>$decoded['start']</code>
+      <code>$decoded['type']</code>
+      <code>$eighty</code>
+      <code>$encoded</code>
+      <code>$encoded_pos</code>
+      <code>$filters + $mapping</code>
+      <code>$forty</code>
+      <code>$intype</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$length + $start</code>
+      <code>$mapping['mapping']</code>
+      <code>$mapping['mapping']</code>
+      <code>$mapping['mapping']</code>
+      <code>$mapping['mapping']</code>
+      <code>$mapping['mapping']</code>
+      <code>$mapping['mapping']</code>
+      <code>$mapping['mapping']</code>
+      <code>$mask</code>
+      <code>$offset</code>
+      <code>$oid</code>
+      <code>$option</code>
+      <code>$option</code>
+      <code>$size + $offset + 1</code>
+      <code>$source</code>
+      <code>$source</code>
+      <code>$source</code>
+      <code>$source</code>
+      <code>$source</code>
+      <code>$source[$key]</code>
+      <code>$source[$key]</code>
+      <code>$source[$typename]</code>
+      <code>$start</code>
+      <code>$start</code>
+      <code>$start + $offset</code>
+      <code>$tag</code>
+      <code>$tag</code>
+      <code>$tag</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp[$i]['content']</code>
+      <code>$temp[$i]['content']</code>
+      <code>$temp[0]</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$zero</code>
+      <code>($mapping['class'] &lt;&lt; 6) | ($tag &amp; 0x20) | $mapping['cast']</code>
+      <code>(self::CLASS_CONTEXT_SPECIFIC &lt;&lt; 6) | (ord($temp[0]) &amp; 0x20) | $child['constant']</code>
+      <code>(self::CLASS_CONTEXT_SPECIFIC &lt;&lt; 6) | (ord($temp[0]) &amp; 0x20) | $child['constant']</code>
+      <code>(self::CLASS_CONTEXT_SPECIFIC &lt;&lt; 6) | 0x20 | $child['constant']</code>
+      <code>(self::CLASS_CONTEXT_SPECIFIC &lt;&lt; 6) | 0x20 | $child['constant']</code>
+      <code>self::$encoded[$decoded['start']]</code>
+    </MixedArgument>
+    <MixedArgumentTypeCoercion occurrences="2">
+      <code>$loc</code>
+      <code>self::$location</code>
+    </MixedArgumentTypeCoercion>
+    <MixedArrayAccess occurrences="60">
+      <code>$child['cast']</code>
+      <code>$child['cast']</code>
+      <code>$child['class']</code>
+      <code>$child['class']</code>
+      <code>$child['constant']</code>
+      <code>$child['constant']</code>
+      <code>$child['default']</code>
+      <code>$child['default']</code>
+      <code>$child['type']</code>
+      <code>$child['type']</code>
+      <code>$child['type']</code>
+      <code>$child['type']</code>
+      <code>$current['content']</code>
+      <code>$current['content']</code>
+      <code>$current['start']</code>
+      <code>$current['start']</code>
+      <code>$current['start']</code>
+      <code>$decoded['constant']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content'][$i]</code>
+      <code>$decoded['content'][$i]</code>
+      <code>$decoded['content'][0]['content']</code>
+      <code>$decoded['length']</code>
+      <code>$decoded['start']</code>
+      <code>$decoded['start']</code>
+      <code>$decoded['type']</code>
+      <code>$decoded['type']</code>
+      <code>$decoded['type']</code>
+      <code>$decoded['type']</code>
+      <code>$decoded['type']</code>
+      <code>$decoded['type']</code>
+      <code>$decoded['type']</code>
+      <code>$filters[$part]</code>
+      <code>$mapping['mapping'][$i]</code>
+      <code>$mapping['mapping'][$temp]</code>
+      <code>$option['type']</code>
+      <code>$option['type']</code>
+      <code>$temp[$i]['content']</code>
+      <code>$temp[$i]['content']</code>
+      <code>$temp[$i]['type']</code>
+      <code>$temp[$last]['content']</code>
+      <code>$temp[$last]['type']</code>
+      <code>$temp['constant']</code>
+      <code>$temp['type']</code>
+      <code>$temp['type']</code>
+      <code>$temp['type']</code>
+      <code>$temp['type']</code>
+      <code>$temp[0]</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="16">
+      <code>$current['content']</code>
+      <code>$current['content']</code>
+      <code>$current['content']</code>
+      <code>$current['content']</code>
+      <code>$current['content']</code>
+      <code>$current['content']</code>
+      <code>$current['content']</code>
+      <code>$current['content']</code>
+      <code>$current['content']</code>
+      <code>$current['content']</code>
+      <code>$current['content']</code>
+      <code>$current['content']</code>
+      <code>$current['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['type']</code>
+    </MixedArrayAssignment>
+    <MixedArrayOffset occurrences="17">
+      <code>$bits[$i]</code>
+      <code>$filters[$part]</code>
+      <code>$filters[$part]</code>
+      <code>$map[$key]</code>
+      <code>$map[$key]</code>
+      <code>$map[$key]</code>
+      <code>$map[$key]</code>
+      <code>$map[$key]</code>
+      <code>$map[$key]</code>
+      <code>$source[$key]</code>
+      <code>$special[$key]</code>
+      <code>$special[$key]</code>
+      <code>$special[$key]</code>
+      <code>[$key =&gt; $value]</code>
+      <code>self::$encoded[$decoded['start']]</code>
+      <code>self::$oids[$decoded['content']]</code>
+      <code>self::ANY_MAP[$intype]</code>
+    </MixedArrayOffset>
+    <MixedArrayTypeCoercion occurrences="2">
+      <code>$bits[$i]</code>
+      <code>$filters[$part]</code>
+    </MixedArrayTypeCoercion>
+    <MixedAssignment occurrences="74">
+      <code>$candidate</code>
+      <code>$candidate</code>
+      <code>$child</code>
+      <code>$child</code>
+      <code>$child</code>
+      <code>$child</code>
+      <code>$child</code>
+      <code>$child</code>
+      <code>$child</code>
+      <code>$child</code>
+      <code>$childClass</code>
+      <code>$childClass</code>
+      <code>$class</code>
+      <code>$constant</code>
+      <code>$constant</code>
+      <code>$constant</code>
+      <code>$constant</code>
+      <code>$content</code>
+      <code>$content</code>
+      <code>$content</code>
+      <code>$content_pos</code>
+      <code>$content_pos</code>
+      <code>$content_pos</code>
+      <code>$current</code>
+      <code>$decoded</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['type']</code>
+      <code>$filters</code>
+      <code>$i</code>
+      <code>$i</code>
+      <code>$intype</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$length</code>
+      <code>$length</code>
+      <code>$length</code>
+      <code>$length</code>
+      <code>$length</code>
+      <code>$map[$key]</code>
+      <code>$map[$key]</code>
+      <code>$map[$key]</code>
+      <code>$map[$key]</code>
+      <code>$offset</code>
+      <code>$offset</code>
+      <code>$offset</code>
+      <code>$oid</code>
+      <code>$option</code>
+      <code>$part</code>
+      <code>$remainingLength</code>
+      <code>$size</code>
+      <code>$source</code>
+      <code>$start</code>
+      <code>$start</code>
+      <code>$start</code>
+      <code>$tag</code>
+      <code>$tag</code>
+      <code>$tag</code>
+      <code>$tag</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$tempClass</code>
+      <code>$tempClass</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$values[]</code>
+    </MixedAssignment>
+    <MixedFunctionCall occurrences="4">
+      <code>$special[$idx]($source)</code>
+      <code>$special[$key]($candidate)</code>
+      <code>$special[$key]($candidate)</code>
+      <code>$special[$key]($value)</code>
+    </MixedFunctionCall>
+    <MixedInferredReturnType occurrences="4">
+      <code>array|bool</code>
+      <code>array|bool|Element|string|null</code>
+      <code>int</code>
+      <code>string</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="3">
+      <code>format</code>
+      <code>toBytes</code>
+      <code>toString</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="50">
+      <code>$child['constant']</code>
+      <code>$child['constant']</code>
+      <code>$child['constant']</code>
+      <code>$child['constant']</code>
+      <code>$current</code>
+      <code>$current</code>
+      <code>$current</code>
+      <code>$current</code>
+      <code>$current['content']</code>
+      <code>$encoded_pos</code>
+      <code>$filters</code>
+      <code>$i</code>
+      <code>$length</code>
+      <code>$length</code>
+      <code>$length</code>
+      <code>$length</code>
+      <code>$length</code>
+      <code>$length</code>
+      <code>$length</code>
+      <code>$length + $start</code>
+      <code>$mapping['class']</code>
+      <code>$mapping['class']</code>
+      <code>$mapping['class']</code>
+      <code>$mapping['min']</code>
+      <code>$offset</code>
+      <code>$offset</code>
+      <code>$offset</code>
+      <code>$remainingLength</code>
+      <code>$size</code>
+      <code>$size</code>
+      <code>$size + $offset</code>
+      <code>$start</code>
+      <code>$start</code>
+      <code>$start</code>
+      <code>$start</code>
+      <code>$tag</code>
+      <code>$tag</code>
+      <code>$temp[$last]['content'][0]</code>
+      <code>$temp['content']</code>
+      <code>$temp['length']</code>
+      <code>$temp['length']</code>
+      <code>$temp['length']</code>
+      <code>$temp['length']</code>
+      <code>$type</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>($mapping['class'] &lt;&lt; 6) | ($tag &amp; 0x20)</code>
+      <code>($mapping['class'] &lt;&lt; 6) | (ord($temp[0]) &amp; 0x20)</code>
+      <code>($mapping['class'] &lt;&lt; 6) | 0x20</code>
+      <code>($size + 1) &amp; 7</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="11">
+      <code>$current + ['length' =&gt; $start - $current['start']]</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content'] ? $decoded['content']-&gt;format(self::$format) : false</code>
+      <code>$length</code>
+      <code>$temp</code>
+      <code>self::$oids[$decoded['content']] ?? $decoded['content']</code>
+      <code>self::$reverseOIDs[$name] ?? $name</code>
+    </MixedReturnStatement>
+    <PossiblyFalseArgument occurrences="2">
+      <code>pack('N', $length)</code>
+      <code>unpack('Nlength', substr(str_pad($temp, 4, chr(0), STR_PAD_LEFT), -4))</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalseReference occurrences="1">
+      <code>format</code>
+    </PossiblyFalseReference>
+    <PossiblyInvalidArgument occurrences="7">
+      <code>$source</code>
+      <code>$source</code>
+      <code>$source</code>
+      <code>$source</code>
+      <code>$temp</code>
+      <code>$value</code>
+      <code>bindec($byte)</code>
+    </PossiblyInvalidArgument>
+    <PossiblyInvalidArrayAccess occurrences="12">
+      <code>$decoded['content']</code>
+      <code>$length</code>
+      <code>$temp[$i]</code>
+      <code>$temp[$i]</code>
+      <code>$temp[$i]</code>
+      <code>$temp[$last]</code>
+      <code>$temp[$last]</code>
+      <code>$temp['content']</code>
+      <code>$temp['length']</code>
+      <code>$temp['length']</code>
+      <code>$temp['length']</code>
+      <code>$temp['type']</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyInvalidCast occurrences="2">
+      <code>$source</code>
+      <code>$value</code>
+    </PossiblyInvalidCast>
+    <PossiblyInvalidMethodCall occurrences="1">
+      <code>toBytes</code>
+    </PossiblyInvalidMethodCall>
+    <PossiblyNullArgument occurrences="4">
+      <code>$part2</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+    </PossiblyNullArgument>
+    <PossiblyNullIterator occurrences="1">
+      <code>$source</code>
+    </PossiblyNullIterator>
+    <PossiblyNullReference occurrences="2">
+      <code>subtract</code>
+      <code>toBytes</code>
+    </PossiblyNullReference>
+    <PossiblyUndefinedIntArrayOffset occurrences="4">
+      <code>$decoded['content'][0]</code>
+      <code>$decoded['content'][0]</code>
+      <code>$matches[1]</code>
+      <code>$matches[2]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="51">
+      <code>$child['default']</code>
+      <code>$child['type']</code>
+      <code>$child['type']</code>
+      <code>$decoded['constant']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['content']</code>
+      <code>$decoded['length']</code>
+      <code>$decoded['start']</code>
+      <code>$decoded['start']</code>
+      <code>$decoded['type']</code>
+      <code>$decoded['type']</code>
+      <code>$decoded['type']</code>
+      <code>$decoded['type']</code>
+      <code>$decoded['type']</code>
+      <code>$decoded['type']</code>
+      <code>$mapping['children']</code>
+      <code>$mapping['children']</code>
+      <code>$mapping['children']</code>
+      <code>$mapping['children']</code>
+      <code>$mapping['children']</code>
+      <code>$mapping['children']</code>
+      <code>$mapping['children']</code>
+      <code>$mapping['children']</code>
+      <code>$mapping['children']</code>
+      <code>$mapping['class']</code>
+      <code>$mapping['class']</code>
+      <code>$mapping['class']</code>
+      <code>$mapping['type']</code>
+      <code>$mapping['type']</code>
+      <code>$mapping['type']</code>
+      <code>$mapping['type']</code>
+      <code>$mapping['type']</code>
+      <code>$mapping['type']</code>
+      <code>$temp['content']</code>
+      <code>$temp['length']</code>
+      <code>$temp['length']</code>
+      <code>$temp['length']</code>
+      <code>$temp['type']</code>
+      <code>$temp['type']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUndefinedVariable occurrences="6">
+      <code>$candidate</code>
+      <code>$candidate</code>
+      <code>$candidate</code>
+      <code>$candidate</code>
+      <code>$temp</code>
+      <code>$temp</code>
+    </PossiblyUndefinedVariable>
+    <PossiblyUnusedMethod occurrences="2">
+      <code>decodeLength</code>
+      <code>setTimeFormat</code>
+    </PossiblyUnusedMethod>
+  </file>
+  <file src="../phpseclib/File/ASN1/Element.php">
+    <PossiblyUnusedReturnValue occurrences="1">
+      <code>Element</code>
+    </PossiblyUnusedReturnValue>
+  </file>
+  <file src="../phpseclib/File/ASN1/Maps/CPSuri.php">
+    <UnusedClass occurrences="1">
+      <code>CPSuri</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/File/ASN1/Maps/PBMAC1params.php">
+    <UnusedClass occurrences="1">
+      <code>PBMAC1params</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/File/ASN1/Maps/Prime_p.php">
+    <UnusedClass occurrences="1">
+      <code>Prime_p</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/File/ASN1/Maps/PrivateKeyInfo.php">
+    <UnusedClass occurrences="1">
+      <code>PrivateKeyInfo</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/File/ASN1/Maps/SubjectInfoAccessSyntax.php">
+    <UnusedClass occurrences="1">
+      <code>SubjectInfoAccessSyntax</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/File/ASN1/Maps/Trinomial.php">
+    <UnusedClass occurrences="1">
+      <code>Trinomial</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/File/X509.php">
+    <DocblockTypeContradiction occurrences="13">
+      <code>!is_array($this-&gt;currentCert)</code>
+      <code>!is_array($this-&gt;currentCert)</code>
+      <code>!is_array($this-&gt;currentCert)</code>
+      <code>!is_array($this-&gt;currentCert)</code>
+      <code>!is_array($this-&gt;currentCert)</code>
+      <code>!is_array($this-&gt;currentCert)</code>
+      <code>!is_array($this-&gt;currentCert)</code>
+      <code>!is_array($this-&gt;currentCert)</code>
+      <code>!isset($this-&gt;currentCert)</code>
+      <code>!isset($this-&gt;currentCert)</code>
+      <code>!isset($this-&gt;currentCert)</code>
+      <code>!isset($this-&gt;currentCert)</code>
+      <code>$cert === false</code>
+    </DocblockTypeContradiction>
+    <FalsableReturnStatement occurrences="7">
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>inet_ntop($ip)</code>
+    </FalsableReturnStatement>
+    <ImplicitToStringCast occurrences="1">
+      <code>new BigInteger($serial, $base)</code>
+    </ImplicitToStringCast>
+    <InvalidArgument occurrences="1">
+      <code>$j</code>
+    </InvalidArgument>
+    <InvalidFalsableReturnType occurrences="4">
+      <code>string</code>
+      <code>string</code>
+      <code>string</code>
+      <code>string</code>
+    </InvalidFalsableReturnType>
+    <MissingClosureParamType occurrences="1">
+      <code>$x</code>
+    </MissingClosureParamType>
+    <MissingClosureReturnType occurrences="1">
+      <code>fn ($x) =&gt; '\x' . bin2hex($x[0])</code>
+    </MissingClosureReturnType>
+    <MissingParamType occurrences="8">
+      <code>$dn</code>
+      <code>$domains</code>
+      <code>$propValue</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+    </MissingParamType>
+    <MissingReturnType occurrences="22">
+      <code>getAttribute</code>
+      <code>getChain</code>
+      <code>getDNProp</code>
+      <code>getExtension</code>
+      <code>getExtensionHelper</code>
+      <code>getIssuerDN</code>
+      <code>getIssuerDNProp</code>
+      <code>getMapping</code>
+      <code>getPublicKey</code>
+      <code>getRevoked</code>
+      <code>getRevokedCertificateExtension</code>
+      <code>getSubjectDN</code>
+      <code>getSubjectDNProp</code>
+      <code>loadCRL</code>
+      <code>loadCSR</code>
+      <code>loadSPKAC</code>
+      <code>loadX509</code>
+      <code>sign</code>
+      <code>signCRL</code>
+      <code>signCSR</code>
+      <code>signSPKAC</code>
+      <code>translateDNProp</code>
+    </MissingReturnType>
+    <MixedArgument occurrences="130">
+      <code>$attribute['value']</code>
+      <code>$attribute['value']</code>
+      <code>$attribute['value']</code>
+      <code>$attributes[$key]['value']</code>
+      <code>$basicConstraints</code>
+      <code>$ca</code>
+      <code>$ca</code>
+      <code>$ca</code>
+      <code>$ca['tbsCertificate']['subject']</code>
+      <code>$ca['tbsCertificate']['subject']</code>
+      <code>$cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey']</code>
+      <code>$csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey']</code>
+      <code>$data</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]['content'][0]['length']</code>
+      <code>$decoded[0]['content'][0]['length']</code>
+      <code>$decoded[0]['content'][0]['length']</code>
+      <code>$decoded[0]['content'][0]['length']</code>
+      <code>$decoded[0]['content'][0]['start']</code>
+      <code>$decoded[0]['content'][0]['start']</code>
+      <code>$decoded[0]['content'][0]['start']</code>
+      <code>$decoded[0]['content'][0]['start']</code>
+      <code>$dn</code>
+      <code>$dn</code>
+      <code>$dn</code>
+      <code>$dn</code>
+      <code>$dn</code>
+      <code>$dn</code>
+      <code>$dn</code>
+      <code>$dn</code>
+      <code>$dns[$i]</code>
+      <code>$dns[$i]</code>
+      <code>$id</code>
+      <code>$id</code>
+      <code>$id</code>
+      <code>$id</code>
+      <code>$ipAddress</code>
+      <code>$ip[0]</code>
+      <code>$ip[1]</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$keyUsage</code>
+      <code>$map</code>
+      <code>$map</code>
+      <code>$map</code>
+      <code>$map</code>
+      <code>$map</code>
+      <code>$map</code>
+      <code>$map</code>
+      <code>$map</code>
+      <code>$map</code>
+      <code>$notAfter</code>
+      <code>$notBefore</code>
+      <code>$prop</code>
+      <code>$propName</code>
+      <code>$rc['userCertificate']</code>
+      <code>$rclist</code>
+      <code>$rdn</code>
+      <code>$s</code>
+      <code>$signingCert['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['algorithm']</code>
+      <code>$signingCert['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['algorithm']</code>
+      <code>$signingCert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey']</code>
+      <code>$signingCert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey']</code>
+      <code>$spkac['publicKeyAndChallenge']['spki']['subjectPublicKey']</code>
+      <code>$subid</code>
+      <code>$subid</code>
+      <code>$subject-&gt;domains</code>
+      <code>$subvalue</code>
+      <code>$subvalue</code>
+      <code>$this-&gt;currentCert['certificationRequestInfo']['subject']</code>
+      <code>$this-&gt;currentCert['certificationRequestInfo']['subject']</code>
+      <code>$this-&gt;currentCert['certificationRequestInfo']['subjectPKInfo']['algorithm']['algorithm']</code>
+      <code>$this-&gt;currentCert['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey']</code>
+      <code>$this-&gt;currentCert['publicKeyAndChallenge']['spki']['algorithm']['algorithm']</code>
+      <code>$this-&gt;currentCert['publicKeyAndChallenge']['spki']['subjectPublicKey']</code>
+      <code>$this-&gt;currentCert['signature']</code>
+      <code>$this-&gt;currentCert['signature']</code>
+      <code>$this-&gt;currentCert['signature']</code>
+      <code>$this-&gt;currentCert['signature']</code>
+      <code>$this-&gt;currentCert['signatureAlgorithm']['algorithm']</code>
+      <code>$this-&gt;currentCert['signatureAlgorithm']['algorithm']</code>
+      <code>$this-&gt;currentCert['signatureAlgorithm']['algorithm']</code>
+      <code>$this-&gt;currentCert['signatureAlgorithm']['algorithm']</code>
+      <code>$this-&gt;currentCert['tbsCertList']['issuer']</code>
+      <code>$this-&gt;currentCert['tbsCertList']['issuer']</code>
+      <code>$this-&gt;currentCert['tbsCertList']['issuer']</code>
+      <code>$this-&gt;currentCert['tbsCertificate']['issuer']</code>
+      <code>$this-&gt;currentCert['tbsCertificate']['issuer']</code>
+      <code>$this-&gt;currentCert['tbsCertificate']['issuer']</code>
+      <code>$this-&gt;currentCert['tbsCertificate']['subject']</code>
+      <code>$this-&gt;currentCert['tbsCertificate']['subject']</code>
+      <code>$type</code>
+      <code>$type</code>
+      <code>$url</code>
+      <code>$v</code>
+      <code>$v</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value[$j]['policyQualifiers']</code>
+      <code>$value[$j]['policyQualifiers']</code>
+      <code>$value[0]</code>
+      <code>$values</code>
+      <code>$values</code>
+      <code>$values</code>
+      <code>$values</code>
+      <code>$values[$j]</code>
+      <code>$values[$j]</code>
+      <code>$x509</code>
+      <code>$x[0]</code>
+      <code>is_string($key) ? $key : $key-&gt;__toString()</code>
+    </MixedArgument>
+    <MixedArgumentTypeCoercion occurrences="1">
+      <code>$prop</code>
+    </MixedArgumentTypeCoercion>
+    <MixedArrayAccess occurrences="126">
+      <code>$attr['value']</code>
+      <code>$attr['value']</code>
+      <code>$attribute['type']</code>
+      <code>$attribute['type']</code>
+      <code>$attribute['type']</code>
+      <code>$attribute['type']</code>
+      <code>$attribute['value']</code>
+      <code>$attribute['value']</code>
+      <code>$attribute['value']</code>
+      <code>$attribute['value']</code>
+      <code>$attribute['value']</code>
+      <code>$attributes[$i]['type']</code>
+      <code>$attributes[$i]['type']</code>
+      <code>$attributes[$i]['value']</code>
+      <code>$attributes[$i]['value']</code>
+      <code>$attributes[$i]['value']</code>
+      <code>$attributes[$i]['value']</code>
+      <code>$attributes[$key]['value']</code>
+      <code>$attributes[$key]['value']</code>
+      <code>$ca['tbsCertificate']</code>
+      <code>$ca['tbsCertificate']</code>
+      <code>$ca['tbsCertificate']</code>
+      <code>$ca['tbsCertificate']</code>
+      <code>$ca['tbsCertificate']</code>
+      <code>$ca['tbsCertificate']['serialNumber']</code>
+      <code>$ca['tbsCertificate']['serialNumber']</code>
+      <code>$cert['tbsCertificate']['subject']</code>
+      <code>$cert['tbsCertificate']['subjectPublicKeyInfo']</code>
+      <code>$cert['tbsCertificate']['subjectPublicKeyInfo']</code>
+      <code>$crl['tbsCertList']['revokedCertificates']</code>
+      <code>$csr['certificationRequestInfo']['subject']</code>
+      <code>$csr['certificationRequestInfo']['subject']</code>
+      <code>$csr['certificationRequestInfo']['subjectPKInfo']</code>
+      <code>$csr['certificationRequestInfo']['subjectPKInfo']</code>
+      <code>$csr['certificationRequestInfo']['subjectPKInfo']</code>
+      <code>$currentCert['tbsCertificate']['issuer']</code>
+      <code>$decoded[0]['content']</code>
+      <code>$decoded[0]['content']</code>
+      <code>$decoded[0]['content']</code>
+      <code>$decoded[0]['content']</code>
+      <code>$decoded[0]['content']</code>
+      <code>$decoded[0]['content']</code>
+      <code>$decoded[0]['content']</code>
+      <code>$decoded[0]['content']</code>
+      <code>$dn[$i]</code>
+      <code>$dn[$i]</code>
+      <code>$dn[$i]</code>
+      <code>$dn[$i]</code>
+      <code>$dns[$i][$j]</code>
+      <code>$dns[$i][$j]</code>
+      <code>$dns[$i][$j]</code>
+      <code>$dns[$i][$j]</code>
+      <code>$extension['extnId']</code>
+      <code>$extensions[$i]['extnId']</code>
+      <code>$extensions[$i]['extnId']</code>
+      <code>$extensions[$i]['extnValue']</code>
+      <code>$extensions[$i]['extnValue']</code>
+      <code>$field[0]</code>
+      <code>$field[0]</code>
+      <code>$key['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey']</code>
+      <code>$key['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey']</code>
+      <code>$keyinfo['algorithm']</code>
+      <code>$keyinfo['subjectPublicKey']</code>
+      <code>$notAfter['generalTime']</code>
+      <code>$notAfter['utcTime']</code>
+      <code>$notBefore['generalTime']</code>
+      <code>$notBefore['utcTime']</code>
+      <code>$opt['accessLocation']</code>
+      <code>$opt['accessMethod']</code>
+      <code>$rc['userCertificate']</code>
+      <code>$rc['userCertificate']</code>
+      <code>$rdn[$i]</code>
+      <code>$root[$i]</code>
+      <code>$signingCert['tbsCertificate']</code>
+      <code>$signingCert['tbsCertificate']</code>
+      <code>$signingCert['tbsCertificate']</code>
+      <code>$signingCert['tbsCertificate']</code>
+      <code>$spkac['publicKeyAndChallenge']['spki']</code>
+      <code>$spkac['publicKeyAndChallenge']['spki']</code>
+      <code>$spkac['publicKeyAndChallenge']['spki']</code>
+      <code>$tbsCertList['nextUpdate']</code>
+      <code>$tbsCertList['revokedCertificates']</code>
+      <code>$tbsCertList['version']</code>
+      <code>$this-&gt;currentCert['certificationRequestInfo']['subject']</code>
+      <code>$this-&gt;currentCert['certificationRequestInfo']['subject']</code>
+      <code>$this-&gt;currentCert['certificationRequestInfo']['subjectPKInfo']</code>
+      <code>$this-&gt;currentCert['certificationRequestInfo']['subjectPKInfo']</code>
+      <code>$this-&gt;currentCert['publicKeyAndChallenge']['spki']</code>
+      <code>$this-&gt;currentCert['publicKeyAndChallenge']['spki']</code>
+      <code>$this-&gt;currentCert['signatureAlgorithm']['algorithm']</code>
+      <code>$this-&gt;currentCert['signatureAlgorithm']['algorithm']</code>
+      <code>$this-&gt;currentCert['signatureAlgorithm']['algorithm']</code>
+      <code>$this-&gt;currentCert['signatureAlgorithm']['algorithm']</code>
+      <code>$this-&gt;currentCert['tbsCertList']['issuer']</code>
+      <code>$this-&gt;currentCert['tbsCertList']['issuer']</code>
+      <code>$this-&gt;currentCert['tbsCertList']['issuer']</code>
+      <code>$this-&gt;currentCert['tbsCertList']['issuer']</code>
+      <code>$this-&gt;currentCert['tbsCertList']['issuer']</code>
+      <code>$this-&gt;currentCert['tbsCertificate']['issuer']</code>
+      <code>$this-&gt;currentCert['tbsCertificate']['issuer']</code>
+      <code>$this-&gt;currentCert['tbsCertificate']['issuer']</code>
+      <code>$this-&gt;currentCert['tbsCertificate']['issuer']</code>
+      <code>$this-&gt;currentCert['tbsCertificate']['issuer']</code>
+      <code>$this-&gt;currentCert['tbsCertificate']['subject']</code>
+      <code>$this-&gt;currentCert['tbsCertificate']['subject']</code>
+      <code>$this-&gt;currentCert['tbsCertificate']['subject']</code>
+      <code>$this-&gt;currentCert['tbsCertificate']['validity']</code>
+      <code>$this-&gt;currentCert['tbsCertificate']['validity']</code>
+      <code>$value[$j]</code>
+      <code>$value[$j]</code>
+      <code>$value[$j]</code>
+      <code>$value[$j]['policyQualifiers'][$k]</code>
+      <code>$value[$j]['policyQualifiers'][$k]</code>
+      <code>$value['authorityCertSerialNumber']</code>
+      <code>$value['extnId']</code>
+      <code>$value['extnId']</code>
+      <code>$value['extnId']</code>
+      <code>$value['extnId']</code>
+      <code>$value['extnValue']</code>
+      <code>$value['type']</code>
+      <code>$value[0]</code>
+      <code>$values[$j]</code>
+      <code>$values[$j]</code>
+      <code>$x509['tbsCertificate']['subject']</code>
+      <code>$x509['tbsCertificate']['subjectPublicKeyInfo']</code>
+      <code>$x[0]</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="36">
+      <code>$attr['value']</code>
+      <code>$attributes[$key]['value']</code>
+      <code>$attributes[$key]['value']</code>
+      <code>$attributes[$last]['value']</code>
+      <code>$cert['tbsCertificate']['signature']</code>
+      <code>$cert['tbsCertificate']['subjectPublicKeyInfo']</code>
+      <code>$csr['certificationRequestInfo']['subjectPKInfo']</code>
+      <code>$csr['certificationRequestInfo']['subjectPKInfo']</code>
+      <code>$extensions[$key]</code>
+      <code>$extensions[]</code>
+      <code>$rclist[$i]['revocationDate']</code>
+      <code>$root[$i]</code>
+      <code>$spkac['publicKeyAndChallenge']['spki']</code>
+      <code>$spkac['publicKeyAndChallenge']['spki']</code>
+      <code>$tbsCertList['issuer']</code>
+      <code>$tbsCertList['nextUpdate']</code>
+      <code>$tbsCertList['thisUpdate']</code>
+      <code>$tbsCertList['version']</code>
+      <code>$this-&gt;currentCert['certificationRequestInfo']['subject']</code>
+      <code>$this-&gt;currentCert['certificationRequestInfo']['subjectPKInfo']</code>
+      <code>$this-&gt;currentCert['publicKeyAndChallenge']['challenge']</code>
+      <code>$this-&gt;currentCert['publicKeyAndChallenge']['spki']</code>
+      <code>$this-&gt;currentCert['tbsCertList']['signature']</code>
+      <code>$this-&gt;currentCert['tbsCertificate']['issuer']</code>
+      <code>$this-&gt;currentCert['tbsCertificate']['serialNumber']</code>
+      <code>$this-&gt;currentCert['tbsCertificate']['signature']</code>
+      <code>$this-&gt;currentCert['tbsCertificate']['subject']</code>
+      <code>$this-&gt;currentCert['tbsCertificate']['subjectPublicKeyInfo']</code>
+      <code>$this-&gt;currentCert['tbsCertificate']['validity']</code>
+      <code>$this-&gt;currentCert['tbsCertificate']['validity']</code>
+      <code>$this-&gt;dn['rdnSequence'][]</code>
+      <code>$value['authorityCertSerialNumber']</code>
+      <code>$values[$j]</code>
+      <code>$values[$j]</code>
+      <code>$values[$j]</code>
+      <code>$x509['tbsCertificate']['subjectPublicKeyInfo']</code>
+    </MixedArrayAssignment>
+    <MixedArrayOffset occurrences="3">
+      <code>$attributes[$last]</code>
+      <code>$extensions[$key]</code>
+      <code>$rdn[$i]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="137">
+      <code>$attr</code>
+      <code>$attr</code>
+      <code>$attribute</code>
+      <code>$attribute</code>
+      <code>$attribute</code>
+      <code>$attribute</code>
+      <code>$attributes[$key]['value'][$disposition]</code>
+      <code>$attributes[$last]['value'][]</code>
+      <code>$attrs[]</code>
+      <code>$authorityKey</code>
+      <code>$authorityKey</code>
+      <code>$authorityKey</code>
+      <code>$authorityKey</code>
+      <code>$basicConstraints</code>
+      <code>$ca</code>
+      <code>$ca</code>
+      <code>$ca</code>
+      <code>$cert</code>
+      <code>$cert</code>
+      <code>$certificationRequestInfo</code>
+      <code>$crlNumber</code>
+      <code>$crlNumber</code>
+      <code>$csrexts</code>
+      <code>$currentKeyIdentifier</code>
+      <code>$currentKeyIdentifier</code>
+      <code>$data</code>
+      <code>$dn</code>
+      <code>$dn</code>
+      <code>$dn</code>
+      <code>$extension</code>
+      <code>$extension</code>
+      <code>$extension</code>
+      <code>$extension</code>
+      <code>$extensions[]</code>
+      <code>$field</code>
+      <code>$filters['tbsCertificate']['extensions'][]</code>
+      <code>$i</code>
+      <code>$i</code>
+      <code>$id</code>
+      <code>$id</code>
+      <code>$id</code>
+      <code>$id</code>
+      <code>$ipAddress</code>
+      <code>$issuerAltName</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$keyUsage</code>
+      <code>$map</code>
+      <code>$map</code>
+      <code>$map</code>
+      <code>$map</code>
+      <code>$map</code>
+      <code>$map</code>
+      <code>$map</code>
+      <code>$map</code>
+      <code>$map</code>
+      <code>$name</code>
+      <code>$names</code>
+      <code>$notAfter</code>
+      <code>$notAfter</code>
+      <code>$notBefore</code>
+      <code>$notBefore</code>
+      <code>$opt</code>
+      <code>$prop</code>
+      <code>$propName</code>
+      <code>$propName</code>
+      <code>$propName</code>
+      <code>$publicKeyAndChallenge</code>
+      <code>$rc</code>
+      <code>$rc</code>
+      <code>$rclist</code>
+      <code>$rdn</code>
+      <code>$result[$desc]</code>
+      <code>$result['certificationRequestInfo']</code>
+      <code>$result['publicKeyAndChallenge']</code>
+      <code>$result['tbsCertList']</code>
+      <code>$result['tbsCertificate']</code>
+      <code>$result[]</code>
+      <code>$result[]</code>
+      <code>$root</code>
+      <code>$root</code>
+      <code>$root</code>
+      <code>$s</code>
+      <code>$subid</code>
+      <code>$subid</code>
+      <code>$subjectKeyID</code>
+      <code>$subjectKeyID</code>
+      <code>$subjectKeyID</code>
+      <code>$subjectKeyID</code>
+      <code>$subvalue</code>
+      <code>$subvalue</code>
+      <code>$subvalue</code>
+      <code>$tbsCertList</code>
+      <code>$tbsCertList</code>
+      <code>$tbsCertificate</code>
+      <code>$this-&gt;currentCert</code>
+      <code>$this-&gt;currentCert</code>
+      <code>$this-&gt;dn</code>
+      <code>$this-&gt;dn</code>
+      <code>$this-&gt;dn</code>
+      <code>$this-&gt;dn</code>
+      <code>$this-&gt;publicKey</code>
+      <code>$this-&gt;publicKey</code>
+      <code>$this-&gt;publicKey</code>
+      <code>$this-&gt;publicKey</code>
+      <code>$type</code>
+      <code>$type</code>
+      <code>$type</code>
+      <code>$url</code>
+      <code>$v</code>
+      <code>$v</code>
+      <code>$v</code>
+      <code>$v</code>
+      <code>$v</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$values</code>
+      <code>$values</code>
+      <code>$version</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="5">
+      <code>?array</code>
+      <code>array|bool|string</code>
+      <code>array|false</code>
+      <code>array|false</code>
+      <code>bool</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="7">
+      <code>__toString</code>
+      <code>add</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>getPublicKey</code>
+      <code>toBytes</code>
+      <code>toString</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="5">
+      <code>$issuer-&gt;privateKey-&gt;sign($this-&gt;signatureSubject)</code>
+      <code>$issuer-&gt;privateKey-&gt;sign($this-&gt;signatureSubject)</code>
+      <code>$this-&gt;privateKey-&gt;sign($this-&gt;signatureSubject)</code>
+      <code>$this-&gt;privateKey-&gt;sign($this-&gt;signatureSubject)</code>
+      <code>$value</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="5">
+      <code>$dn</code>
+      <code>$key-&gt;verify($signatureSubject, $signature)</code>
+      <code>$root</code>
+      <code>$root</code>
+      <code>self::$extensions[$id] ?? null</code>
+    </MixedReturnStatement>
+    <MixedReturnTypeCoercion occurrences="2">
+      <code>$i</code>
+      <code>int|false</code>
+    </MixedReturnTypeCoercion>
+    <PossiblyFalseArgument occurrences="16">
+      <code>$line</code>
+      <code>$line</code>
+      <code>$publicKey</code>
+      <code>$rclist</code>
+      <code>$rclist</code>
+      <code>$rclist</code>
+      <code>$rclist</code>
+      <code>$results</code>
+      <code>$this-&gt;saveCSR($this-&gt;currentCert)</code>
+      <code>$this-&gt;saveSPKAC($this-&gt;currentCert)</code>
+      <code>$this-&gt;saveX509($this-&gt;currentCert)</code>
+      <code>base64_decode(preg_replace('#-.+-|[\r\n]#', '', $cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey']))</code>
+      <code>base64_decode(preg_replace('#-.+-|[\r\n]#', '', $csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey']))</code>
+      <code>base64_decode(preg_replace('#-.+-|[\r\n]#', '', $spkac['publicKeyAndChallenge']['spki']['subjectPublicKey']))</code>
+      <code>pack('N', $hash)</code>
+      <code>unpack('Vhash', $hash)</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalseOperand occurrences="2">
+      <code>inet_pton($ip[0])</code>
+      <code>inet_pton($ip[1])</code>
+    </PossiblyFalseOperand>
+    <PossiblyFalsePropertyAssignmentValue occurrences="11">
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+    </PossiblyFalsePropertyAssignmentValue>
+    <PossiblyInvalidArgument occurrences="9">
+      <code>$cert</code>
+      <code>$cert</code>
+      <code>$cert</code>
+      <code>$crl</code>
+      <code>$csr</code>
+      <code>$date</code>
+      <code>$date</code>
+      <code>$dn</code>
+      <code>$raw</code>
+    </PossiblyInvalidArgument>
+    <PossiblyInvalidArrayAccess occurrences="5">
+      <code>$parts['host']</code>
+      <code>$parts['path']</code>
+      <code>$parts['scheme']</code>
+      <code>$results[$i + 1]</code>
+      <code>$results[$i]</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyInvalidCast occurrences="5">
+      <code>$cert</code>
+      <code>$cert</code>
+      <code>$date</code>
+      <code>$date</code>
+      <code>$dn</code>
+    </PossiblyInvalidCast>
+    <PossiblyInvalidMethodCall occurrences="3">
+      <code>__toString</code>
+      <code>toString</code>
+      <code>toString</code>
+    </PossiblyInvalidMethodCall>
+    <PossiblyInvalidOperand occurrences="1">
+      <code>$key-&gt;getCurve()</code>
+    </PossiblyInvalidOperand>
+    <PossiblyInvalidPropertyAssignmentValue occurrences="1">
+      <code>$csr</code>
+    </PossiblyInvalidPropertyAssignmentValue>
+    <PossiblyNullArgument occurrences="19">
+      <code>$cert</code>
+      <code>$crl</code>
+      <code>$csr</code>
+      <code>$decoded[0]['content'][0]['start']</code>
+      <code>$path</code>
+      <code>$spkac</code>
+      <code>$temp</code>
+      <code>$v</code>
+      <code>$value</code>
+      <code>$values[$j]</code>
+      <code>$values[$j]</code>
+      <code>preg_replace('#-.+-|[\r\n]#', '', $cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'])</code>
+      <code>preg_replace('#-.+-|[\r\n]#', '', $csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey'])</code>
+      <code>preg_replace('#-.+-|[\r\n]#', '', $spkac['publicKeyAndChallenge']['spki']['subjectPublicKey'])</code>
+      <code>preg_replace('#-.+-|[\r\n]#', '', $this-&gt;publicKey-&gt;toString($format))</code>
+      <code>preg_replace('#WithRSAEncryption$#', '', $signatureAlgorithm)</code>
+      <code>preg_replace('#^ecdsa-with-#', '', strtolower($signatureAlgorithm))</code>
+      <code>preg_replace('#^id-dsa-with-#', '', strtolower($signatureAlgorithm))</code>
+      <code>preg_replace_callback('#[^\x20-\x7E]#', $callback, $value-&gt;element)</code>
+    </PossiblyNullArgument>
+    <PossiblyNullArrayAccess occurrences="4">
+      <code>$decoded[0]</code>
+      <code>$decoded[0]['content']</code>
+      <code>$spkac['publicKeyAndChallenge']</code>
+      <code>$spkac['publicKeyAndChallenge']</code>
+    </PossiblyNullArrayAccess>
+    <PossiblyNullArrayAssignment occurrences="2">
+      <code>$cert['signatureAlgorithm']</code>
+      <code>$spkac['publicKeyAndChallenge']</code>
+    </PossiblyNullArrayAssignment>
+    <PossiblyNullArrayOffset occurrences="1">
+      <code>$result</code>
+    </PossiblyNullArrayOffset>
+    <PossiblyNullOperand occurrences="1">
+      <code>$desc</code>
+    </PossiblyNullOperand>
+    <PossiblyNullPropertyAssignmentValue occurrences="26">
+      <code>$currentCert</code>
+      <code>$currentCert</code>
+      <code>$currentCert</code>
+      <code>$currentCert</code>
+      <code>$signatureSubject</code>
+      <code>$signatureSubject</code>
+      <code>$signatureSubject</code>
+      <code>$signatureSubject</code>
+      <code>$this-&gt;currentCert</code>
+      <code>$this-&gt;currentCert</code>
+      <code>$this-&gt;currentCert</code>
+      <code>$this-&gt;currentCert</code>
+      <code>$this-&gt;currentCert</code>
+      <code>$this-&gt;currentCert</code>
+      <code>$this-&gt;currentCert</code>
+      <code>$this-&gt;currentCert</code>
+      <code>$this-&gt;currentCert</code>
+      <code>$this-&gt;currentCert</code>
+      <code>is_string($currentKeyIdentifier) ? $currentKeyIdentifier : null</code>
+      <code>is_string($currentKeyIdentifier) ? $currentKeyIdentifier : null</code>
+      <code>null</code>
+      <code>null</code>
+      <code>null</code>
+      <code>null</code>
+      <code>null</code>
+      <code>null</code>
+    </PossiblyNullPropertyAssignmentValue>
+    <PossiblyUndefinedArrayOffset occurrences="3">
+      <code>$parts['host']</code>
+      <code>$parts['path']</code>
+      <code>$parts['scheme']</code>
+    </PossiblyUndefinedArrayOffset>
+    <PossiblyUndefinedIntArrayOffset occurrences="17">
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$ip[0]</code>
+      <code>$ip[1]</code>
+      <code>$temp[1]</code>
+      <code>$this-&gt;domains[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedMethod occurrences="2">
+      <code>$value</code>
+      <code>__toString</code>
+    </PossiblyUndefinedMethod>
+    <PossiblyUndefinedStringArrayOffset occurrences="21">
+      <code>$ca['tbsCertificate']</code>
+      <code>$ca['tbsCertificate']</code>
+      <code>$crl['tbsCertList']</code>
+      <code>$csr['certificationRequestInfo']</code>
+      <code>$currentCert['tbsCertificate']</code>
+      <code>$dn['rdnSequence']</code>
+      <code>$dn['rdnSequence']</code>
+      <code>$dn['rdnSequence']</code>
+      <code>$spkac['publicKeyAndChallenge']</code>
+      <code>$spkac['publicKeyAndChallenge']</code>
+      <code>$spkac['publicKeyAndChallenge']</code>
+      <code>$this-&gt;currentCert['signature']</code>
+      <code>$this-&gt;currentCert['signature']</code>
+      <code>$this-&gt;currentCert['signature']</code>
+      <code>$this-&gt;currentCert['signature']</code>
+      <code>$this-&gt;currentCert['signatureAlgorithm']</code>
+      <code>$this-&gt;currentCert['signatureAlgorithm']</code>
+      <code>$this-&gt;currentCert['signatureAlgorithm']</code>
+      <code>$this-&gt;currentCert['signatureAlgorithm']</code>
+      <code>$this-&gt;dn['rdnSequence']</code>
+      <code>$x509['tbsCertificate']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUndefinedVariable occurrences="3">
+      <code>$signingCert</code>
+      <code>$signingCert</code>
+      <code>$subjectPublicKey</code>
+    </PossiblyUndefinedVariable>
+    <PossiblyUnusedMethod occurrences="21">
+      <code>decodeIP</code>
+      <code>decodeNameConstraintIP</code>
+      <code>disableURLFetch</code>
+      <code>enableURLFetch</code>
+      <code>encodeIP</code>
+      <code>getAttributes</code>
+      <code>getChain</code>
+      <code>getCurrentCert</code>
+      <code>getIssuerDNProp</code>
+      <code>getRevoked</code>
+      <code>getRevokedCertificateExtensions</code>
+      <code>getSubjectDN</code>
+      <code>getSubjectDNProp</code>
+      <code>listRevoked</code>
+      <code>removeRevokedCertificateExtension</code>
+      <code>setAttribute</code>
+      <code>setIPAddress</code>
+      <code>setKeyIdentifier</code>
+      <code>setRevokedCertificateExtension</code>
+      <code>setSerialNumber</code>
+      <code>unrevoke</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedReturnValue occurrences="6">
+      <code>bool</code>
+      <code>bool</code>
+      <code>bool</code>
+      <code>bool</code>
+      <code>bool</code>
+      <code>bool</code>
+    </PossiblyUnusedReturnValue>
+    <PropertyNotSetInConstructor occurrences="11">
+      <code>$CAs</code>
+      <code>$challenge</code>
+      <code>$currentCert</code>
+      <code>$currentKeyIdentifier</code>
+      <code>$dn</code>
+      <code>$endDate</code>
+      <code>$privateKey</code>
+      <code>$publicKey</code>
+      <code>$serialNumber</code>
+      <code>$signatureSubject</code>
+      <code>$startDate</code>
+    </PropertyNotSetInConstructor>
+    <RedundantCondition occurrences="2">
+      <code>!is_array($v) &amp;&amp; isset($type)</code>
+      <code>$encoded !== false</code>
+    </RedundantCondition>
+    <RedundantConditionGivenDocblockType occurrences="25">
+      <code>$s !== false</code>
+      <code>$v !== false</code>
+      <code>$v !== false</code>
+      <code>is_array($crl-&gt;currentCert)</code>
+      <code>is_array($subject-&gt;currentCert)</code>
+      <code>is_array($subject-&gt;currentCert)</code>
+      <code>is_array($this-&gt;currentCert)</code>
+      <code>is_array($this-&gt;currentCert)</code>
+      <code>is_array($this-&gt;currentCert)</code>
+      <code>isset($crl-&gt;currentCert)</code>
+      <code>isset($crl-&gt;currentCert) &amp;&amp; is_array($crl-&gt;currentCert)</code>
+      <code>isset($issuer-&gt;currentKeyIdentifier)</code>
+      <code>isset($issuer-&gt;currentKeyIdentifier)</code>
+      <code>isset($key-&gt;privateKey)</code>
+      <code>isset($key-&gt;publicKey)</code>
+      <code>isset($subject-&gt;currentCert)</code>
+      <code>isset($subject-&gt;currentCert)</code>
+      <code>isset($subject-&gt;currentCert) &amp;&amp; is_array($subject-&gt;currentCert)</code>
+      <code>isset($subject-&gt;currentCert) &amp;&amp; is_array($subject-&gt;currentCert)</code>
+      <code>isset($subject-&gt;currentKeyIdentifier)</code>
+      <code>isset($subject-&gt;publicKey)</code>
+      <code>isset($this-&gt;currentCert) &amp;&amp; is_array($this-&gt;currentCert)</code>
+      <code>isset($this-&gt;currentCert) &amp;&amp; is_array($this-&gt;currentCert)</code>
+      <code>isset($this-&gt;currentCert) &amp;&amp; is_array($this-&gt;currentCert)</code>
+      <code>isset($this-&gt;currentCert) &amp;&amp; is_array($this-&gt;currentCert)</code>
+    </RedundantConditionGivenDocblockType>
+    <RedundantFunctionCall occurrences="1">
+      <code>strtolower</code>
+    </RedundantFunctionCall>
+    <RedundantPropertyInitializationCheck occurrences="19">
+      <code>!isset($this-&gt;signatureSubject)</code>
+      <code>$this-&gt;currentCert</code>
+      <code>$this-&gt;currentCert</code>
+      <code>$this-&gt;currentCert</code>
+      <code>$this-&gt;currentCert</code>
+      <code>$this-&gt;signatureSubject</code>
+      <code>$this-&gt;signatureSubject</code>
+      <code>$this-&gt;signatureSubject</code>
+      <code>$this-&gt;signatureSubject</code>
+      <code>isset($this-&gt;currentCert)</code>
+      <code>isset($this-&gt;publicKey)</code>
+      <code>null</code>
+      <code>null</code>
+      <code>null</code>
+      <code>null</code>
+      <code>null</code>
+      <code>null</code>
+      <code>null</code>
+      <code>null</code>
+    </RedundantPropertyInitializationCheck>
+    <ReferenceConstraintViolation occurrences="8">
+      <code>$cert</code>
+      <code>$crl</code>
+      <code>$csr</code>
+      <code>$root</code>
+      <code>$root</code>
+      <code>$root</code>
+      <code>$root</code>
+      <code>$spkac</code>
+    </ReferenceConstraintViolation>
+    <TypeDoesNotContainType occurrences="21">
+      <code>!is_array($cert)</code>
+      <code>!is_array($crl)</code>
+      <code>!is_array($csr)</code>
+      <code>!is_array($spkac)</code>
+      <code>$crl === false</code>
+      <code>$csr === false</code>
+      <code>$spkac === false</code>
+      <code>'md5'</code>
+      <code>'sha1'</code>
+      <code>'sha224'</code>
+      <code>'sha224'</code>
+      <code>'sha224'</code>
+      <code>'sha256'</code>
+      <code>'sha256'</code>
+      <code>'sha384'</code>
+      <code>'sha384'</code>
+      <code>is_array($crl)</code>
+      <code>is_array($csr)</code>
+      <code>is_array($root)</code>
+      <code>is_array($spkac)</code>
+      <code>is_string($extnId)</code>
+    </TypeDoesNotContainType>
+    <UndefinedMethod occurrences="1">
+      <code>verify</code>
+    </UndefinedMethod>
+    <UnsafeInstantiation occurrences="1">
+      <code>new static()</code>
+    </UnsafeInstantiation>
+    <UnusedForeachValue occurrences="3">
+      <code>$attr</code>
+      <code>$extension</code>
+      <code>$extension</code>
+    </UnusedForeachValue>
+    <UnusedVariable occurrences="5">
+      <code>$count</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$subvalue</code>
+      <code>$value</code>
+    </UnusedVariable>
+  </file>
+  <file src="../phpseclib/Math/BigInteger.php">
+    <ArgumentTypeCoercion occurrences="1">
+      <code>$modexp</code>
+    </ArgumentTypeCoercion>
+    <ImplicitToStringCast occurrences="5">
+      <code>$gcd</code>
+      <code>$max</code>
+      <code>$min</code>
+      <code>$x</code>
+      <code>$y</code>
+    </ImplicitToStringCast>
+    <InvalidCast occurrences="1">
+      <code>$this-&gt;value</code>
+    </InvalidCast>
+    <MissingClosureParamType occurrences="1">
+      <code>$val</code>
+    </MissingClosureParamType>
+    <MixedArgument occurrences="29">
+      <code>$class::max(...$nums)</code>
+      <code>$class::min(...$nums)</code>
+      <code>$class::randomRange($min-&gt;value, $max-&gt;value)</code>
+      <code>$class::randomRangePrime($min-&gt;value, $max-&gt;value)</code>
+      <code>$func($x-&gt;value)</code>
+      <code>$q</code>
+      <code>$r</code>
+      <code>$this-&gt;value-&gt;abs()</code>
+      <code>$this-&gt;value-&gt;add($y-&gt;value)</code>
+      <code>$this-&gt;value-&gt;bitwise_and($x-&gt;value)</code>
+      <code>$this-&gt;value-&gt;bitwise_leftRotate($shift)</code>
+      <code>$this-&gt;value-&gt;bitwise_leftShift($shift)</code>
+      <code>$this-&gt;value-&gt;bitwise_not()</code>
+      <code>$this-&gt;value-&gt;bitwise_or($x-&gt;value)</code>
+      <code>$this-&gt;value-&gt;bitwise_rightRotate($shift)</code>
+      <code>$this-&gt;value-&gt;bitwise_rightShift($shift)</code>
+      <code>$this-&gt;value-&gt;bitwise_split($split)</code>
+      <code>$this-&gt;value-&gt;bitwise_xor($x-&gt;value)</code>
+      <code>$this-&gt;value-&gt;extendedGCD($n-&gt;value)</code>
+      <code>$this-&gt;value-&gt;gcd($n-&gt;value)</code>
+      <code>$this-&gt;value-&gt;modInverse($n-&gt;value)</code>
+      <code>$this-&gt;value-&gt;modPow($e-&gt;value, $n-&gt;value)</code>
+      <code>$this-&gt;value-&gt;multiply($x-&gt;value)</code>
+      <code>$this-&gt;value-&gt;negate()</code>
+      <code>$this-&gt;value-&gt;pow($n-&gt;value)</code>
+      <code>$this-&gt;value-&gt;powMod($e-&gt;value, $n-&gt;value)</code>
+      <code>$this-&gt;value-&gt;root($n)</code>
+      <code>$this-&gt;value-&gt;subtract($y-&gt;value)</code>
+      <code>$val</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="2">
+      <code>$q</code>
+      <code>$r</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="2">
+      <code>$func</code>
+      <code>[$q, $r]</code>
+    </MixedAssignment>
+    <MixedFunctionCall occurrences="1">
+      <code>$func($x-&gt;value)</code>
+    </MixedFunctionCall>
+    <MixedInferredReturnType occurrences="15">
+      <code>bool</code>
+      <code>bool</code>
+      <code>bool</code>
+      <code>bool</code>
+      <code>bool</code>
+      <code>bool</code>
+      <code>int</code>
+      <code>int</code>
+      <code>int</code>
+      <code>int</code>
+      <code>int|bool</code>
+      <code>string</code>
+      <code>string</code>
+      <code>string</code>
+      <code>string</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="40">
+      <code>$fqmain::isValidEngine()</code>
+      <code>__debugInfo</code>
+      <code>abs</code>
+      <code>add</code>
+      <code>between</code>
+      <code>bitwise_and</code>
+      <code>bitwise_leftRotate</code>
+      <code>bitwise_leftShift</code>
+      <code>bitwise_not</code>
+      <code>bitwise_or</code>
+      <code>bitwise_rightRotate</code>
+      <code>bitwise_rightShift</code>
+      <code>bitwise_split</code>
+      <code>bitwise_xor</code>
+      <code>compare</code>
+      <code>createRecurringModuloFunction</code>
+      <code>divide</code>
+      <code>equals</code>
+      <code>extendedGCD</code>
+      <code>gcd</code>
+      <code>getLength</code>
+      <code>getLengthInBytes</code>
+      <code>getPrecision</code>
+      <code>isNegative</code>
+      <code>isOdd</code>
+      <code>isPrime</code>
+      <code>modInverse</code>
+      <code>modPow</code>
+      <code>multiply</code>
+      <code>negate</code>
+      <code>pow</code>
+      <code>powMod</code>
+      <code>root</code>
+      <code>setPrecision</code>
+      <code>subtract</code>
+      <code>testBit</code>
+      <code>toBits</code>
+      <code>toBytes</code>
+      <code>toHex</code>
+      <code>toString</code>
+    </MixedMethodCall>
+    <MixedPropertyTypeCoercion occurrences="1">
+      <code>[$main, $modexp]</code>
+    </MixedPropertyTypeCoercion>
+    <MixedReturnStatement occurrences="15">
+      <code>$class::scan1divide($r-&gt;value)</code>
+      <code>$this-&gt;value-&gt;between($min-&gt;value, $max-&gt;value)</code>
+      <code>$this-&gt;value-&gt;compare($y-&gt;value)</code>
+      <code>$this-&gt;value-&gt;equals($x-&gt;value)</code>
+      <code>$this-&gt;value-&gt;getLength()</code>
+      <code>$this-&gt;value-&gt;getLengthInBytes()</code>
+      <code>$this-&gt;value-&gt;getPrecision()</code>
+      <code>$this-&gt;value-&gt;isNegative()</code>
+      <code>$this-&gt;value-&gt;isOdd()</code>
+      <code>$this-&gt;value-&gt;isPrime($t)</code>
+      <code>$this-&gt;value-&gt;testBit($x)</code>
+      <code>$this-&gt;value-&gt;toBits($twos_compliment)</code>
+      <code>$this-&gt;value-&gt;toBytes($twos_compliment)</code>
+      <code>$this-&gt;value-&gt;toHex($twos_compliment)</code>
+      <code>$this-&gt;value-&gt;toString()</code>
+    </MixedReturnStatement>
+    <PossiblyUndefinedVariable occurrences="1">
+      <code>$modexp</code>
+    </PossiblyUndefinedVariable>
+    <PossiblyUnusedMethod occurrences="11">
+      <code>abs</code>
+      <code>between</code>
+      <code>bitwise_leftRotate</code>
+      <code>bitwise_not</code>
+      <code>bitwise_split</code>
+      <code>extendedGCD</code>
+      <code>getEngine</code>
+      <code>jsonSerialize</code>
+      <code>max</code>
+      <code>min</code>
+      <code>root</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedParam occurrences="1">
+      <code>$bits</code>
+    </PossiblyUnusedParam>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>$hex</code>
+      <code>$precision</code>
+    </PropertyNotSetInConstructor>
+    <RedundantPropertyInitializationCheck occurrences="1">
+      <code>isset(self::$mainEngine)</code>
+    </RedundantPropertyInitializationCheck>
+    <UndefinedMethod occurrences="5">
+      <code>$class::max(...$nums)</code>
+      <code>$class::min(...$nums)</code>
+      <code>$class::randomRange($min-&gt;value, $max-&gt;value)</code>
+      <code>$class::randomRangePrime($min-&gt;value, $max-&gt;value)</code>
+      <code>$class::scan1divide($r-&gt;value)</code>
+    </UndefinedMethod>
+    <UnsafeInstantiation occurrences="37">
+      <code>new self::$mainEngine($x, $base)</code>
+      <code>new static("$x")</code>
+      <code>new static($class::max(...$nums))</code>
+      <code>new static($class::min(...$nums))</code>
+      <code>new static($class::random($size))</code>
+      <code>new static($class::randomPrime($size))</code>
+      <code>new static($class::randomRange($min-&gt;value, $max-&gt;value))</code>
+      <code>new static($class::randomRangePrime($min-&gt;value, $max-&gt;value))</code>
+      <code>new static($func($x-&gt;value))</code>
+      <code>new static($gcd)</code>
+      <code>new static($max)</code>
+      <code>new static($min)</code>
+      <code>new static($q)</code>
+      <code>new static($r)</code>
+      <code>new static($this-&gt;hex, -16)</code>
+      <code>new static($this-&gt;value-&gt;abs())</code>
+      <code>new static($this-&gt;value-&gt;add($y-&gt;value))</code>
+      <code>new static($this-&gt;value-&gt;bitwise_and($x-&gt;value))</code>
+      <code>new static($this-&gt;value-&gt;bitwise_leftRotate($shift))</code>
+      <code>new static($this-&gt;value-&gt;bitwise_leftShift($shift))</code>
+      <code>new static($this-&gt;value-&gt;bitwise_not())</code>
+      <code>new static($this-&gt;value-&gt;bitwise_or($x-&gt;value))</code>
+      <code>new static($this-&gt;value-&gt;bitwise_rightRotate($shift))</code>
+      <code>new static($this-&gt;value-&gt;bitwise_rightShift($shift))</code>
+      <code>new static($this-&gt;value-&gt;bitwise_xor($x-&gt;value))</code>
+      <code>new static($this-&gt;value-&gt;gcd($n-&gt;value))</code>
+      <code>new static($this-&gt;value-&gt;modInverse($n-&gt;value))</code>
+      <code>new static($this-&gt;value-&gt;modPow($e-&gt;value, $n-&gt;value))</code>
+      <code>new static($this-&gt;value-&gt;multiply($x-&gt;value))</code>
+      <code>new static($this-&gt;value-&gt;negate())</code>
+      <code>new static($this-&gt;value-&gt;pow($n-&gt;value))</code>
+      <code>new static($this-&gt;value-&gt;powMod($e-&gt;value, $n-&gt;value))</code>
+      <code>new static($this-&gt;value-&gt;root($n))</code>
+      <code>new static($this-&gt;value-&gt;subtract($y-&gt;value))</code>
+      <code>new static($val)</code>
+      <code>new static($x)</code>
+      <code>new static($y)</code>
+    </UnsafeInstantiation>
+  </file>
+  <file src="../phpseclib/Math/BigInteger/Engines/BCMath.php">
+    <FalsableReturnStatement occurrences="2">
+      <code>$this-&gt;powModOuter($e, $n)</code>
+      <code>$this-&gt;powModOuter($e, $n)</code>
+    </FalsableReturnStatement>
+    <InvalidArgument occurrences="31">
+      <code>$current</code>
+      <code>$current</code>
+      <code>$current</code>
+      <code>$n-&gt;value</code>
+      <code>$r_value</code>
+      <code>$result-&gt;bitmask-&gt;value</code>
+      <code>$result-&gt;value</code>
+      <code>$temp</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$u</code>
+      <code>$v</code>
+      <code>$v</code>
+      <code>$v</code>
+      <code>$x-&gt;value</code>
+      <code>$y-&gt;value</code>
+      <code>$y-&gt;value</code>
+      <code>$y-&gt;value</code>
+      <code>$y-&gt;value</code>
+      <code>$y-&gt;value</code>
+      <code>$y-&gt;value[0] == '-' ? substr($y-&gt;value, 1) : $y-&gt;value</code>
+    </InvalidArgument>
+    <InvalidFalsableReturnType occurrences="2">
+      <code>BCMath</code>
+      <code>BCMath</code>
+    </InvalidFalsableReturnType>
+    <LessSpecificReturnStatement occurrences="9">
+      <code>$temp-&gt;add(static::$one[static::class])</code>
+      <code>$this-&gt;bitwiseAndHelper($x)</code>
+      <code>$this-&gt;bitwiseXorHelper($x)</code>
+      <code>$this-&gt;bitwiseXorHelper($x)</code>
+      <code>[$this-&gt;normalize($quotient), $this-&gt;normalize($remainder)]</code>
+      <code>self::maxHelper($nums)</code>
+      <code>self::minHelper($nums)</code>
+      <code>self::randomRangeHelper($min, $max)</code>
+    </LessSpecificReturnStatement>
+    <MissingParamType occurrences="1">
+      <code>$x</code>
+    </MissingParamType>
+    <MixedArgument occurrences="3">
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x + 1</code>
+    </MixedArgument>
+    <MixedInferredReturnType occurrences="1">
+      <code>BCMath</code>
+    </MixedInferredReturnType>
+    <MixedOperand occurrences="4">
+      <code>$r_value[-1]</code>
+      <code>$this-&gt;value[-1]</code>
+      <code>$this-&gt;value[-1]</code>
+      <code>$x</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="1">
+      <code>$class::powModHelper($this, $e, $n, static::class)</code>
+    </MixedReturnStatement>
+    <MoreSpecificReturnType occurrences="9">
+      <code>BCMath</code>
+      <code>BCMath</code>
+      <code>BCMath</code>
+      <code>BCMath</code>
+      <code>BCMath</code>
+      <code>BCMath</code>
+      <code>Engine</code>
+      <code>array{gcd: static, x: static, y: static}</code>
+      <code>array{static, static}</code>
+    </MoreSpecificReturnType>
+    <PossiblyInvalidArgument occurrences="14">
+      <code>$current</code>
+      <code>$temp &gt;&gt; 16</code>
+      <code>$temp &gt;&gt; 8</code>
+      <code>$temp-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$x</code>
+      <code>$y-&gt;value</code>
+    </PossiblyInvalidArgument>
+    <PossiblyInvalidArrayAccess occurrences="8">
+      <code>$current[0]</code>
+      <code>$r_value[-1]</code>
+      <code>$temp-&gt;value[0]</code>
+      <code>$this-&gt;value[-1]</code>
+      <code>$this-&gt;value[-1]</code>
+      <code>$this-&gt;value[0]</code>
+      <code>$this-&gt;value[0]</code>
+      <code>$y-&gt;value[0]</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyInvalidCast occurrences="35">
+      <code>$current</code>
+      <code>$current</code>
+      <code>$current</code>
+      <code>$current</code>
+      <code>$n-&gt;value</code>
+      <code>$r_value</code>
+      <code>$result-&gt;bitmask-&gt;value</code>
+      <code>$result-&gt;value</code>
+      <code>$temp</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$u</code>
+      <code>$v</code>
+      <code>$v</code>
+      <code>$x</code>
+      <code>$x-&gt;value</code>
+      <code>$y-&gt;value</code>
+      <code>$y-&gt;value</code>
+      <code>$y-&gt;value</code>
+      <code>$y-&gt;value</code>
+      <code>$y-&gt;value</code>
+      <code>$y-&gt;value[0] == '-' ? substr($y-&gt;value, 1) : $y-&gt;value</code>
+    </PossiblyInvalidCast>
+    <PossiblyNullArgument occurrences="2">
+      <code>$remainder-&gt;value</code>
+      <code>bcmod($this-&gt;value, bcpow('2', $x + 1, 0))</code>
+    </PossiblyNullArgument>
+    <PossiblyNullArrayAccess occurrences="1">
+      <code>$remainder-&gt;value[0]</code>
+    </PossiblyNullArrayAccess>
+    <PossiblyNullOperand occurrences="2">
+      <code>$temp</code>
+      <code>$temp</code>
+    </PossiblyNullOperand>
+    <PossiblyNullPropertyAssignmentValue occurrences="2">
+      <code>bcmod($result-&gt;value, $result-&gt;bitmask-&gt;value)</code>
+      <code>bcmod($this-&gt;value, $y-&gt;value)</code>
+    </PossiblyNullPropertyAssignmentValue>
+    <PossiblyUndefinedIntArrayOffset occurrences="8">
+      <code>$current[0]</code>
+      <code>$r_value[-1]</code>
+      <code>$temp-&gt;value[0]</code>
+      <code>$this-&gt;value[-1]</code>
+      <code>$this-&gt;value[-1]</code>
+      <code>$this-&gt;value[0]</code>
+      <code>$this-&gt;value[0]</code>
+      <code>$y-&gt;value[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUnusedMethod occurrences="29">
+      <code>abs</code>
+      <code>between</code>
+      <code>bitwise_and</code>
+      <code>bitwise_leftShift</code>
+      <code>bitwise_or</code>
+      <code>bitwise_rightShift</code>
+      <code>bitwise_xor</code>
+      <code>divide</code>
+      <code>equals</code>
+      <code>gcd</code>
+      <code>isNegative</code>
+      <code>make_odd</code>
+      <code>max</code>
+      <code>min</code>
+      <code>modInverse</code>
+      <code>modPow</code>
+      <code>multiply</code>
+      <code>negate</code>
+      <code>pow</code>
+      <code>powMod</code>
+      <code>powModInner</code>
+      <code>randomRange</code>
+      <code>randomRangePrime</code>
+      <code>scan1divide</code>
+      <code>subtract</code>
+      <code>testBit</code>
+      <code>testSmallPrimes</code>
+      <code>toBytes</code>
+      <code>toString</code>
+    </PossiblyUnusedMethod>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>BCMath</code>
+      <code>BCMath</code>
+    </PropertyNotSetInConstructor>
+    <PropertyTypeCoercion occurrences="1">
+      <code>$this-&gt;bitmask</code>
+    </PropertyTypeCoercion>
+    <UndefinedMethod occurrences="9">
+      <code>$class::powModHelper($this, $e, $n, static::class)</code>
+      <code>$current</code>
+      <code>$r_value</code>
+      <code>$temp-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$y-&gt;value</code>
+    </UndefinedMethod>
+    <UnsafeInstantiation occurrences="6">
+      <code>new static($a)</code>
+      <code>new static($b)</code>
+      <code>new static($u)</code>
+      <code>new static()</code>
+      <code>new static()</code>
+      <code>new static()</code>
+    </UnsafeInstantiation>
+    <UnusedVariable occurrences="1">
+      <code>$value</code>
+    </UnusedVariable>
+  </file>
+  <file src="../phpseclib/Math/BigInteger/Engines/BCMath/Base.php">
+    <ArgumentTypeCoercion occurrences="7">
+      <code>$class</code>
+      <code>$temp</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$y</code>
+      <code>static::slidingWindow($x, $e, $n, $class)</code>
+    </ArgumentTypeCoercion>
+    <InvalidStringClass occurrences="1">
+      <code>new $class()</code>
+    </InvalidStringClass>
+    <MixedInferredReturnType occurrences="3">
+      <code>string</code>
+      <code>string</code>
+      <code>string</code>
+    </MixedInferredReturnType>
+    <MixedReturnStatement occurrences="3">
+      <code>static::reduce($x, $n)</code>
+      <code>static::reduce(bcmul($x, $x), $n)</code>
+      <code>static::reduce(bcmul($x, $y), $n)</code>
+    </MixedReturnStatement>
+    <PossiblyUnusedMethod occurrences="3">
+      <code>multiplyReduce</code>
+      <code>prepareReduce</code>
+      <code>squareReduce</code>
+    </PossiblyUnusedMethod>
+    <UndefinedMethod occurrences="3">
+      <code>static::reduce($x, $n)</code>
+      <code>static::reduce(bcmul($x, $x), $n)</code>
+      <code>static::reduce(bcmul($x, $y), $n)</code>
+    </UndefinedMethod>
+  </file>
+  <file src="../phpseclib/Math/BigInteger/Engines/BCMath/BuiltIn.php">
+    <InvalidArgument occurrences="3">
+      <code>$e-&gt;value</code>
+      <code>$n-&gt;value</code>
+      <code>$x-&gt;value</code>
+    </InvalidArgument>
+    <PossiblyFalsePropertyAssignmentValue occurrences="1">
+      <code>bcpowmod($x-&gt;value, $e-&gt;value, $n-&gt;value)</code>
+    </PossiblyFalsePropertyAssignmentValue>
+    <PossiblyInvalidCast occurrences="3">
+      <code>$e-&gt;value</code>
+      <code>$n-&gt;value</code>
+      <code>$x-&gt;value</code>
+    </PossiblyInvalidCast>
+    <UnusedClass occurrences="1">
+      <code>BuiltIn</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Math/BigInteger/Engines/BCMath/OpenSSL.php">
+    <UnusedClass occurrences="1">
+      <code>OpenSSL</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Math/BigInteger/Engines/BCMath/Reductions/Barrett.php">
+    <ArgumentTypeCoercion occurrences="23">
+      <code>$lhs</code>
+      <code>$lhs</code>
+      <code>$lhs</code>
+      <code>$lsd</code>
+      <code>$m</code>
+      <code>$m</code>
+      <code>$m</code>
+      <code>$msd</code>
+      <code>$n</code>
+      <code>$n</code>
+      <code>$n</code>
+      <code>$n</code>
+      <code>$n</code>
+      <code>$n</code>
+      <code>$q</code>
+      <code>$r1</code>
+      <code>$r2</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$x</code>
+    </ArgumentTypeCoercion>
+    <InvalidNullableReturnType occurrences="2">
+      <code>string</code>
+      <code>string</code>
+    </InvalidNullableReturnType>
+    <MixedArgument occurrences="16">
+      <code>$cache[self::DATA][$key]</code>
+      <code>$cache[self::DATA][$key]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$m</code>
+      <code>$m</code>
+      <code>$m</code>
+      <code>$m1</code>
+      <code>$m_length + 1</code>
+      <code>$n</code>
+      <code>$u</code>
+      <code>-$cutoff</code>
+      <code>-$cutoff</code>
+      <code>-($m_length &gt;&gt; 1) - 1</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="10">
+      <code>$cache[self::DATA]</code>
+      <code>$cache[self::DATA]</code>
+      <code>$cache[self::DATA]</code>
+      <code>$cache[self::DATA]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="4">
+      <code>$cache[self::DATA]</code>
+      <code>$cache[self::DATA]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+    </MixedArrayAssignment>
+    <MixedArrayOffset occurrences="2">
+      <code>$cache[self::DATA][$key]</code>
+      <code>$cache[self::DATA][$key]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="3">
+      <code>$cutoff</code>
+      <code>$key</code>
+      <code>$key</code>
+    </MixedAssignment>
+    <MixedOperand occurrences="4">
+      <code>$m_length</code>
+      <code>$m_length</code>
+      <code>$m_length</code>
+      <code>-($m_length &gt;&gt; 1)</code>
+    </MixedOperand>
+    <NullableReturnStatement occurrences="2">
+      <code>bcmod($n, $m)</code>
+      <code>bcmod($x, $n)</code>
+    </NullableReturnStatement>
+    <PossiblyUndefinedVariable occurrences="2">
+      <code>$m1</code>
+      <code>$u</code>
+    </PossiblyUndefinedVariable>
+    <PossiblyUnusedMethod occurrences="1">
+      <code>reduce</code>
+    </PossiblyUnusedMethod>
+    <UnusedVariable occurrences="1">
+      <code>$key</code>
+    </UnusedVariable>
+  </file>
+  <file src="../phpseclib/Math/BigInteger/Engines/BCMath/Reductions/EvalBarrett.php">
+    <ArgumentTypeCoercion occurrences="2">
+      <code>$lhs</code>
+      <code>$lhs</code>
+    </ArgumentTypeCoercion>
+    <ImplicitToStringCast occurrences="1">
+      <code>$m</code>
+    </ImplicitToStringCast>
+    <InvalidArgument occurrences="2">
+      <code>$m</code>
+      <code>$m</code>
+    </InvalidArgument>
+    <MissingPropertyType occurrences="1">
+      <code>$custom_reduction</code>
+    </MissingPropertyType>
+    <MixedAssignment occurrences="3">
+      <code>$inline</code>
+      <code>self::$custom_reduction</code>
+      <code>self::$custom_reduction</code>
+    </MixedAssignment>
+    <MixedFunctionCall occurrences="1">
+      <code>$inline($n)</code>
+    </MixedFunctionCall>
+    <MixedInferredReturnType occurrences="2">
+      <code>callable|void</code>
+      <code>string</code>
+    </MixedInferredReturnType>
+    <MixedReturnStatement occurrences="2">
+      <code>$func</code>
+      <code>$inline($n)</code>
+    </MixedReturnStatement>
+    <UnusedClass occurrences="1">
+      <code>EvalBarrett</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Math/BigInteger/Engines/Engine.php">
+    <ArgumentTypeCoercion occurrences="16">
+      <code>$fqengine</code>
+      <code>$leading_ones | $temp</code>
+      <code>$left &amp; $right</code>
+      <code>$left ^ $right</code>
+      <code>$left | $right</code>
+      <code>$max</code>
+      <code>$min</code>
+      <code>$temp</code>
+      <code>$this-&gt;hex</code>
+      <code>Random::string($size)</code>
+      <code>Random::string(1)</code>
+      <code>Strings::bits2bin($x)</code>
+      <code>chr((1 &lt;&lt; ($bits &amp; 0x7)) - 1) . str_repeat(chr(0xFF), $bits &gt;&gt; 3)</code>
+      <code>chr(1) . str_repeat("\0", $size)</code>
+      <code>new static('-1')</code>
+      <code>new static('-1')</code>
+    </ArgumentTypeCoercion>
+    <InvalidArrayAccess occurrences="3">
+      <code>$x[0]</code>
+      <code>$x[0]</code>
+      <code>$x[0]</code>
+    </InvalidArrayAccess>
+    <InvalidPropertyAssignmentValue occurrences="2">
+      <code>static::$zero</code>
+      <code>static::$zero</code>
+    </InvalidPropertyAssignmentValue>
+    <InvalidScalarArgument occurrences="4">
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+    </InvalidScalarArgument>
+    <InvalidStringClass occurrences="1">
+      <code>$fqengine::generateCustomReduction($this, static::class)</code>
+    </InvalidStringClass>
+    <LessSpecificReturnStatement occurrences="3">
+      <code>$min-&gt;isPrime() ? $min : false</code>
+      <code>$x</code>
+    </LessSpecificReturnStatement>
+    <MixedArgument occurrences="20">
+      <code>$bits</code>
+      <code>$bits[0]</code>
+      <code>$bytes</code>
+      <code>$hex</code>
+      <code>$left</code>
+      <code>$left</code>
+      <code>$left</code>
+      <code>$mask</code>
+      <code>$max-&gt;toBytes()</code>
+      <code>$right</code>
+      <code>$right</code>
+      <code>$right</code>
+      <code>$temp</code>
+      <code>$temp[0]</code>
+      <code>$temp[0]</code>
+      <code>$this-&gt;toBytes($twos_compliment)</code>
+      <code>$this-&gt;toBytes()</code>
+      <code>$window_ranges</code>
+      <code>$x</code>
+      <code>$x[0]</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="11">
+      <code>$bits[0]</code>
+      <code>$g-&gt;divide(static::$two[static::class])[0]</code>
+      <code>$max_multiple</code>
+      <code>$max_multiple</code>
+      <code>$og-&gt;subtract($g)-&gt;divide(static::$two[static::class])[0]</code>
+      <code>$q</code>
+      <code>$random</code>
+      <code>$step-&gt;divide(static::$two[static::class])[0]</code>
+      <code>$temp[0]</code>
+      <code>$temp[0]</code>
+      <code>$window_ranges[$i]</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="1">
+      <code>$temp[0]</code>
+    </MixedArrayAssignment>
+    <MixedAssignment occurrences="92">
+      <code>$a</code>
+      <code>$a</code>
+      <code>$b</code>
+      <code>$bits</code>
+      <code>$bytes</code>
+      <code>$c</code>
+      <code>$comp</code>
+      <code>$compare</code>
+      <code>$compare</code>
+      <code>$comparison</code>
+      <code>$d</code>
+      <code>$e</code>
+      <code>$func</code>
+      <code>$g</code>
+      <code>$g</code>
+      <code>$g</code>
+      <code>$g</code>
+      <code>$g</code>
+      <code>$g</code>
+      <code>$guess</code>
+      <code>$hex</code>
+      <code>$left</code>
+      <code>$left</code>
+      <code>$left</code>
+      <code>$left</code>
+      <code>$left</code>
+      <code>$mask</code>
+      <code>$mask</code>
+      <code>$mask</code>
+      <code>$mask</code>
+      <code>$max</code>
+      <code>$max</code>
+      <code>$max</code>
+      <code>$max_multiple</code>
+      <code>$max_multiple</code>
+      <code>$min</code>
+      <code>$min</code>
+      <code>$n</code>
+      <code>$n</code>
+      <code>$n_1</code>
+      <code>$n_2</code>
+      <code>$num</code>
+      <code>$og</code>
+      <code>$powers[$i2 + 1]</code>
+      <code>$powers[1]</code>
+      <code>$powers[2]</code>
+      <code>$r</code>
+      <code>$random</code>
+      <code>$random</code>
+      <code>$random</code>
+      <code>$random_max</code>
+      <code>$random_max</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$right</code>
+      <code>$right</code>
+      <code>$right</code>
+      <code>$right</code>
+      <code>$root</code>
+      <code>$root</code>
+      <code>$root</code>
+      <code>$s</code>
+      <code>$step</code>
+      <code>$step</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$u</code>
+      <code>$v</code>
+      <code>$vals[]</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>[$max_multiple]</code>
+      <code>[$max_multiple]</code>
+      <code>[$q]</code>
+      <code>[, $random]</code>
+    </MixedAssignment>
+    <MixedClone occurrences="1">
+      <code>clone $n_1</code>
+    </MixedClone>
+    <MixedInferredReturnType occurrences="15">
+      <code>Engine</code>
+      <code>Engine</code>
+      <code>Engine</code>
+      <code>Engine</code>
+      <code>Engine</code>
+      <code>Engine</code>
+      <code>Engine</code>
+      <code>Engine</code>
+      <code>Engine</code>
+      <code>Engine</code>
+      <code>Engine|string</code>
+      <code>\Closure</code>
+      <code>static|false</code>
+      <code>static|false</code>
+      <code>static|false</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="59">
+      <code>$fqengine::isValidEngine()</code>
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>bitwise_and</code>
+      <code>bitwise_and</code>
+      <code>bitwise_leftShift</code>
+      <code>bitwise_leftShift</code>
+      <code>bitwise_or</code>
+      <code>bitwise_rightShift</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>divide</code>
+      <code>divide</code>
+      <code>divide</code>
+      <code>divide</code>
+      <code>divide</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>isPrime</code>
+      <code>modInverse</code>
+      <code>modPow</code>
+      <code>modPow</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>pow</code>
+      <code>pow</code>
+      <code>pow</code>
+      <code>powModInner</code>
+      <code>subtract</code>
+      <code>subtract</code>
+      <code>subtract</code>
+      <code>subtract</code>
+      <code>subtract</code>
+      <code>subtract</code>
+      <code>subtract</code>
+      <code>subtract</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="2">
+      <code>static::ENGINE_DIR</code>
+      <code>static::ENGINE_DIR</code>
+    </MixedOperand>
+    <MixedPropertyFetch occurrences="3">
+      <code>$temp-&gt;value</code>
+      <code>$temp-&gt;value</code>
+      <code>$temp-&gt;value</code>
+    </MixedPropertyFetch>
+    <MixedReturnStatement occurrences="24">
+      <code>$max</code>
+      <code>$min</code>
+      <code>$nums[0]</code>
+      <code>$nums[0]</code>
+      <code>$random-&gt;add($min)</code>
+      <code>$this-&gt;compare(static::$zero[static::class]) &lt; 0 ? $this-&gt;normalize($n-&gt;subtract($x)) : $this-&gt;normalize($x)</code>
+      <code>$this-&gt;normalize($n-&gt;subtract($temp))</code>
+      <code>$this-&gt;normalize($result)</code>
+      <code>$this-&gt;normalize($root)</code>
+      <code>$this-&gt;normalize($root)</code>
+      <code>$this-&gt;normalize($temp-&gt;powModInner($e, $n))</code>
+      <code>$this-&gt;normalize(new static($leading_ones | $temp, 256))</code>
+      <code>$this-&gt;normalize(new static($left &amp; $right, -256))</code>
+      <code>$this-&gt;normalize(new static($left ^ $right, -256))</code>
+      <code>$this-&gt;normalize(new static($left | $right, -256))</code>
+      <code>$this-&gt;normalize(new static($temp, 256))</code>
+      <code>$this-&gt;normalize(static::$zero[static::class])</code>
+      <code>$this-&gt;powModInner($e, $n)</code>
+      <code>$this-&gt;toString()</code>
+      <code>$x</code>
+      <code>static::randomRange($min, $max)</code>
+      <code>static::randomRangePrime($min, $max)</code>
+    </MixedReturnStatement>
+    <MixedReturnTypeCoercion occurrences="2">
+      <code>Engine[]</code>
+      <code>array_reverse($vals)</code>
+    </MixedReturnTypeCoercion>
+    <MoreSpecificReturnType occurrences="1">
+      <code>array{gcd: Engine, x: Engine, y: Engine}</code>
+    </MoreSpecificReturnType>
+    <PossiblyFalseArgument occurrences="1">
+      <code>strpos($msb, '0')</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalseReference occurrences="2">
+      <code>subtract</code>
+      <code>toBytes</code>
+    </PossiblyFalseReference>
+    <PossiblyInvalidArgument occurrences="4">
+      <code>$t</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>bindec($msb)</code>
+    </PossiblyInvalidArgument>
+    <PossiblyInvalidArrayOffset occurrences="1">
+      <code>$powers[bindec(substr($e_bits, $i, $j + 1))]</code>
+    </PossiblyInvalidArrayOffset>
+    <PossiblyNullArgument occurrences="4">
+      <code>$this-&gt;value</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x[0]</code>
+    </PossiblyNullArgument>
+    <PossiblyNullArrayAccess occurrences="1">
+      <code>$x[0]</code>
+    </PossiblyNullArrayAccess>
+    <PossiblyNullPropertyAssignmentValue occurrences="2">
+      <code>$x</code>
+      <code>preg_replace('#(?&lt;!^)-.*|(?&lt;=^|-)0*|[^-0-9].*#', '', (string) $x)</code>
+    </PossiblyNullPropertyAssignmentValue>
+    <PossiblyUndefinedIntArrayOffset occurrences="4">
+      <code>$nums[0]</code>
+      <code>$nums[0]</code>
+      <code>$nums[0]</code>
+      <code>$nums[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedMethod occurrences="14">
+      <code>add</code>
+      <code>bitwise_and</code>
+      <code>bitwise_rightShift</code>
+      <code>compare</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>pow</code>
+      <code>subtract</code>
+      <code>subtract</code>
+    </PossiblyUndefinedMethod>
+    <PossiblyUndefinedVariable occurrences="1">
+      <code>$comp</code>
+    </PossiblyUndefinedVariable>
+    <PossiblyUnusedMethod occurrences="7">
+      <code>bitwise_not</code>
+      <code>bitwise_rightRotate</code>
+      <code>bitwise_split</code>
+      <code>createRecurringModuloFunction</code>
+      <code>getLength</code>
+      <code>jsonSerialize</code>
+      <code>root</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedParam occurrences="3">
+      <code>$n</code>
+      <code>$size</code>
+      <code>$size</code>
+    </PossiblyUnusedParam>
+    <PossiblyUnusedProperty occurrences="1">
+      <code>$reduce</code>
+    </PossiblyUnusedProperty>
+    <PropertyNotSetInConstructor occurrences="3">
+      <code>$hex</code>
+      <code>$reduce</code>
+      <code>$value</code>
+    </PropertyNotSetInConstructor>
+    <PropertyTypeCoercion occurrences="1">
+      <code>static::$modexpEngine</code>
+    </PropertyTypeCoercion>
+    <UndefinedConstant occurrences="4">
+      <code>static::ENGINE_DIR</code>
+      <code>static::ENGINE_DIR</code>
+      <code>static::FAST_BITWISE</code>
+      <code>static::FAST_BITWISE</code>
+    </UndefinedConstant>
+    <UndefinedMethod occurrences="78">
+      <code>abs</code>
+      <code>abs</code>
+      <code>abs</code>
+      <code>abs</code>
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>add</code>
+      <code>bitwise_leftShift</code>
+      <code>bitwise_leftShift</code>
+      <code>bitwise_rightShift</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>divide</code>
+      <code>divide</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>extendedGCD</code>
+      <code>initialize</code>
+      <code>initialize</code>
+      <code>initialize</code>
+      <code>make_odd</code>
+      <code>make_odd</code>
+      <code>make_odd</code>
+      <code>modInverse</code>
+      <code>normalize</code>
+      <code>normalize</code>
+      <code>normalize</code>
+      <code>normalize</code>
+      <code>normalize</code>
+      <code>normalize</code>
+      <code>normalize</code>
+      <code>normalize</code>
+      <code>normalize</code>
+      <code>normalize</code>
+      <code>normalize</code>
+      <code>normalize</code>
+      <code>normalize</code>
+      <code>normalize</code>
+      <code>powModInner</code>
+      <code>static::randomRange($min, $max)</code>
+      <code>static::randomRange($min, $max)</code>
+      <code>static::randomRange(static::$two[static::class], $n_2)</code>
+      <code>static::randomRangePrime($min, $max)</code>
+      <code>static::scan1divide($r)</code>
+      <code>subtract</code>
+      <code>subtract</code>
+      <code>subtract</code>
+      <code>subtract</code>
+      <code>subtract</code>
+      <code>subtract</code>
+      <code>subtract</code>
+      <code>subtract</code>
+      <code>testSmallPrimes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toString</code>
+    </UndefinedMethod>
+    <UnsafeInstantiation occurrences="31">
+      <code>new $class()</code>
+      <code>new $class(1)</code>
+      <code>new static($leading_ones | $temp, 256)</code>
+      <code>new static($left &amp; $right, -256)</code>
+      <code>new static($left ^ $right, -256)</code>
+      <code>new static($left | $right, -256)</code>
+      <code>new static($mask, 256)</code>
+      <code>new static($max, 256)</code>
+      <code>new static($min, 256)</code>
+      <code>new static($n)</code>
+      <code>new static($temp, 256)</code>
+      <code>new static($this-&gt;hex, -16)</code>
+      <code>new static('-1')</code>
+      <code>new static('-1')</code>
+      <code>new static('2')</code>
+      <code>new static()</code>
+      <code>new static()</code>
+      <code>new static()</code>
+      <code>new static()</code>
+      <code>new static(0)</code>
+      <code>new static(1)</code>
+      <code>new static(1)</code>
+      <code>new static(1)</code>
+      <code>new static(1)</code>
+      <code>new static(1)</code>
+      <code>new static(2)</code>
+      <code>new static(Random::string($size), 256)</code>
+      <code>new static(Random::string(1), 256)</code>
+      <code>new static(Strings::bits2bin($x), 128 * $base)</code>
+      <code>new static(chr((1 &lt;&lt; ($bits &amp; 0x7)) - 1) . str_repeat(chr(0xFF), $bits &gt;&gt; 3), 256)</code>
+      <code>new static(chr(1) . str_repeat("\0", $size), 256)</code>
+    </UnsafeInstantiation>
+    <UnusedVariable occurrences="1">
+      <code>$root</code>
+    </UnusedVariable>
+  </file>
+  <file src="../phpseclib/Math/BigInteger/Engines/GMP.php">
+    <ArgumentTypeCoercion occurrences="2">
+      <code>$min</code>
+      <code>$x</code>
+    </ArgumentTypeCoercion>
+    <FalsableReturnStatement occurrences="3">
+      <code>$this-&gt;powModOuter($e, $n)</code>
+      <code>$this-&gt;powModOuter($e, $n)</code>
+      <code>self::randomRangePrime($min, $x)</code>
+    </FalsableReturnStatement>
+    <InvalidFalsableReturnType occurrences="3">
+      <code>GMP</code>
+      <code>GMP</code>
+      <code>GMP</code>
+    </InvalidFalsableReturnType>
+    <InvalidOperand occurrences="5">
+      <code>$this-&gt;value * $x-&gt;value</code>
+      <code>$this-&gt;value ** $n-&gt;value</code>
+      <code>$this-&gt;value + $y-&gt;value</code>
+      <code>$this-&gt;value - $y-&gt;value</code>
+      <code>$x-&gt;value % $temp</code>
+    </InvalidOperand>
+    <LessSpecificImplementedReturnType occurrences="1">
+      <code>GMP</code>
+    </LessSpecificImplementedReturnType>
+    <LessSpecificReturnStatement occurrences="3">
+      <code>self::maxHelper($nums)</code>
+      <code>self::minHelper($nums)</code>
+      <code>self::randomRangeHelper($min, $max)</code>
+    </LessSpecificReturnStatement>
+    <MissingParamType occurrences="1">
+      <code>$x</code>
+    </MissingParamType>
+    <MixedArgument occurrences="3">
+      <code>$this-&gt;value ?? '0'</code>
+      <code>$x</code>
+      <code>$x</code>
+    </MixedArgument>
+    <MixedInferredReturnType occurrences="1">
+      <code>GMP</code>
+    </MixedInferredReturnType>
+    <MixedReturnStatement occurrences="1">
+      <code>$class::powModHelper($this, $e, $n)</code>
+    </MixedReturnStatement>
+    <MoreSpecificReturnType occurrences="3">
+      <code>GMP</code>
+      <code>GMP</code>
+      <code>GMP</code>
+    </MoreSpecificReturnType>
+    <PossiblyFalseArgument occurrences="2">
+      <code>$temp</code>
+      <code>$temp</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalsePropertyAssignmentValue occurrences="2">
+      <code>gmp_import($this-&gt;value)</code>
+      <code>gmp_invert($this-&gt;value, $n-&gt;value)</code>
+    </PossiblyFalsePropertyAssignmentValue>
+    <PossiblyInvalidArgument occurrences="24">
+      <code>$n-&gt;value</code>
+      <code>$n-&gt;value</code>
+      <code>$n-&gt;value</code>
+      <code>$r-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value ?? '0'</code>
+      <code>$x-&gt;value</code>
+      <code>$y-&gt;value</code>
+      <code>$y-&gt;value</code>
+      <code>$y-&gt;value</code>
+    </PossiblyInvalidArgument>
+    <PossiblyInvalidCast occurrences="2">
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+    </PossiblyInvalidCast>
+    <PossiblyInvalidOperand occurrences="18">
+      <code>$n-&gt;value</code>
+      <code>$r-&gt;value</code>
+      <code>$s</code>
+      <code>$shift</code>
+      <code>$shift</code>
+      <code>$temp</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$x-&gt;value</code>
+      <code>$x-&gt;value</code>
+      <code>$x-&gt;value</code>
+      <code>$y-&gt;value</code>
+      <code>$y-&gt;value</code>
+      <code>1</code>
+    </PossiblyInvalidOperand>
+    <PossiblyInvalidPropertyAssignmentValue occurrences="3">
+      <code>-$result-&gt;value</code>
+      <code>-$result-&gt;value</code>
+      <code>-$this-&gt;value</code>
+    </PossiblyInvalidPropertyAssignmentValue>
+    <PossiblyUnusedMethod occurrences="29">
+      <code>abs</code>
+      <code>between</code>
+      <code>bitwise_and</code>
+      <code>bitwise_leftShift</code>
+      <code>bitwise_or</code>
+      <code>bitwise_rightShift</code>
+      <code>bitwise_xor</code>
+      <code>divide</code>
+      <code>equals</code>
+      <code>extendedGCD</code>
+      <code>gcd</code>
+      <code>isNegative</code>
+      <code>isOdd</code>
+      <code>make_odd</code>
+      <code>max</code>
+      <code>min</code>
+      <code>modInverse</code>
+      <code>modPow</code>
+      <code>multiply</code>
+      <code>negate</code>
+      <code>pow</code>
+      <code>powMod</code>
+      <code>powModInner</code>
+      <code>randomRange</code>
+      <code>scan1divide</code>
+      <code>subtract</code>
+      <code>testBit</code>
+      <code>toBytes</code>
+      <code>toString</code>
+    </PossiblyUnusedMethod>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>GMP</code>
+      <code>GMP</code>
+    </PropertyNotSetInConstructor>
+    <PropertyTypeCoercion occurrences="1">
+      <code>$this-&gt;bitmask</code>
+    </PropertyTypeCoercion>
+    <RedundantPropertyInitializationCheck occurrences="2">
+      <code>$this-&gt;value</code>
+      <code>'0'</code>
+    </RedundantPropertyInitializationCheck>
+    <UndefinedMethod occurrences="1">
+      <code>$class::powModHelper($this, $e, $n)</code>
+    </UndefinedMethod>
+    <UnsafeInstantiation occurrences="1">
+      <code>new static()</code>
+    </UnsafeInstantiation>
+  </file>
+  <file src="../phpseclib/Math/BigInteger/Engines/GMP/DefaultEngine.php">
+    <PossiblyInvalidArgument occurrences="3">
+      <code>$e-&gt;value</code>
+      <code>$n-&gt;value</code>
+      <code>$x-&gt;value</code>
+    </PossiblyInvalidArgument>
+    <UnusedClass occurrences="1">
+      <code>DefaultEngine</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Math/BigInteger/Engines/OpenSSL.php">
+    <MixedArgument occurrences="1">
+      <code>$x-&gt;toBytes()</code>
+    </MixedArgument>
+    <PossiblyFalseArgument occurrences="1">
+      <code>openssl_error_string()</code>
+    </PossiblyFalseArgument>
+    <PossiblyUnusedMethod occurrences="2">
+      <code>isValidEngine</code>
+      <code>powModHelper</code>
+    </PossiblyUnusedMethod>
+    <UndefinedMethod occurrences="1">
+      <code>toBytes</code>
+    </UndefinedMethod>
+    <UnsafeInstantiation occurrences="1">
+      <code>new $class($result, 256)</code>
+    </UnsafeInstantiation>
+  </file>
+  <file src="../phpseclib/Math/BigInteger/Engines/PHP.php">
+    <LessSpecificReturnStatement occurrences="3">
+      <code>$result</code>
+      <code>$result</code>
+      <code>$value</code>
+    </LessSpecificReturnStatement>
+    <MissingParamType occurrences="1">
+      <code>$x</code>
+    </MissingParamType>
+    <MixedArgument occurrences="32">
+      <code>$prime</code>
+      <code>$s</code>
+      <code>$temp</code>
+      <code>$temp-&gt;value</code>
+      <code>$temp[self::VALUE]</code>
+      <code>$temp[self::VALUE]</code>
+      <code>$temp[self::VALUE]</code>
+      <code>$temp_value</code>
+      <code>$temp_value</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x / static::BASE</code>
+      <code>$x-&gt;value</code>
+      <code>$x_value</code>
+      <code>$x_window[0] * static::BASE_FULL + $x_window[1]</code>
+      <code>$xx[self::SIGN]</code>
+      <code>$xx[self::VALUE]</code>
+      <code>$xy[self::SIGN]</code>
+      <code>$xy[self::VALUE]</code>
+      <code>$y-&gt;value[0]</code>
+      <code>$y_window[0]</code>
+      <code>$z1[self::SIGN]</code>
+      <code>$z1[self::SIGN]</code>
+      <code>$z1[self::VALUE]</code>
+      <code>$z1[self::VALUE]</code>
+      <code>$z1[self::VALUE]</code>
+      <code>$z1[self::VALUE]</code>
+      <code>static::MAX10LEN</code>
+      <code>static::MAX10LEN</code>
+      <code>static::MAX10LEN</code>
+      <code>strlen($x) + ((static::MAX10LEN - 1) * strlen($x)) % static::MAX10LEN</code>
+    </MixedArgument>
+    <MixedArgumentTypeCoercion occurrences="10">
+      <code>$digit</code>
+      <code>$this-&gt;value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$x_value</code>
+      <code>self::baseSquare($x)</code>
+      <code>self::karatsuba($x_value, $y_value)</code>
+      <code>self::karatsubaSquare($x)</code>
+      <code>self::regularMultiply($x_value, $y_value)</code>
+    </MixedArgumentTypeCoercion>
+    <MixedArrayAccess occurrences="5">
+      <code>$mod</code>
+      <code>$temp</code>
+      <code>$x_value[$i - 1]</code>
+      <code>$x_value[$i - 2]</code>
+      <code>$x_value[$i]</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="96">
+      <code>$bit</code>
+      <code>$carry</code>
+      <code>$carry</code>
+      <code>$carry</code>
+      <code>$carry</code>
+      <code>$carry</code>
+      <code>$carry</code>
+      <code>$carry_mask</code>
+      <code>$carry_shift</code>
+      <code>$diff</code>
+      <code>$digit</code>
+      <code>$digit</code>
+      <code>$digit[$j]</code>
+      <code>$digit[]</code>
+      <code>$digit[]</code>
+      <code>$lhs</code>
+      <code>$lhs</code>
+      <code>$mask</code>
+      <code>$mask</code>
+      <code>$msb</code>
+      <code>$msb</code>
+      <code>$n</code>
+      <code>$newbits</code>
+      <code>$overflow</code>
+      <code>$overflow</code>
+      <code>$overflow</code>
+      <code>$overflow</code>
+      <code>$prime</code>
+      <code>$product_value[$j]</code>
+      <code>$product_value[$k]</code>
+      <code>$quotient-&gt;value</code>
+      <code>$quotient_value[$q_index]</code>
+      <code>$quotient_value[$q_index]</code>
+      <code>$quotient_value[$q_index]</code>
+      <code>$quotient_value[$x_max - $y_max]</code>
+      <code>$remaining</code>
+      <code>$remaining</code>
+      <code>$remaining</code>
+      <code>$remaining</code>
+      <code>$remaining</code>
+      <code>$result-&gt;is_negative</code>
+      <code>$result-&gt;value</code>
+      <code>$rhs_value</code>
+      <code>$s</code>
+      <code>$shift</code>
+      <code>$shift</code>
+      <code>$shift</code>
+      <code>$square_value[$i + $max_index + 1]</code>
+      <code>$sum</code>
+      <code>$sum</code>
+      <code>$sum</code>
+      <code>$sum</code>
+      <code>$sum</code>
+      <code>$sum</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp_value</code>
+      <code>$tempmask</code>
+      <code>$tempmask</code>
+      <code>$tempoverflow</code>
+      <code>$tempsplit</code>
+      <code>$this-&gt;value</code>
+      <code>$val[$i]</code>
+      <code>$val[$i]</code>
+      <code>$vals[]</code>
+      <code>$value[$i]</code>
+      <code>$value[$i]</code>
+      <code>$value[$i]</code>
+      <code>$value[$j]</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x_value</code>
+      <code>$x_value[$i]</code>
+      <code>$x_value[$i]</code>
+      <code>$x_value[$i]</code>
+      <code>$x_value[$j]</code>
+      <code>[$temp, $mod]</code>
+      <code>static::$isValidEngine[static::class]</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="4">
+      <code>PHP</code>
+      <code>PHP</code>
+      <code>array</code>
+      <code>array</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="16">
+      <code>add</code>
+      <code>add</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>divide</code>
+      <code>equals</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>rshift</code>
+      <code>subtract</code>
+      <code>subtract</code>
+      <code>subtract</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="108">
+      <code>$bit</code>
+      <code>$digit</code>
+      <code>$digit[$j]</code>
+      <code>$digit[$j]</code>
+      <code>$mask</code>
+      <code>$msb</code>
+      <code>$msb</code>
+      <code>$overflow</code>
+      <code>$overflow</code>
+      <code>$overflow</code>
+      <code>$product_value[$k]</code>
+      <code>$quotient_value[$q_index]</code>
+      <code>$quotient_value[$q_index]</code>
+      <code>$quotient_value[$x_max - $y_max]</code>
+      <code>$remaining</code>
+      <code>$remaining</code>
+      <code>$remaining</code>
+      <code>$remaining</code>
+      <code>$remaining</code>
+      <code>$shift</code>
+      <code>$shift</code>
+      <code>$square_value[$i2]</code>
+      <code>$square_value[$k]</code>
+      <code>$sum</code>
+      <code>$sum</code>
+      <code>$sum</code>
+      <code>$sum</code>
+      <code>$sum</code>
+      <code>$sum</code>
+      <code>$sum</code>
+      <code>$sum</code>
+      <code>$sum</code>
+      <code>$sum</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$tempmask</code>
+      <code>$tempmask</code>
+      <code>$tempoverflow</code>
+      <code>$tempsplit</code>
+      <code>$tempsplit</code>
+      <code>$this-&gt;value[$digit]</code>
+      <code>$this-&gt;value[$i]</code>
+      <code>$this-&gt;value[$i]</code>
+      <code>$this-&gt;value[$i]</code>
+      <code>$this-&gt;value[0]</code>
+      <code>$this-&gt;value[0]</code>
+      <code>$val[$i]</code>
+      <code>$val[$i]</code>
+      <code>$val[$i] &amp; $tempmask</code>
+      <code>$value[$i]</code>
+      <code>$value[$i]</code>
+      <code>$value[$i]</code>
+      <code>$value[$j]</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x_value[$i]</code>
+      <code>$x_value[$i]</code>
+      <code>$x_value[$i]</code>
+      <code>$x_value[$j]</code>
+      <code>$x_value[$j]</code>
+      <code>$x_value[$j]</code>
+      <code>$x_value[$j]</code>
+      <code>$x_window[0] * static::BASE_FULL</code>
+      <code>($x_value[$j] + $y_value[$j]) * static::BASE_FULL</code>
+      <code>($x_value[$j] - $y_value[$j]) * static::BASE_FULL</code>
+      <code>((static::MAX10LEN - 1) * strlen($x)) % static::MAX10LEN</code>
+      <code>(static::MAX10LEN - 1) * strlen($x)</code>
+      <code>1 &lt;&lt; $overflow</code>
+      <code>1 &lt;&lt; $overflow</code>
+      <code>1 &lt;&lt; $shift</code>
+      <code>1 &lt;&lt; $tempoverflow</code>
+      <code>2 * $value[$j]</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE_FULL</code>
+      <code>static::BASE_FULL</code>
+      <code>static::BASE_FULL</code>
+      <code>static::BASE_FULL</code>
+      <code>static::BASE_FULL</code>
+      <code>static::BASE_FULL</code>
+      <code>static::BASE_FULL</code>
+      <code>static::BASE_FULL</code>
+      <code>static::BASE_FULL</code>
+      <code>static::MAX10LEN</code>
+      <code>~$r_value[$i]</code>
+      <code>~$this-&gt;value[0]</code>
+    </MixedOperand>
+    <MixedPropertyAssignment occurrences="2">
+      <code>$lhs</code>
+      <code>$lhs</code>
+    </MixedPropertyAssignment>
+    <MixedPropertyFetch occurrences="7">
+      <code>$mod-&gt;value</code>
+      <code>$rhs-&gt;value</code>
+      <code>$temp-&gt;value</code>
+      <code>$temp-&gt;value</code>
+      <code>$temp-&gt;value</code>
+      <code>$x-&gt;value</code>
+      <code>$x-&gt;value</code>
+    </MixedPropertyFetch>
+    <MixedPropertyTypeCoercion occurrences="1">
+      <code>static::$isValidEngine</code>
+    </MixedPropertyTypeCoercion>
+    <MixedReturnStatement occurrences="4">
+      <code>$class::powModHelper($this, $e, $n, static::class)</code>
+      <code>$temp</code>
+      <code>$xx[self::VALUE]</code>
+      <code>$xy[self::VALUE]</code>
+    </MixedReturnStatement>
+    <MixedReturnTypeCoercion occurrences="2">
+      <code>array_reverse($vals)</code>
+      <code>list&lt;int&gt;</code>
+    </MixedReturnTypeCoercion>
+    <MixedStringOffsetAssignment occurrences="5">
+      <code>$this-&gt;value[$i]</code>
+      <code>$this-&gt;value[0]</code>
+      <code>$this-&gt;value[count($this-&gt;value)]</code>
+      <code>$val[$i]</code>
+      <code>$val[$i]</code>
+    </MixedStringOffsetAssignment>
+    <MoreSpecificReturnType occurrences="2">
+      <code>list&lt;static&gt;</code>
+      <code>static</code>
+    </MoreSpecificReturnType>
+    <PossiblyFalseArgument occurrences="1">
+      <code>pack('N', $x)</code>
+    </PossiblyFalseArgument>
+    <PossiblyInvalidArgument occurrences="30">
+      <code>$r_value</code>
+      <code>$result-&gt;bitmask-&gt;value</code>
+      <code>$temp-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$val</code>
+      <code>$val</code>
+      <code>$val</code>
+      <code>$val</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x-&gt;value</code>
+      <code>$y-&gt;value</code>
+      <code>$y-&gt;value</code>
+      <code>$y-&gt;value</code>
+      <code>$y_value</code>
+      <code>$y_value</code>
+    </PossiblyInvalidArgument>
+    <PossiblyInvalidArrayAccess occurrences="15">
+      <code>$r_value[$i]</code>
+      <code>$result-&gt;bitmask-&gt;value[$i]</code>
+      <code>$this-&gt;value[$i]</code>
+      <code>$this-&gt;value[$i]</code>
+      <code>$this-&gt;value[0]</code>
+      <code>$this-&gt;value[0]</code>
+      <code>$this-&gt;value[0]</code>
+      <code>$val[$i]</code>
+      <code>$val[$i]</code>
+      <code>$value[0]</code>
+      <code>$x[0]</code>
+      <code>$y-&gt;value[0]</code>
+      <code>$y-&gt;value[count($y-&gt;value) - 1]</code>
+      <code>$y_value[$y_max - 1]</code>
+      <code>$y_value[$y_max]</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyInvalidArrayAssignment occurrences="7">
+      <code>$this-&gt;value[$i]</code>
+      <code>$this-&gt;value[$i]</code>
+      <code>$this-&gt;value[0]</code>
+      <code>$this-&gt;value[count($this-&gt;value)]</code>
+      <code>$val[$i]</code>
+      <code>$val[$i]</code>
+      <code>$val[]</code>
+    </PossiblyInvalidArrayAssignment>
+    <PossiblyInvalidCast occurrences="2">
+      <code>$x</code>
+      <code>$x</code>
+    </PossiblyInvalidCast>
+    <PossiblyInvalidOperand occurrences="2">
+      <code>~$r_value[$i]</code>
+      <code>~$this-&gt;value[0]</code>
+    </PossiblyInvalidOperand>
+    <PossiblyInvalidPropertyFetch occurrences="1">
+      <code>$result-&gt;bitmask-&gt;value</code>
+    </PossiblyInvalidPropertyFetch>
+    <PossiblyUndefinedIntArrayOffset occurrences="24">
+      <code>$arr[self::SIGN]</code>
+      <code>$arr[self::VALUE]</code>
+      <code>$temp[self::VALUE]</code>
+      <code>$temp[self::VALUE]</code>
+      <code>$temp[self::VALUE]</code>
+      <code>$this-&gt;value[0]</code>
+      <code>$this-&gt;value[0]</code>
+      <code>$this-&gt;value[0]</code>
+      <code>$value[0]</code>
+      <code>$x[0]</code>
+      <code>$xx[self::SIGN]</code>
+      <code>$xx[self::VALUE]</code>
+      <code>$xx[self::VALUE]</code>
+      <code>$xy[self::SIGN]</code>
+      <code>$xy[self::VALUE]</code>
+      <code>$xy[self::VALUE]</code>
+      <code>$y-&gt;value[0]</code>
+      <code>$y_value[0]</code>
+      <code>$z1[self::SIGN]</code>
+      <code>$z1[self::SIGN]</code>
+      <code>$z1[self::VALUE]</code>
+      <code>$z1[self::VALUE]</code>
+      <code>$z1[self::VALUE]</code>
+      <code>$z1[self::VALUE]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedMethod occurrences="9">
+      <code>compare</code>
+      <code>divide</code>
+      <code>equals</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>subtract</code>
+      <code>subtract</code>
+    </PossiblyUndefinedMethod>
+    <PossiblyUndefinedVariable occurrences="3">
+      <code>$j</code>
+      <code>$mask</code>
+      <code>$tempmask</code>
+    </PossiblyUndefinedVariable>
+    <PossiblyUnusedMethod occurrences="15">
+      <code>abs</code>
+      <code>bitwise_leftShift</code>
+      <code>bitwise_rightShift</code>
+      <code>isNegative</code>
+      <code>isOdd</code>
+      <code>make_odd</code>
+      <code>negate</code>
+      <code>pad</code>
+      <code>powModInner</code>
+      <code>scan1divide</code>
+      <code>square</code>
+      <code>testBit</code>
+      <code>testSmallPrimes</code>
+      <code>toBytes</code>
+      <code>toString</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedReturnValue occurrences="1">
+      <code>PHP</code>
+    </PossiblyUnusedReturnValue>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>PHP</code>
+      <code>PHP</code>
+    </PropertyNotSetInConstructor>
+    <PropertyTypeCoercion occurrences="1">
+      <code>static::$isValidEngine</code>
+    </PropertyTypeCoercion>
+    <RedundantCondition occurrences="1">
+      <code>(string) $mod-&gt;value[0]</code>
+    </RedundantCondition>
+    <RedundantConditionGivenDocblockType occurrences="2">
+      <code>$value[$i]</code>
+      <code>$value[$i]</code>
+    </RedundantConditionGivenDocblockType>
+    <TypeDoesNotContainNull occurrences="1">
+      <code>''</code>
+    </TypeDoesNotContainNull>
+    <UndefinedConstant occurrences="54">
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE</code>
+      <code>static::BASE_FULL</code>
+      <code>static::BASE_FULL</code>
+      <code>static::BASE_FULL</code>
+      <code>static::BASE_FULL</code>
+      <code>static::BASE_FULL</code>
+      <code>static::BASE_FULL</code>
+      <code>static::BASE_FULL</code>
+      <code>static::BASE_FULL</code>
+      <code>static::BASE_FULL</code>
+      <code>static::BASE_FULL</code>
+      <code>static::BASE_FULL</code>
+      <code>static::BASE_FULL</code>
+      <code>static::BASE_FULL</code>
+      <code>static::BASE_FULL</code>
+      <code>static::MAX10</code>
+      <code>static::MAX10</code>
+      <code>static::MAX10LEN</code>
+      <code>static::MAX10LEN</code>
+      <code>static::MAX10LEN</code>
+      <code>static::MAX10LEN</code>
+      <code>static::MAX10LEN</code>
+      <code>static::MAX_DIGIT</code>
+      <code>static::MAX_DIGIT</code>
+      <code>static::MAX_DIGIT</code>
+      <code>static::MAX_DIGIT</code>
+      <code>static::MAX_DIGIT2</code>
+      <code>static::MAX_DIGIT2</code>
+      <code>static::MAX_DIGIT2</code>
+      <code>static::MSB</code>
+    </UndefinedConstant>
+    <UndefinedMethod occurrences="30">
+      <code>$class::powModHelper($this, $e, $n, static::class)</code>
+      <code>$r_value</code>
+      <code>$result-&gt;bitmask-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$val</code>
+      <code>$val</code>
+      <code>$val</code>
+      <code>$val</code>
+      <code>$val</code>
+      <code>$val</code>
+      <code>$val</code>
+      <code>$value</code>
+      <code>$x</code>
+      <code>$y-&gt;value</code>
+      <code>$y-&gt;value</code>
+      <code>$y_value</code>
+      <code>$y_value</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>static::isValidEngine()</code>
+      <code>subtract</code>
+      <code>subtract</code>
+    </UndefinedMethod>
+    <UnsafeInstantiation occurrences="22">
+      <code>new static($this-&gt;int2bytes((int) substr($x, 0, static::MAX10LEN)), 256)</code>
+      <code>new static()</code>
+      <code>new static()</code>
+      <code>new static()</code>
+      <code>new static()</code>
+      <code>new static()</code>
+      <code>new static()</code>
+      <code>new static()</code>
+      <code>new static()</code>
+      <code>new static()</code>
+      <code>new static()</code>
+      <code>new static()</code>
+      <code>new static()</code>
+      <code>new static()</code>
+      <code>new static()</code>
+      <code>new static()</code>
+      <code>new static()</code>
+      <code>new static()</code>
+      <code>new static()</code>
+      <code>new static()</code>
+      <code>new static(1)</code>
+      <code>new static(Strings::hex2bin($x), 256)</code>
+    </UnsafeInstantiation>
+    <UnusedVariable occurrences="3">
+      <code>$digit</code>
+      <code>$x_max</code>
+      <code>$x_size</code>
+    </UnusedVariable>
+  </file>
+  <file src="../phpseclib/Math/BigInteger/Engines/PHP/Base.php">
+    <ArgumentTypeCoercion occurrences="3">
+      <code>$class</code>
+      <code>$temp</code>
+      <code>static::slidingWindow($x, $e, $n, $class)</code>
+    </ArgumentTypeCoercion>
+    <InvalidStringClass occurrences="5">
+      <code>$class::multiplyHelper($x, false, $y, false)</code>
+      <code>$class::square($x)</code>
+      <code>$class::square($x-&gt;value)</code>
+      <code>new $class()</code>
+      <code>new $class()</code>
+    </InvalidStringClass>
+    <MixedArgument occurrences="2">
+      <code>$temp</code>
+      <code>$temp</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="3">
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp[self::VALUE]</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="3">
+      <code>$temp</code>
+      <code>[, $temp]</code>
+      <code>[, $temp]</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="3">
+      <code>array</code>
+      <code>array</code>
+      <code>array</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="1">
+      <code>divide</code>
+    </MixedMethodCall>
+    <MixedReturnStatement occurrences="3">
+      <code>static::reduce($class::square($x), $n, $class)</code>
+      <code>static::reduce($temp[self::VALUE], $n, $class)</code>
+      <code>static::reduce($x, $n, $class)</code>
+    </MixedReturnStatement>
+    <PossiblyUnusedMethod occurrences="4">
+      <code>isValidEngine</code>
+      <code>multiplyReduce</code>
+      <code>prepareReduce</code>
+      <code>squareReduce</code>
+    </PossiblyUnusedMethod>
+    <UndefinedMethod occurrences="4">
+      <code>divide</code>
+      <code>static::reduce($class::square($x), $n, $class)</code>
+      <code>static::reduce($temp[self::VALUE], $n, $class)</code>
+      <code>static::reduce($x, $n, $class)</code>
+    </UndefinedMethod>
+  </file>
+  <file src="../phpseclib/Math/BigInteger/Engines/PHP/Montgomery.php">
+    <MixedArgument occurrences="2">
+      <code>$n-&gt;value</code>
+      <code>$n-&gt;value[$i]</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="2">
+      <code>$n-&gt;value[$i]</code>
+      <code>$result</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="9">
+      <code>$j</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$y1</code>
+      <code>$y2</code>
+      <code>[, $result]</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>T</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="4">
+      <code>add</code>
+      <code>divide</code>
+      <code>multiply</code>
+      <code>multiply</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="2">
+      <code>$class::BASE</code>
+      <code>$n-&gt;value[0]</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="1">
+      <code>$result</code>
+    </MixedReturnStatement>
+    <PossiblyFalseOperand occurrences="1">
+      <code>strrpos($temp, '1')</code>
+    </PossiblyFalseOperand>
+    <PossiblyInvalidArrayAccess occurrences="1">
+      <code>$n-&gt;value[0]</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyUndefinedIntArrayOffset occurrences="1">
+      <code>$n-&gt;value[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedMethod occurrences="5">
+      <code>$n-&gt;value</code>
+      <code>lshift</code>
+      <code>modInverse</code>
+      <code>multiply</code>
+      <code>multiply</code>
+    </PossiblyUndefinedMethod>
+    <PossiblyUndefinedVariable occurrences="1">
+      <code>$j</code>
+    </PossiblyUndefinedVariable>
+    <UndefinedMethod occurrences="3">
+      <code>$n-&gt;value</code>
+      <code>modInverse</code>
+      <code>rshift</code>
+    </UndefinedMethod>
+    <UnsafeInstantiation occurrences="2">
+      <code>new $class()</code>
+      <code>new $class()</code>
+    </UnsafeInstantiation>
+  </file>
+  <file src="../phpseclib/Math/BigInteger/Engines/PHP/OpenSSL.php">
+    <UnusedClass occurrences="1">
+      <code>OpenSSL</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Math/BigInteger/Engines/PHP/Reductions/Barrett.php">
+    <InvalidStringClass occurrences="8">
+      <code>$class::addHelper($result, false, $corrector_value, false)</code>
+      <code>$class::multiplyHelper($temp, false, $cache[self::DATA][$key], false)</code>
+      <code>$class::subtractHelper($result, false, $temp[self::VALUE], $temp[self::SIGN])</code>
+      <code>$class::subtractHelper($result[self::VALUE], $result[self::SIGN], $n, false)</code>
+      <code>new $class()</code>
+      <code>new $class()</code>
+      <code>new $class()</code>
+      <code>new $class()</code>
+    </InvalidStringClass>
+    <MixedArgument occurrences="28">
+      <code>$cache[self::DATA][$key]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cutoff</code>
+      <code>$cutoff</code>
+      <code>$m</code>
+      <code>$m1</code>
+      <code>$m_length - 1</code>
+      <code>$n</code>
+      <code>$n</code>
+      <code>$n[self::VALUE]</code>
+      <code>$n[self::VALUE]</code>
+      <code>$result[self::SIGN]</code>
+      <code>$result[self::SIGN]</code>
+      <code>$result[self::SIGN]</code>
+      <code>$result[self::VALUE]</code>
+      <code>$result[self::VALUE]</code>
+      <code>$result[self::VALUE]</code>
+      <code>$temp[self::SIGN]</code>
+      <code>$temp[self::VALUE]</code>
+      <code>$temp[self::VALUE]</code>
+      <code>$temp[self::VALUE]</code>
+      <code>$temp[self::VALUE]</code>
+      <code>$temp[self::VALUE]</code>
+      <code>$u</code>
+      <code>($m_length &gt;&gt; 1) + 1</code>
+    </MixedArgument>
+    <MixedArgumentTypeCoercion occurrences="2">
+      <code>$lsd</code>
+      <code>$product_value</code>
+    </MixedArgumentTypeCoercion>
+    <MixedArrayAccess occurrences="22">
+      <code>$cache[self::DATA]</code>
+      <code>$cache[self::DATA]</code>
+      <code>$cache[self::DATA]</code>
+      <code>$cache[self::DATA]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$m1</code>
+      <code>$result[self::SIGN]</code>
+      <code>$result[self::SIGN]</code>
+      <code>$result[self::VALUE]</code>
+      <code>$result[self::VALUE]</code>
+      <code>$result[self::VALUE]</code>
+      <code>$result[self::VALUE]</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp[self::VALUE]</code>
+      <code>$u</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="4">
+      <code>$cache[self::DATA]</code>
+      <code>$cache[self::DATA]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+    </MixedArrayAssignment>
+    <MixedArrayOffset occurrences="2">
+      <code>$cache[self::DATA][$key]</code>
+      <code>$cache[self::DATA][$key]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="22">
+      <code>$cache[self::DATA][]</code>
+      <code>$carry</code>
+      <code>$carry</code>
+      <code>$cutoff</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$lhs_value</code>
+      <code>$m1</code>
+      <code>$product_value[$j]</code>
+      <code>$product_value[$k]</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$u</code>
+      <code>[$temp, ]</code>
+      <code>[$u, $m1]</code>
+      <code>[, $temp]</code>
+      <code>[, $temp]</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="2">
+      <code>array</code>
+      <code>array</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="8">
+      <code>$class::addHelper($lsd, false, $temp[self::VALUE], false)</code>
+      <code>$class::multiplyHelper($msd, false, $m1, false)</code>
+      <code>$class::multiplyHelper($temp, false, $m, false)</code>
+      <code>$class::multiplyHelper($temp, false, $u, false)</code>
+      <code>$class::subtractHelper($n[self::VALUE], false, $temp[self::VALUE], false)</code>
+      <code>$class::subtractHelper($result[self::VALUE], $result[self::SIGN], $m, false)</code>
+      <code>divide</code>
+      <code>divide</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="14">
+      <code>$class::BASE_FULL</code>
+      <code>$class::BASE_FULL</code>
+      <code>$m_length</code>
+      <code>$m_length</code>
+      <code>$m_length</code>
+      <code>$product_value[$k]</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$x_value[$j]</code>
+      <code>$x_value[$j]</code>
+    </MixedOperand>
+    <MixedPropertyFetch occurrences="5">
+      <code>$m1-&gt;value</code>
+      <code>$temp-&gt;value</code>
+      <code>$temp-&gt;value</code>
+      <code>$temp-&gt;value</code>
+      <code>$u-&gt;value</code>
+    </MixedPropertyFetch>
+    <MixedReturnStatement occurrences="4">
+      <code>$result[self::VALUE]</code>
+      <code>$result[self::VALUE]</code>
+      <code>$temp-&gt;value</code>
+      <code>$temp-&gt;value</code>
+    </MixedReturnStatement>
+    <PossiblyUndefinedIntArrayOffset occurrences="14">
+      <code>$n[self::VALUE]</code>
+      <code>$result[self::SIGN]</code>
+      <code>$result[self::SIGN]</code>
+      <code>$result[self::VALUE]</code>
+      <code>$result[self::VALUE]</code>
+      <code>$result[self::VALUE]</code>
+      <code>$temp[self::SIGN]</code>
+      <code>$temp[self::SIGN]</code>
+      <code>$temp[self::VALUE]</code>
+      <code>$temp[self::VALUE]</code>
+      <code>$temp[self::VALUE]</code>
+      <code>$temp[self::VALUE]</code>
+      <code>$temp[self::VALUE]</code>
+      <code>$y_value[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedVariable occurrences="2">
+      <code>$m1</code>
+      <code>$u</code>
+    </PossiblyUndefinedVariable>
+    <UndefinedMethod occurrences="2">
+      <code>divide</code>
+      <code>divide</code>
+    </UndefinedMethod>
+    <UnsafeInstantiation occurrences="4">
+      <code>new $class()</code>
+      <code>new $class()</code>
+      <code>new $class()</code>
+      <code>new $class()</code>
+    </UnsafeInstantiation>
+    <UnusedClass occurrences="1">
+      <code>Barrett</code>
+    </UnusedClass>
+    <UnusedVariable occurrences="1">
+      <code>$key</code>
+    </UnusedVariable>
+  </file>
+  <file src="../phpseclib/Math/BigInteger/Engines/PHP/Reductions/Classic.php">
+    <InvalidStringClass occurrences="2">
+      <code>new $class()</code>
+      <code>new $class()</code>
+    </InvalidStringClass>
+    <MixedArrayAccess occurrences="1">
+      <code>$temp</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="1">
+      <code>[, $temp]</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>array</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="1">
+      <code>divide</code>
+    </MixedMethodCall>
+    <MixedPropertyFetch occurrences="1">
+      <code>$temp-&gt;value</code>
+    </MixedPropertyFetch>
+    <MixedReturnStatement occurrences="1">
+      <code>$temp-&gt;value</code>
+    </MixedReturnStatement>
+    <UnusedClass occurrences="1">
+      <code>Classic</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Math/BigInteger/Engines/PHP/Reductions/EvalBarrett.php">
+    <InvalidStringClass occurrences="3">
+      <code>new $class()</code>
+      <code>new $class()</code>
+      <code>new $class()</code>
+    </InvalidStringClass>
+    <MissingPropertyType occurrences="1">
+      <code>$custom_reduction</code>
+    </MissingPropertyType>
+    <MixedArgument occurrences="9">
+      <code>$class::BASE_FULL</code>
+      <code>$class::BASE_FULL</code>
+      <code>$class::MAX_DIGIT2</code>
+      <code>$class::MAX_DIGIT2</code>
+      <code>$class::MAX_DIGIT2</code>
+      <code>$class::MAX_DIGIT2</code>
+      <code>$known[$j] * $class::BASE_FULL + $known[$i]</code>
+      <code>$m1</code>
+      <code>$u</code>
+    </MixedArgument>
+    <MixedArgumentTypeCoercion occurrences="2">
+      <code>array_map(self::class . '::float2string', $m)</code>
+      <code>array_map(self::class . '::float2string', $m-&gt;value)</code>
+    </MixedArgumentTypeCoercion>
+    <MixedArrayAccess occurrences="3">
+      <code>$m1</code>
+      <code>$u</code>
+      <code>$u</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="9">
+      <code>$inline</code>
+      <code>$lhs_value</code>
+      <code>$m1</code>
+      <code>$u</code>
+      <code>$u</code>
+      <code>[$u, $m1]</code>
+      <code>[$u]</code>
+      <code>self::$custom_reduction</code>
+      <code>self::$custom_reduction</code>
+    </MixedAssignment>
+    <MixedFunctionCall occurrences="1">
+      <code>$inline($n)</code>
+    </MixedFunctionCall>
+    <MixedInferredReturnType occurrences="2">
+      <code>array</code>
+      <code>callable</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="2">
+      <code>divide</code>
+      <code>divide</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="20">
+      <code>$arr[$i]</code>
+      <code>$arr[$j]</code>
+      <code>$class::BASE_FULL</code>
+      <code>$class::BASE_FULL</code>
+      <code>$class::BASE_FULL</code>
+      <code>$class::BASE_FULL</code>
+      <code>$class::BASE_FULL</code>
+      <code>$class::BASE_FULL</code>
+      <code>$class::BASE_FULL</code>
+      <code>$class::BASE_FULL</code>
+      <code>$class::BASE_FULL</code>
+      <code>$class::BASE_FULL</code>
+      <code>$class::BASE_FULL</code>
+      <code>$class::MAX_DIGIT</code>
+      <code>$class::MAX_DIGIT</code>
+      <code>$class::MAX_DIGIT</code>
+      <code>$known[$i]</code>
+      <code>$known[$i]</code>
+      <code>$known[$i]</code>
+      <code>$known[$j]</code>
+    </MixedOperand>
+    <MixedPropertyFetch occurrences="3">
+      <code>$m1-&gt;value</code>
+      <code>$u-&gt;value</code>
+      <code>$u-&gt;value</code>
+    </MixedPropertyFetch>
+    <MixedReturnStatement occurrences="3">
+      <code>$func</code>
+      <code>$func</code>
+      <code>$inline($n)</code>
+    </MixedReturnStatement>
+    <PossiblyInvalidArgument occurrences="12">
+      <code>$m</code>
+      <code>$m</code>
+      <code>$m</code>
+      <code>$m</code>
+      <code>$m</code>
+      <code>$m</code>
+      <code>$m</code>
+      <code>$m</code>
+      <code>$m</code>
+      <code>$m</code>
+      <code>$m-&gt;value</code>
+      <code>$m-&gt;value</code>
+    </PossiblyInvalidArgument>
+    <PossiblyUnusedMethod occurrences="2">
+      <code>generateCustomReduction</code>
+      <code>reduce</code>
+    </PossiblyUnusedMethod>
+  </file>
+  <file src="../phpseclib/Math/BigInteger/Engines/PHP/Reductions/Montgomery.php">
+    <InvalidStringClass occurrences="5">
+      <code>$class::addHelper($result[self::VALUE], false, $temp, false)</code>
+      <code>$class::regularMultiply([$temp], $n)</code>
+      <code>$class::subtractHelper($result[self::VALUE], false, $n, false)</code>
+      <code>new $class()</code>
+      <code>new $class()</code>
+    </InvalidStringClass>
+    <MixedArgument occurrences="9">
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$class::BASE_FULL</code>
+      <code>$class::BASE_FULL</code>
+      <code>$result</code>
+      <code>$result * (2 - fmod($x * $result, $class::BASE_FULL))</code>
+      <code>$result[self::VALUE]</code>
+      <code>$temp</code>
+      <code>$x * $result</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="9">
+      <code>$cache[self::DATA]</code>
+      <code>$cache[self::DATA]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$result[self::VALUE]</code>
+      <code>$result[self::VALUE]</code>
+      <code>$result[self::VALUE]</code>
+      <code>$temp</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="3">
+      <code>$cache[self::DATA]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$result[self::VALUE]</code>
+    </MixedArrayAssignment>
+    <MixedArrayOffset occurrences="1">
+      <code>$cache[self::DATA][$key]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="13">
+      <code>$key</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$x</code>
+      <code>[, $temp]</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="3">
+      <code>array</code>
+      <code>array</code>
+      <code>int</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="1">
+      <code>divide</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="21">
+      <code>$class::BASE_FULL</code>
+      <code>$class::MAX_DIGIT</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result[self::VALUE][$i]</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>($x &amp; 0xFF) * $result</code>
+      <code>($x &amp; 0xFFFF) * $result</code>
+      <code>($x * $result) % $class::BASE_FULL</code>
+      <code>2 - ($x &amp; 0xFFFF) * $result</code>
+    </MixedOperand>
+    <MixedPropertyFetch occurrences="1">
+      <code>$temp-&gt;value</code>
+    </MixedPropertyFetch>
+    <MixedReturnStatement occurrences="3">
+      <code>$result &amp; $class::MAX_DIGIT</code>
+      <code>$result[self::VALUE]</code>
+      <code>$temp-&gt;value</code>
+    </MixedReturnStatement>
+    <PossiblyUndefinedIntArrayOffset occurrences="2">
+      <code>$result[self::VALUE]</code>
+      <code>$x[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUnusedMethod occurrences="1">
+      <code>reduce</code>
+    </PossiblyUnusedMethod>
+  </file>
+  <file src="../phpseclib/Math/BigInteger/Engines/PHP/Reductions/MontgomeryMult.php">
+    <MixedArgument occurrences="7">
+      <code>$a[self::VALUE]</code>
+      <code>$a[self::VALUE]</code>
+      <code>$a[self::VALUE]</code>
+      <code>$a[self::VALUE]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$temp[self::VALUE]</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="6">
+      <code>$a[self::VALUE][0]</code>
+      <code>$cache[self::DATA]</code>
+      <code>$cache[self::DATA]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+      <code>$cache[self::VARIABLE]</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="2">
+      <code>$cache[self::DATA]</code>
+      <code>$cache[self::VARIABLE]</code>
+    </MixedArrayAssignment>
+    <MixedArrayOffset occurrences="1">
+      <code>$cache[self::DATA][$key]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="5">
+      <code>$key</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>array</code>
+    </MixedInferredReturnType>
+    <MixedOperand occurrences="11">
+      <code>$a[self::VALUE][0]</code>
+      <code>$class::BASE_FULL</code>
+      <code>$class::BASE_FULL</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$y[0]</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="1">
+      <code>$a[self::VALUE]</code>
+    </MixedReturnStatement>
+    <MoreSpecificImplementedParamType occurrences="1">
+      <code>$class</code>
+    </MoreSpecificImplementedParamType>
+    <ParamNameMismatch occurrences="1">
+      <code>$m</code>
+    </ParamNameMismatch>
+    <PossiblyUndefinedIntArrayOffset occurrences="7">
+      <code>$a[self::VALUE]</code>
+      <code>$a[self::VALUE]</code>
+      <code>$a[self::VALUE]</code>
+      <code>$a[self::VALUE]</code>
+      <code>$a[self::VALUE]</code>
+      <code>$temp[self::VALUE]</code>
+      <code>$y[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <UnusedClass occurrences="1">
+      <code>MontgomeryMult</code>
+    </UnusedClass>
+  </file>
+  <file src="../phpseclib/Math/BigInteger/Engines/PHP/Reductions/PowerOfTwo.php">
+    <InvalidStringClass occurrences="3">
+      <code>new $class()</code>
+      <code>new $class()</code>
+      <code>new $class()</code>
+    </InvalidStringClass>
+    <MixedAssignment occurrences="1">
+      <code>$result</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>array</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="2">
+      <code>bitwise_and</code>
+      <code>subtract</code>
+    </MixedMethodCall>
+    <MixedPropertyFetch occurrences="1">
+      <code>$result-&gt;value</code>
+    </MixedPropertyFetch>
+    <MixedReturnStatement occurrences="1">
+      <code>$result-&gt;value</code>
+    </MixedReturnStatement>
+  </file>
+  <file src="../phpseclib/Math/BigInteger/Engines/PHP32.php">
+    <FalsableReturnStatement occurrences="2">
+      <code>$this-&gt;powModOuter($e, $n)</code>
+      <code>$this-&gt;powModOuter($e, $n)</code>
+    </FalsableReturnStatement>
+    <InvalidFalsableReturnType occurrences="2">
+      <code>PHP32</code>
+      <code>PHP32</code>
+    </InvalidFalsableReturnType>
+    <LessSpecificReturnStatement occurrences="8">
+      <code>$this-&gt;bitwiseAndHelper($x)</code>
+      <code>$this-&gt;bitwiseOrHelper($x)</code>
+      <code>$this-&gt;bitwiseXorHelper($x)</code>
+      <code>$this-&gt;extendedGCDHelper($n)</code>
+      <code>$this-&gt;powHelper($n)</code>
+      <code>self::maxHelper($nums)</code>
+      <code>self::minHelper($nums)</code>
+      <code>self::randomRangeHelper($min, $max)</code>
+    </LessSpecificReturnStatement>
+    <MixedArgument occurrences="1">
+      <code>$digit / 2 ** (2 * $step)</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="3">
+      <code>$digit</code>
+      <code>$digit</code>
+      <code>$vals[]</code>
+    </MixedAssignment>
+    <MixedOperand occurrences="3">
+      <code>$digit</code>
+      <code>$digit</code>
+      <code>$digit</code>
+    </MixedOperand>
+    <MoreSpecificReturnType occurrences="8">
+      <code>PHP32</code>
+      <code>PHP32</code>
+      <code>PHP32</code>
+      <code>PHP32</code>
+      <code>PHP32</code>
+      <code>PHP32</code>
+      <code>PHP32</code>
+      <code>PHP32[]</code>
+    </MoreSpecificReturnType>
+    <PossiblyInvalidArgument occurrences="11">
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$val</code>
+      <code>$val</code>
+      <code>$val</code>
+      <code>$y-&gt;value</code>
+      <code>$y-&gt;value</code>
+      <code>$y-&gt;value</code>
+      <code>$y-&gt;value</code>
+    </PossiblyInvalidArgument>
+    <PossiblyInvalidArrayAccess occurrences="1">
+      <code>$digit</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyInvalidCast occurrences="2">
+      <code>$val</code>
+      <code>$val</code>
+    </PossiblyInvalidCast>
+    <PossiblyUndefinedStringArrayOffset occurrences="1">
+      <code>$this-&gt;extendedGCD($n)['gcd']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUnusedMethod occurrences="17">
+      <code>between</code>
+      <code>bitwise_and</code>
+      <code>bitwise_or</code>
+      <code>bitwise_xor</code>
+      <code>divide</code>
+      <code>equals</code>
+      <code>gcd</code>
+      <code>max</code>
+      <code>min</code>
+      <code>modInverse</code>
+      <code>modPow</code>
+      <code>multiply</code>
+      <code>pow</code>
+      <code>powMod</code>
+      <code>randomRange</code>
+      <code>randomRangePrime</code>
+      <code>subtract</code>
+    </PossiblyUnusedMethod>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>PHP32</code>
+      <code>PHP32</code>
+    </PropertyNotSetInConstructor>
+  </file>
+  <file src="../phpseclib/Math/BigInteger/Engines/PHP64.php">
+    <FalsableReturnStatement occurrences="1">
+      <code>$this-&gt;powModOuter($e, $n)</code>
+    </FalsableReturnStatement>
+    <InvalidFalsableReturnType occurrences="1">
+      <code>PHP64</code>
+    </InvalidFalsableReturnType>
+    <LessSpecificReturnStatement occurrences="8">
+      <code>$this-&gt;bitwiseAndHelper($x)</code>
+      <code>$this-&gt;bitwiseOrHelper($x)</code>
+      <code>$this-&gt;bitwiseXorHelper($x)</code>
+      <code>$this-&gt;extendedGCDHelper($n)</code>
+      <code>$this-&gt;powHelper($n)</code>
+      <code>self::maxHelper($nums)</code>
+      <code>self::minHelper($nums)</code>
+      <code>self::randomRangeHelper($min, $max)</code>
+    </LessSpecificReturnStatement>
+    <MixedArgument occurrences="1">
+      <code>$val[$i - 1]</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="5">
+      <code>$digit</code>
+      <code>$digit</code>
+      <code>$digit</code>
+      <code>$digit</code>
+      <code>$vals[]</code>
+    </MixedAssignment>
+    <MixedOperand occurrences="4">
+      <code>$digit</code>
+      <code>$digit</code>
+      <code>$digit</code>
+      <code>$digit</code>
+    </MixedOperand>
+    <MoreSpecificReturnType occurrences="8">
+      <code>PHP64</code>
+      <code>PHP64</code>
+      <code>PHP64</code>
+      <code>PHP64</code>
+      <code>PHP64</code>
+      <code>PHP64</code>
+      <code>PHP64</code>
+      <code>PHP64[]</code>
+    </MoreSpecificReturnType>
+    <PossiblyInvalidArgument occurrences="11">
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$this-&gt;value</code>
+      <code>$val</code>
+      <code>$val</code>
+      <code>$val</code>
+      <code>$y-&gt;value</code>
+      <code>$y-&gt;value</code>
+      <code>$y-&gt;value</code>
+      <code>$y-&gt;value</code>
+    </PossiblyInvalidArgument>
+    <PossiblyInvalidArrayAccess occurrences="2">
+      <code>$digit</code>
+      <code>$val[$i - 1]</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyInvalidCast occurrences="2">
+      <code>$val</code>
+      <code>$val</code>
+    </PossiblyInvalidCast>
+    <PossiblyUndefinedStringArrayOffset occurrences="1">
+      <code>$this-&gt;extendedGCD($n)['gcd']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUnusedMethod occurrences="17">
+      <code>between</code>
+      <code>bitwise_and</code>
+      <code>bitwise_or</code>
+      <code>bitwise_xor</code>
+      <code>divide</code>
+      <code>equals</code>
+      <code>gcd</code>
+      <code>max</code>
+      <code>min</code>
+      <code>modInverse</code>
+      <code>modPow</code>
+      <code>multiply</code>
+      <code>pow</code>
+      <code>powMod</code>
+      <code>randomRange</code>
+      <code>randomRangePrime</code>
+      <code>subtract</code>
+    </PossiblyUnusedMethod>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>PHP64</code>
+      <code>PHP64</code>
+    </PropertyNotSetInConstructor>
+    <UndefinedMethod occurrences="1">
+      <code>$val</code>
+    </UndefinedMethod>
+  </file>
+  <file src="../phpseclib/Math/BinaryField.php">
+    <MissingClosureParamType occurrences="1">
+      <code>$c</code>
+    </MissingClosureParamType>
+    <MissingClosureReturnType occurrences="1">
+      <code>function ($c) use ($u, $mStart, $m, $t, $finalMask, $pad, $h) {</code>
+    </MissingClosureReturnType>
+    <MissingParamType occurrences="1">
+      <code>$indices</code>
+    </MissingParamType>
+    <MixedArgument occurrences="3">
+      <code>$c</code>
+      <code>$m</code>
+      <code>$one</code>
+    </MixedArgument>
+    <MixedArrayOffset occurrences="1">
+      <code>$val[$index]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="2">
+      <code>$index</code>
+      <code>$m</code>
+    </MixedAssignment>
+    <PossiblyFalseArgument occurrences="1">
+      <code>gmp_import($x)</code>
+    </PossiblyFalseArgument>
+    <PossiblyNullArgument occurrences="1">
+      <code>$m</code>
+    </PossiblyNullArgument>
+    <PossiblyUnusedMethod occurrences="3">
+      <code>getLength</code>
+      <code>getLengthInBytes</code>
+      <code>randomInteger</code>
+    </PossiblyUnusedMethod>
+  </file>
+  <file src="../phpseclib/Math/BinaryField/Integer.php">
+    <FalsableReturnStatement occurrences="1">
+      <code>pack('J', $z)</code>
+    </FalsableReturnStatement>
+    <ImplicitToStringCast occurrences="1">
+      <code>string</code>
+    </ImplicitToStringCast>
+    <InvalidFalsableReturnType occurrences="1">
+      <code>string</code>
+    </InvalidFalsableReturnType>
+    <MissingParamType occurrences="4">
+      <code>$instanceID</code>
+      <code>$instanceID</code>
+      <code>$num</code>
+      <code>$z</code>
+    </MissingParamType>
+    <MixedArgument occurrences="2">
+      <code>$num</code>
+      <code>$z</code>
+    </MixedArgument>
+    <MixedArrayOffset occurrences="2">
+      <code>static::$reduce[$instanceID]</code>
+      <code>static::$reduce[$instanceID]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="21">
+      <code>$this-&gt;instanceID</code>
+      <code>$this-&gt;value</code>
+      <code>$x</code>
+      <code>$x0</code>
+      <code>$x1</code>
+      <code>$x2</code>
+      <code>$x3</code>
+      <code>$y</code>
+      <code>$y0</code>
+      <code>$y1</code>
+      <code>$y2</code>
+      <code>$y3</code>
+      <code>$z</code>
+      <code>$z0</code>
+      <code>$z0</code>
+      <code>$z1</code>
+      <code>$z1</code>
+      <code>$z2</code>
+      <code>$z2</code>
+      <code>$z3</code>
+      <code>$z3</code>
+    </MixedAssignment>
+    <MixedOperand occurrences="33">
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x0</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x1</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x2</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$x3</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$z0</code>
+      <code>$z0</code>
+      <code>$z1</code>
+      <code>$z2</code>
+      <code>$z3</code>
+      <code>($x0 * $y0) ^ ($x1 * $y3)</code>
+      <code>($x0 * $y1) ^ ($x1 * $y0)</code>
+      <code>($x0 * $y2) ^ ($x1 * $y1)</code>
+      <code>($x0 * $y3) ^ ($x1 * $y2)</code>
+    </MixedOperand>
+    <PossiblyInvalidArrayAccess occurrences="2">
+      <code>unpack('N', $x)[1]</code>
+      <code>unpack('N', $y)[1]</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyUndefinedIntArrayOffset occurrences="2">
+      <code>unpack('N', $x)[1]</code>
+      <code>unpack('N', $y)[1]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUnusedMethod occurrences="6">
+      <code>compare</code>
+      <code>divide</code>
+      <code>equals</code>
+      <code>negate</code>
+      <code>subtract</code>
+      <code>toBits</code>
+    </PossiblyUnusedMethod>
+    <RedundantCastGivenDocblockType occurrences="1">
+      <code>(string) $this-&gt;toBigInteger()</code>
+    </RedundantCastGivenDocblockType>
+    <RedundantCondition occurrences="1"/>
+    <TypeDoesNotContainNull occurrences="1">
+      <code>!isset($q)</code>
+    </TypeDoesNotContainNull>
+    <UnsafeInstantiation occurrences="5">
+      <code>new static($this-&gt;instanceID)</code>
+      <code>new static($this-&gt;instanceID)</code>
+      <code>new static($this-&gt;instanceID, $x ^ $y)</code>
+      <code>new static($this-&gt;instanceID, $x ^ static::$modulo[$this-&gt;instanceID])</code>
+      <code>new static($this-&gt;instanceID, static::polynomialMultiply($this-&gt;value, $y-&gt;value))</code>
+    </UnsafeInstantiation>
+  </file>
+  <file src="../phpseclib/Math/Common/FiniteField/Integer.php">
+    <PossiblyUnusedMethod occurrences="1">
+      <code>jsonSerialize</code>
+    </PossiblyUnusedMethod>
+    <TooManyArguments occurrences="1">
+      <code>toHex</code>
+    </TooManyArguments>
+  </file>
+  <file src="../phpseclib/Math/PrimeField.php">
+    <MixedArgument occurrences="1">
+      <code>$one</code>
+    </MixedArgument>
+    <PossiblyUnusedMethod occurrences="4">
+      <code>getLength</code>
+      <code>getLengthInBytes</code>
+      <code>randomInteger</code>
+      <code>setReduction</code>
+    </PossiblyUnusedMethod>
+    <UndefinedThisPropertyAssignment occurrences="1">
+      <code>$this-&gt;reduce</code>
+    </UndefinedThisPropertyAssignment>
+  </file>
+  <file src="../phpseclib/Math/PrimeField/Integer.php">
+    <MixedArgument occurrences="6">
+      <code>$length</code>
+      <code>$one</code>
+      <code>$two</code>
+      <code>static::$zero[static::class]</code>
+      <code>static::$zero[static::class]</code>
+      <code>static::$zero[static::class]</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="1">
+      <code>$this-&gt;value</code>
+    </MixedAssignment>
+    <MixedClone occurrences="1">
+      <code>clone static::$zero[static::class]</code>
+    </MixedClone>
+    <MixedPropertyTypeCoercion occurrences="1">
+      <code>static::$reduce</code>
+    </MixedPropertyTypeCoercion>
+    <PossiblyUnusedMethod occurrences="6">
+      <code>compare</code>
+      <code>equals</code>
+      <code>getNAF</code>
+      <code>isOdd</code>
+      <code>pow</code>
+      <code>toBits</code>
+    </PossiblyUnusedMethod>
+    <UndefinedMethod occurrences="6">
+      <code>static::$zero</code>
+      <code>static::$zero</code>
+      <code>static::$zero</code>
+      <code>static::$zero</code>
+      <code>static::$zero</code>
+      <code>static::$zero</code>
+    </UndefinedMethod>
+    <UnsafeInstantiation occurrences="7">
+      <code>new static($this-&gt;instanceID)</code>
+      <code>new static($this-&gt;instanceID)</code>
+      <code>new static($this-&gt;instanceID)</code>
+      <code>new static($this-&gt;instanceID, $r)</code>
+      <code>new static($this-&gt;instanceID, $this-&gt;value-&gt;multiply($denominator))</code>
+      <code>new static($this-&gt;instanceID, $this-&gt;value-&gt;multiply($x-&gt;value))</code>
+      <code>new static($this-&gt;instanceID, static::$modulo[$this-&gt;instanceID]-&gt;subtract($this-&gt;value))</code>
+    </UnsafeInstantiation>
+  </file>
+  <file src="../phpseclib/Net/SFTP.php">
+    <FalsableReturnStatement occurrences="5">
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+    </FalsableReturnStatement>
+    <InvalidArgument occurrences="1">
+      <code>[&amp;$this, 'comparator']</code>
+    </InvalidArgument>
+    <InvalidFalsableReturnType occurrences="3">
+      <code>array</code>
+      <code>array|string</code>
+      <code>int</code>
+    </InvalidFalsableReturnType>
+    <InvalidReturnType occurrences="1">
+      <code>bool</code>
+    </InvalidReturnType>
+    <MissingParamType occurrences="2">
+      <code>$request_id</code>
+      <code>$value</code>
+    </MissingParamType>
+    <MissingReturnType occurrences="14">
+      <code>chmod</code>
+      <code>fileatime</code>
+      <code>filegroup</code>
+      <code>filemtime</code>
+      <code>fileowner</code>
+      <code>fileperms</code>
+      <code>filesize</code>
+      <code>get_lstat_cache_prop</code>
+      <code>get_stat_cache_prop</code>
+      <code>get_xstat_cache_prop</code>
+      <code>parseLongname</code>
+      <code>query_stat_cache</code>
+      <code>readlink</code>
+      <code>realpath</code>
+    </MissingReturnType>
+    <MixedArgument occurrences="73">
+      <code>$a['filename']</code>
+      <code>$attr['mode']</code>
+      <code>$b['filename']</code>
+      <code>$content</code>
+      <code>$dir</code>
+      <code>$dir</code>
+      <code>$dir</code>
+      <code>$dir</code>
+      <code>$dir</code>
+      <code>$dir</code>
+      <code>$dir</code>
+      <code>$dir</code>
+      <code>$dir</code>
+      <code>$filename</code>
+      <code>$filename</code>
+      <code>$filename</code>
+      <code>$filename</code>
+      <code>$filename</code>
+      <code>$filename</code>
+      <code>$filename</code>
+      <code>$filename</code>
+      <code>$flags</code>
+      <code>$flags</code>
+      <code>$flags</code>
+      <code>$flags</code>
+      <code>$fp</code>
+      <code>$fp</code>
+      <code>$fp</code>
+      <code>$fp</code>
+      <code>$fp</code>
+      <code>$fp</code>
+      <code>$fp</code>
+      <code>$length</code>
+      <code>$link</code>
+      <code>$link</code>
+      <code>$link</code>
+      <code>$link</code>
+      <code>$longname</code>
+      <code>$newname</code>
+      <code>$newname</code>
+      <code>$oldname</code>
+      <code>$oldname</code>
+      <code>$path</code>
+      <code>$path</code>
+      <code>$path</code>
+      <code>$remote_file</code>
+      <code>$remote_file</code>
+      <code>$remote_file</code>
+      <code>$stat['atime']</code>
+      <code>$stat['mtime']</code>
+      <code>$status</code>
+      <code>$status</code>
+      <code>$status</code>
+      <code>$status</code>
+      <code>$status</code>
+      <code>$status</code>
+      <code>$status</code>
+      <code>$status</code>
+      <code>$status</code>
+      <code>$status</code>
+      <code>$status</code>
+      <code>$stop - $start</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$this-&gt;extensions['versions']</code>
+      <code>$this-&gt;pwd</code>
+      <code>$this-&gt;realpath($dir . '/' . $key)</code>
+      <code>$this-&gt;realpath($dir . '/' . $value)</code>
+      <code>$this-&gt;realpath($path)</code>
+      <code>$this-&gt;realpath($path)</code>
+      <code>$this-&gt;server_channels[self::CHANNEL]</code>
+      <code>$this-&gt;server_channels[self::CHANNEL]</code>
+      <code>NET_SFTP_LOGGING</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="9">
+      <code>$props['type']</code>
+      <code>$props['type']</code>
+      <code>$result-&gt;{$type}[$prop]</code>
+      <code>$temp[$dir]</code>
+      <code>$temp[$dir]</code>
+      <code>$this-&gt;packet_types[$this-&gt;packet_type]</code>
+      <code>$this-&gt;packet_types[$type]</code>
+      <code>$this-&gt;requestBuffer[$request_id]['packet']</code>
+      <code>$this-&gt;requestBuffer[$request_id]['packet_type']</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="3">
+      <code>$attr[$key]</code>
+      <code>$temp[$dir]</code>
+      <code>$temp[$dir]</code>
+    </MixedArrayAssignment>
+    <MixedArrayOffset occurrences="5">
+      <code>$attr[$key]</code>
+      <code>$contents[$shortname]</code>
+      <code>$this-&gt;extensions[$key]</code>
+      <code>$this-&gt;requestBuffer[$packet_id]</code>
+      <code>$this-&gt;requestBuffer[$request_id]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="64">
+      <code>$a[$sort]</code>
+      <code>$attr</code>
+      <code>$attr</code>
+      <code>$attr</code>
+      <code>$attr</code>
+      <code>$attr</code>
+      <code>$attr[$key]</code>
+      <code>$attributes['type']</code>
+      <code>$b[$sort]</code>
+      <code>$depth</code>
+      <code>$depth</code>
+      <code>$dir</code>
+      <code>$dir</code>
+      <code>$dir</code>
+      <code>$dir</code>
+      <code>$fileType</code>
+      <code>$filename</code>
+      <code>$filename</code>
+      <code>$filename</code>
+      <code>$filename</code>
+      <code>$filename</code>
+      <code>$key</code>
+      <code>$length</code>
+      <code>$link</code>
+      <code>$link</code>
+      <code>$newname</code>
+      <code>$offset</code>
+      <code>$oldname</code>
+      <code>$order</code>
+      <code>$path</code>
+      <code>$path</code>
+      <code>$path</code>
+      <code>$props</code>
+      <code>$props</code>
+      <code>$remote_file</code>
+      <code>$remote_file</code>
+      <code>$response</code>
+      <code>$response</code>
+      <code>$response</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$size</code>
+      <code>$subtemp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp[$dir]</code>
+      <code>$temp['extensions']</code>
+      <code>$this-&gt;packet_type</code>
+      <code>$this-&gt;pwd</code>
+      <code>$this-&gt;queueSize</code>
+      <code>$this-&gt;uploadQueueSize</code>
+      <code>$type</code>
+      <code>$value</code>
+      <code>$value</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="8">
+      <code>?int</code>
+      <code>array</code>
+      <code>array|false</code>
+      <code>array|false</code>
+      <code>bool</code>
+      <code>string</code>
+      <code>string</code>
+      <code>string|bool</code>
+    </MixedInferredReturnType>
+    <MixedOperand occurrences="30">
+      <code>$a[$sort]</code>
+      <code>$a[$sort]</code>
+      <code>$attr</code>
+      <code>$attr</code>
+      <code>$attr</code>
+      <code>$attr</code>
+      <code>$attr</code>
+      <code>$b[$sort]</code>
+      <code>$b[$sort]</code>
+      <code>$content</code>
+      <code>$depth</code>
+      <code>$depth</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$length</code>
+      <code>$offset</code>
+      <code>$shortname</code>
+      <code>$shortname</code>
+      <code>$start</code>
+      <code>$subtemp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$this-&gt;packet_types[$this-&gt;packet_type]</code>
+      <code>$this-&gt;packet_types[$type]</code>
+      <code>$this-&gt;realpath($dir . '/..')</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+    </MixedOperand>
+    <MixedPropertyAssignment occurrences="1">
+      <code>$this-&gt;$this</code>
+    </MixedPropertyAssignment>
+    <MixedPropertyFetch occurrences="2">
+      <code>$result['.']-&gt;lstat</code>
+      <code>$result['.']-&gt;stat</code>
+    </MixedPropertyFetch>
+    <MixedReturnStatement occurrences="10">
+      <code>$attr</code>
+      <code>$content ?? true</code>
+      <code>$order === SORT_ASC ? $a[$sort] - $b[$sort] : $b[$sort] - $a[$sort]</code>
+      <code>$result</code>
+      <code>$result-&gt;lstat</code>
+      <code>$result-&gt;stat</code>
+      <code>$result['.']-&gt;lstat</code>
+      <code>$result['.']-&gt;stat</code>
+      <code>$temp</code>
+      <code>count($this-&gt;sftp_errors) ? $this-&gt;sftp_errors[count($this-&gt;sftp_errors) - 1] : ''</code>
+    </MixedReturnStatement>
+    <PossiblyFalseArgument occurrences="15">
+      <code>$attr</code>
+      <code>$attr</code>
+      <code>$attr</code>
+      <code>$attr</code>
+      <code>$attr</code>
+      <code>$fp</code>
+      <code>$fp</code>
+      <code>$packet</code>
+      <code>$packet</code>
+      <code>$packet</code>
+      <code>$this-&gt;server_identifier</code>
+      <code>pack('Na*', strlen($handle), $handle)</code>
+      <code>pack('Na*', strlen($path), $path)</code>
+      <code>unpack('Nlength', Strings::shift($this-&gt;packet_buffer, 4))</code>
+      <code>unpack('Npacket_id', Strings::shift($this-&gt;packet_buffer, 4))</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalseOperand occurrences="9">
+      <code>$attr</code>
+      <code>$this-&gt;pwd</code>
+      <code>$this-&gt;pwd</code>
+    </PossiblyFalseOperand>
+    <PossiblyFalsePropertyAssignmentValue occurrences="2">
+      <code>false</code>
+      <code>false</code>
+    </PossiblyFalsePropertyAssignmentValue>
+    <PossiblyInvalidArgument occurrences="8">
+      <code>$data</code>
+      <code>$data</code>
+      <code>$data</code>
+      <code>$data</code>
+      <code>$data</code>
+      <code>$local_file</code>
+      <code>$local_file</code>
+      <code>$this-&gt;realtime_log_file</code>
+    </PossiblyInvalidArgument>
+    <PossiblyInvalidArrayAccess occurrences="8">
+      <code>$stat['atime']</code>
+      <code>$stat['atime']</code>
+      <code>$stat['atime']</code>
+      <code>$stat['mtime']</code>
+      <code>$stat['mtime']</code>
+      <code>$stat['mtime']</code>
+      <code>$stat['size']</code>
+      <code>$this-&gt;stat($remote_file)['size']</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyInvalidCast occurrences="5">
+      <code>$data</code>
+      <code>$data</code>
+      <code>$data</code>
+      <code>$data</code>
+      <code>$data</code>
+    </PossiblyInvalidCast>
+    <PossiblyNullArgument occurrences="6">
+      <code>$fp</code>
+      <code>$fp</code>
+      <code>preg_replace('#/(?=/)|/$#', '', $dir)</code>
+      <code>preg_replace('#^/|/(?=/)|/$#', '', $path)</code>
+      <code>preg_replace('#^/|/(?=/)|/$#', '', $path)</code>
+      <code>preg_replace('#^/|/(?=/)|/$#', '', $path)</code>
+    </PossiblyNullArgument>
+    <PossiblyUndefinedIntArrayOffset occurrences="4">
+      <code>$dirs[0]</code>
+      <code>$this-&gt;channel_status[self::CHANNEL]</code>
+      <code>$this-&gt;channel_status[self::CHANNEL]</code>
+      <code>$this-&gt;server_channels[self::CHANNEL]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="14">
+      <code>$a['filename']</code>
+      <code>$a['filename']</code>
+      <code>$a['filename']</code>
+      <code>$a['filename']</code>
+      <code>$a['filename']</code>
+      <code>$attrs['mode']</code>
+      <code>$b['filename']</code>
+      <code>$b['filename']</code>
+      <code>$b['filename']</code>
+      <code>$b['filename']</code>
+      <code>$stat['atime']</code>
+      <code>$stat['mtime']</code>
+      <code>$stat['type']</code>
+      <code>$this-&gt;stat($remote_file)['size']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUndefinedVariable occurrences="14">
+      <code>$attr</code>
+      <code>$attr</code>
+      <code>$attr</code>
+      <code>$attr</code>
+      <code>$attr</code>
+      <code>$attr</code>
+      <code>$attr</code>
+      <code>$attr</code>
+      <code>$content</code>
+      <code>$content</code>
+      <code>$fp</code>
+      <code>$fp</code>
+      <code>$longname</code>
+      <code>$result</code>
+    </PossiblyUndefinedVariable>
+    <PossiblyUnusedMethod occurrences="17">
+      <code>disableArbitraryLengthPackets</code>
+      <code>disableDatePreservation</code>
+      <code>disablePathCanonicalization</code>
+      <code>enableArbitraryLengthPackets</code>
+      <code>enableDatePreservation</code>
+      <code>enablePathCanonicalization</code>
+      <code>fileatime</code>
+      <code>filegroup</code>
+      <code>filemtime</code>
+      <code>fileowner</code>
+      <code>fileperms</code>
+      <code>filetype</code>
+      <code>getNegotiatedVersion</code>
+      <code>getSFTPErrors</code>
+      <code>getSFTPLog</code>
+      <code>getSupportedVersions</code>
+      <code>setPreferredVersion</code>
+    </PossiblyUnusedMethod>
+    <PropertyNotSetInConstructor occurrences="6">
+      <code>$defaultVersion</code>
+      <code>$log_size</code>
+      <code>$realtime_log_file</code>
+      <code>$realtime_log_size</code>
+      <code>$realtime_log_wrap</code>
+      <code>$version</code>
+    </PropertyNotSetInConstructor>
+    <RedundantCastGivenDocblockType occurrences="1">
+      <code>(int) $ver</code>
+    </RedundantCastGivenDocblockType>
+    <RedundantConditionGivenDocblockType occurrences="2">
+      <code>$fileType !== false</code>
+      <code>$this-&gt;version &lt; 4 &amp;&amp; $fileType !== false</code>
+    </RedundantConditionGivenDocblockType>
+    <TypeDoesNotContainType occurrences="5">
+      <code>!is_string($path)</code>
+      <code>is_int($filename)</code>
+      <code>is_object($path)</code>
+      <code>is_string($mode)</code>
+      <code>is_string($mode) &amp;&amp; is_int($filename)</code>
+    </TypeDoesNotContainType>
+    <UndefinedConstant occurrences="1">
+      <code>NET_SFTP_LOGGING</code>
+    </UndefinedConstant>
+    <UndefinedThisPropertyFetch occurrences="2">
+      <code>$this-&gt;packet_types</code>
+      <code>$this-&gt;packet_types</code>
+    </UndefinedThisPropertyFetch>
+    <UnevaluatedCode occurrences="1">
+      <code>break;</code>
+    </UnevaluatedCode>
+    <UnusedMethod occurrences="1">
+      <code>comparator</code>
+    </UnusedMethod>
+    <UnusedParam occurrences="1">
+      <code>$key</code>
+    </UnusedParam>
+    <UnusedReturnValue occurrences="1">
+      <code>bool</code>
+    </UnusedReturnValue>
+    <UnusedVariable occurrences="13">
+      <code>$attrib_bits</code>
+      <code>$attrib_bits_valid</code>
+      <code>$flag</code>
+      <code>$mask</code>
+      <code>$packet</code>
+      <code>$response</code>
+      <code>$response</code>
+      <code>$response</code>
+      <code>$temp</code>
+      <code>$text_hint</code>
+      <code>$type</code>
+      <code>$value</code>
+      <code>$who</code>
+    </UnusedVariable>
+  </file>
+  <file src="../phpseclib/Net/SFTP/Stream.php">
+    <DocblockTypeContradiction occurrences="8">
+      <code>$path === false</code>
+      <code>$path === false</code>
+      <code>$path === false</code>
+      <code>$path === false</code>
+      <code>$path === false</code>
+      <code>$path === false</code>
+      <code>$path === false</code>
+      <code>$path_from === false</code>
+    </DocblockTypeContradiction>
+    <FalsableReturnStatement occurrences="5">
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+      <code>false</code>
+    </FalsableReturnStatement>
+    <InvalidArgument occurrences="2">
+      <code>$options &amp; STREAM_MKDIR_RECURSIVE</code>
+      <code>$path</code>
+    </InvalidArgument>
+    <InvalidReturnStatement occurrences="3">
+      <code>$results</code>
+      <code>$results</code>
+      <code>$this-&gt;sftp-&gt;fsock</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="4">
+      <code>bool</code>
+      <code>bool</code>
+      <code>bool</code>
+      <code>resource</code>
+    </InvalidReturnType>
+    <MissingParamType occurrences="1">
+      <code>$var</code>
+    </MissingParamType>
+    <MissingReturnType occurrences="2">
+      <code>_dir_readdir</code>
+      <code>_stream_read</code>
+    </MissingReturnType>
+    <MixedArgument occurrences="14">
+      <code>$atime</code>
+      <code>$host</code>
+      <code>$host</code>
+      <code>$host</code>
+      <code>$orig</code>
+      <code>$pass</code>
+      <code>$pass</code>
+      <code>$port</code>
+      <code>$time</code>
+      <code>$user</code>
+      <code>$user</code>
+      <code>$var</code>
+      <code>$var</code>
+      <code>$var</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="9">
+      <code>$context[$scheme]</code>
+      <code>$context[$scheme]</code>
+      <code>$context[$scheme]</code>
+      <code>$context[$scheme]</code>
+      <code>$orig[-1]</code>
+      <code>$var[0]</code>
+      <code>$var[1]</code>
+      <code>self::$instances[$host][$port]</code>
+      <code>self::$instances[$host][$port]</code>
+    </MixedArrayAccess>
+    <MixedArrayOffset occurrences="11">
+      <code>$context[$scheme]</code>
+      <code>$context[$scheme]</code>
+      <code>$context[$scheme]</code>
+      <code>$context[$scheme]</code>
+      <code>$context[$scheme]</code>
+      <code>$context[$scheme]</code>
+      <code>$context[$scheme]</code>
+      <code>$context[$scheme]</code>
+      <code>$context[$scheme]</code>
+      <code>self::$instances[$host][$port]</code>
+      <code>self::$instances[$host][$port]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="12">
+      <code>$argument</code>
+      <code>$atime</code>
+      <code>$pass</code>
+      <code>$pass</code>
+      <code>$sftp</code>
+      <code>$sftp</code>
+      <code>$this-&gt;notification</code>
+      <code>$this-&gt;pos</code>
+      <code>$this-&gt;sftp</code>
+      <code>$this-&gt;size</code>
+      <code>$time</code>
+      <code>$user</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>string</code>
+    </MixedInferredReturnType>
+    <MixedOperand occurrences="6">
+      <code>$fragment</code>
+      <code>$path</code>
+      <code>$path</code>
+      <code>$path</code>
+      <code>$path</code>
+      <code>$query</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="2">
+      <code>$path</code>
+      <code>$path</code>
+    </MixedReturnStatement>
+    <NullableReturnStatement occurrences="1">
+      <code>$this-&gt;sftp-&gt;fsock</code>
+    </NullableReturnStatement>
+    <PossiblyFalseOperand occurrences="2">
+      <code>$this-&gt;size</code>
+      <code>parse_url($path)</code>
+    </PossiblyFalseOperand>
+    <PossiblyFalsePropertyAssignmentValue occurrences="1">
+      <code>$this-&gt;sftp-&gt;nlist($path)</code>
+    </PossiblyFalsePropertyAssignmentValue>
+    <PossiblyInvalidArgument occurrences="2">
+      <code>$result</code>
+      <code>$result</code>
+    </PossiblyInvalidArgument>
+    <PossiblyInvalidArrayAccess occurrences="3">
+      <code>$path1['path']</code>
+      <code>$path2['path']</code>
+      <code>$path_to['path']</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyNullArrayAccess occurrences="3">
+      <code>$this-&gt;mode[0]</code>
+      <code>$this-&gt;mode[0]</code>
+      <code>$this-&gt;mode[0]</code>
+    </PossiblyNullArrayAccess>
+    <PossiblyNullPropertyAssignmentValue occurrences="1">
+      <code>preg_replace('#[bt]$#', '', $mode)</code>
+    </PossiblyNullPropertyAssignmentValue>
+    <PossiblyUndefinedArrayOffset occurrences="1">
+      <code>$path_to['path']</code>
+    </PossiblyUndefinedArrayOffset>
+    <PossiblyUnusedMethod occurrences="2">
+      <code>__call</code>
+      <code>__construct</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedParam occurrences="1">
+      <code>$path</code>
+    </PossiblyUnusedParam>
+    <PossiblyUnusedProperty occurrences="1">
+      <code>$instances</code>
+    </PossiblyUnusedProperty>
+    <PropertyNotSetInConstructor occurrences="9">
+      <code>$context</code>
+      <code>$entries</code>
+      <code>$eof</code>
+      <code>$mode</code>
+      <code>$notification</code>
+      <code>$path</code>
+      <code>$pos</code>
+      <code>$sftp</code>
+      <code>$size</code>
+    </PropertyNotSetInConstructor>
+    <PropertyTypeCoercion occurrences="1">
+      <code>$host</code>
+    </PropertyTypeCoercion>
+    <RedundantConditionGivenDocblockType occurrences="4">
+      <code>isset($this-&gt;notification) &amp;&amp; is_callable($this-&gt;notification)</code>
+      <code>isset($this-&gt;notification) &amp;&amp; is_callable($this-&gt;notification)</code>
+      <code>isset($this-&gt;notification) &amp;&amp; is_callable($this-&gt;notification)</code>
+      <code>isset($this-&gt;notification) &amp;&amp; is_callable($this-&gt;notification)</code>
+    </RedundantConditionGivenDocblockType>
+    <RedundantPropertyInitializationCheck occurrences="2">
+      <code>isset($this-&gt;notification)</code>
+      <code>isset($this-&gt;notification)</code>
+    </RedundantPropertyInitializationCheck>
+    <UnusedParam occurrences="7">
+      <code>$arg1</code>
+      <code>$arg2</code>
+      <code>$cast_as</code>
+      <code>$operation</code>
+      <code>$option</code>
+      <code>$options</code>
+      <code>$options</code>
+    </UnusedParam>
+  </file>
+  <file src="../phpseclib/Net/SSH2.php">
+    <DocblockTypeContradiction occurrences="7">
+      <code>$arg instanceof Agent</code>
+      <code>$arg instanceof PrivateKey || $arg instanceof Agent</code>
+      <code>$request_channel === false</code>
+      <code>is_array($arg)</code>
+      <code>is_array($arg)</code>
+      <code>is_array($arg)</code>
+      <code>isset($realtime_log_file)</code>
+    </DocblockTypeContradiction>
+    <FalsableReturnStatement occurrences="2">
+      <code>false</code>
+      <code>false</code>
+    </FalsableReturnStatement>
+    <InvalidArgument occurrences="3">
+      <code>self::$crypto_engine</code>
+      <code>self::$crypto_engine</code>
+      <code>true</code>
+    </InvalidArgument>
+    <InvalidArrayAccess occurrences="1">
+      <code>$payload[0]</code>
+    </InvalidArrayAccess>
+    <InvalidFalsableReturnType occurrences="2">
+      <code>int</code>
+      <code>string</code>
+    </InvalidFalsableReturnType>
+    <InvalidReturnStatement occurrences="1">
+      <code>$temp</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="3">
+      <code>array&lt;string, SSH2&gt;</code>
+      <code>array{Hash, int}|null</code>
+      <code>string</code>
+    </InvalidReturnType>
+    <MissingParamType occurrences="4">
+      <code>$algorithm</code>
+      <code>$host</code>
+      <code>$password</code>
+      <code>$responses</code>
+    </MissingParamType>
+    <MissingReturnType occurrences="3">
+      <code>connect</code>
+      <code>get_channel_packet</code>
+      <code>keyboard_interactive_process</code>
+    </MissingReturnType>
+    <MixedArgument occurrences="110">
+      <code>$a['comp']</code>
+      <code>$a['crypt']</code>
+      <code>$a['mac']</code>
+      <code>$aad</code>
+      <code>$auth</code>
+      <code>$auth_methods</code>
+      <code>$c2s_compression_algorithms</code>
+      <code>$c2s_compression_algorithms</code>
+      <code>$c2s_encryption_algorithms</code>
+      <code>$c2s_encryption_algorithms</code>
+      <code>$c2s_mac_algorithms</code>
+      <code>$c2s_mac_algorithms</code>
+      <code>$c2s_mac_algorithms</code>
+      <code>$channel</code>
+      <code>$current_log</code>
+      <code>$data</code>
+      <code>$decrypt</code>
+      <code>$encrypt</code>
+      <code>$error_message</code>
+      <code>$extra</code>
+      <code>$filename</code>
+      <code>$gBytes</code>
+      <code>$gBytes</code>
+      <code>$kex_algorithms</code>
+      <code>$kex_algorithms</code>
+      <code>$key</code>
+      <code>$keyBytes</code>
+      <code>$keyBytes</code>
+      <code>$keyBytes</code>
+      <code>$length</code>
+      <code>$m</code>
+      <code>$m</code>
+      <code>$mac_algorithm_in</code>
+      <code>$mac_algorithm_in</code>
+      <code>$mac_algorithm_out</code>
+      <code>$mac_algorithm_out</code>
+      <code>$matches[0]</code>
+      <code>$matches[3]</code>
+      <code>$max_size</code>
+      <code>$nonce</code>
+      <code>$ourPublicBytes</code>
+      <code>$p</code>
+      <code>$p</code>
+      <code>$packet</code>
+      <code>$packet[0]</code>
+      <code>$password</code>
+      <code>$password</code>
+      <code>$payload</code>
+      <code>$payload[0]</code>
+      <code>$preferred['hostkey']</code>
+      <code>$preferred['kex']</code>
+      <code>$primeBytes</code>
+      <code>$primeBytes</code>
+      <code>$prompt</code>
+      <code>$raw</code>
+      <code>$reason_code</code>
+      <code>$reconstructed</code>
+      <code>$remaining_length</code>
+      <code>$responses[$i]</code>
+      <code>$s2c_compression_algorithms</code>
+      <code>$s2c_compression_algorithms</code>
+      <code>$s2c_encryption_algorithms</code>
+      <code>$s2c_encryption_algorithms</code>
+      <code>$s2c_mac_algorithms</code>
+      <code>$s2c_mac_algorithms</code>
+      <code>$s2c_mac_algorithms</code>
+      <code>$server_channel</code>
+      <code>$server_host_key_algorithms</code>
+      <code>$server_host_key_algorithms</code>
+      <code>$server_public_host_key</code>
+      <code>$signature</code>
+      <code>$signature</code>
+      <code>$skip_channel_filter</code>
+      <code>$skip_channel_filter</code>
+      <code>$stop - $start</code>
+      <code>$temp</code>
+      <code>$temp['length']</code>
+      <code>$theirPublicBytes</code>
+      <code>$theirPublicBytes</code>
+      <code>$this-&gt;channel_buffers[$client_channel]</code>
+      <code>$this-&gt;compression_algorithms_client_to_server</code>
+      <code>$this-&gt;compression_algorithms_server_to_client</code>
+      <code>$this-&gt;encryption_algorithms_client_to_server</code>
+      <code>$this-&gt;encryption_algorithms_server_to_client</code>
+      <code>$this-&gt;kex_algorithm</code>
+      <code>$this-&gt;kex_algorithm</code>
+      <code>$this-&gt;kex_algorithm</code>
+      <code>$this-&gt;kex_algorithm</code>
+      <code>$this-&gt;kex_algorithm</code>
+      <code>$this-&gt;kex_algorithms</code>
+      <code>$this-&gt;mac_algorithms_client_to_server</code>
+      <code>$this-&gt;mac_algorithms_server_to_client</code>
+      <code>$this-&gt;message_number_log[count($this-&gt;message_number_log) - 1]</code>
+      <code>$this-&gt;preferred['hostkey']</code>
+      <code>$this-&gt;server_channels[$client_channel]</code>
+      <code>$this-&gt;server_channels[$request_channel]</code>
+      <code>$this-&gt;server_channels[self::CHANNEL_EXEC]</code>
+      <code>$this-&gt;server_channels[self::CHANNEL_EXEC]</code>
+      <code>$this-&gt;server_channels[self::CHANNEL_SHELL]</code>
+      <code>$this-&gt;server_channels[self::CHANNEL_SHELL]</code>
+      <code>$this-&gt;server_channels[self::CHANNEL_SUBSYSTEM]</code>
+      <code>$this-&gt;server_host_key_algorithms</code>
+      <code>$this-&gt;server_public_host_key</code>
+      <code>$this-&gt;signature</code>
+      <code>$type</code>
+      <code>$type</code>
+      <code>$type</code>
+      <code>NET_SSH2_LOGGING</code>
+      <code>array_shift($message_log)</code>
+      <code>array_shift($this-&gt;channel_buffers[$client_channel])</code>
+    </MixedArgument>
+    <MixedArgumentTypeCoercion occurrences="2">
+      <code>$diff</code>
+      <code>$key</code>
+    </MixedArgumentTypeCoercion>
+    <MixedArrayAccess occurrences="11">
+      <code>$a['comp']</code>
+      <code>$a['crypt']</code>
+      <code>$a['mac']</code>
+      <code>$keyBytes[0]</code>
+      <code>$m[$subkey]</code>
+      <code>$matches[0]</code>
+      <code>$matches[1]</code>
+      <code>$matches[3]</code>
+      <code>$matches[3]</code>
+      <code>$packet[0]</code>
+      <code>$this-&gt;channel_buffers[$client_channel][$i]</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="6">
+      <code>$a['comp']</code>
+      <code>$a['crypt']</code>
+      <code>$a['mac']</code>
+      <code>$this-&gt;channel_buffers[$channel][]</code>
+      <code>$this-&gt;channel_buffers[$channel][]</code>
+      <code>$this-&gt;channel_buffers[$channel][]</code>
+    </MixedArrayAssignment>
+    <MixedArrayOffset occurrences="19">
+      <code>$compression_map[$compression_algorithm_in]</code>
+      <code>$compression_map[$compression_algorithm_out]</code>
+      <code>$this-&gt;channel_buffers[$channel]</code>
+      <code>$this-&gt;channel_buffers[$channel]</code>
+      <code>$this-&gt;channel_buffers[$channel]</code>
+      <code>$this-&gt;channel_buffers[$client_channel][$i]</code>
+      <code>$this-&gt;channel_status[$channel]</code>
+      <code>$this-&gt;channel_status[$channel]</code>
+      <code>$this-&gt;channel_status[$channel]</code>
+      <code>$this-&gt;channel_status[$channel]</code>
+      <code>$this-&gt;server_channels[$channel]</code>
+      <code>$this-&gt;server_channels[$channel]</code>
+      <code>$this-&gt;server_channels[$channel]</code>
+      <code>$this-&gt;server_channels[$channel]</code>
+      <code>$this-&gt;window_size_client_to_server[$channel]</code>
+      <code>$this-&gt;window_size_client_to_server[$channel]</code>
+      <code>$this-&gt;window_size_server_to_client[$channel]</code>
+      <code>$this-&gt;window_size_server_to_client[$channel]</code>
+      <code>$this-&gt;window_size_server_to_client[$channel]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="63">
+      <code>$a</code>
+      <code>$algo</code>
+      <code>$auth</code>
+      <code>$c2s_compression_algorithms</code>
+      <code>$c2s_encryption_algorithms</code>
+      <code>$c2s_mac_algorithms</code>
+      <code>$compression_algorithm_in</code>
+      <code>$compression_algorithm_out</code>
+      <code>$current_log</code>
+      <code>$curveName</code>
+      <code>$decrypt</code>
+      <code>$encrypt</code>
+      <code>$expected_key_format</code>
+      <code>$extra</code>
+      <code>$filename</code>
+      <code>$i</code>
+      <code>$kex_algorithms</code>
+      <code>$key</code>
+      <code>$keyBytes</code>
+      <code>$m</code>
+      <code>$mac_algorithm_in</code>
+      <code>$mac_algorithm_out</code>
+      <code>$max_size</code>
+      <code>$method</code>
+      <code>$newargs[]</code>
+      <code>$ourPublicBytes</code>
+      <code>$p</code>
+      <code>$packet</code>
+      <code>$privatekey</code>
+      <code>$privatekey</code>
+      <code>$privatekey</code>
+      <code>$privatekey</code>
+      <code>$publickey</code>
+      <code>$reconstructed</code>
+      <code>$response</code>
+      <code>$response</code>
+      <code>$response</code>
+      <code>$responses[]</code>
+      <code>$result</code>
+      <code>$s2c_compression_algorithms</code>
+      <code>$s2c_encryption_algorithms</code>
+      <code>$s2c_mac_algorithms</code>
+      <code>$server_host_key_algorithm</code>
+      <code>$server_host_key_algorithms</code>
+      <code>$signature</code>
+      <code>$temp</code>
+      <code>$this-&gt;auth_methods_to_continue</code>
+      <code>$this-&gt;auth_methods_to_continue</code>
+      <code>$this-&gt;auth_methods_to_continue</code>
+      <code>$this-&gt;auth_methods_to_continue</code>
+      <code>$this-&gt;auth_methods_to_continue</code>
+      <code>$this-&gt;hmac_check_name</code>
+      <code>$this-&gt;hmac_check_name</code>
+      <code>$this-&gt;hmac_create_name</code>
+      <code>$this-&gt;hmac_create_name</code>
+      <code>$this-&gt;kex_algorithm</code>
+      <code>$this-&gt;last_interactive_response</code>
+      <code>$this-&gt;server_public_host_key</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$value</code>
+      <code>$window_size</code>
+      <code>$window_size</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="4">
+      <code>bool</code>
+      <code>bool</code>
+      <code>boolean</code>
+      <code>string|bool|null</code>
+    </MixedInferredReturnType>
+    <MixedMethodCall occurrences="4">
+      <code>getCurve</code>
+      <code>getEncodedCoordinates</code>
+      <code>sign</code>
+      <code>withHash</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="29">
+      <code>$curveName</code>
+      <code>$data</code>
+      <code>$data</code>
+      <code>$data</code>
+      <code>$data</code>
+      <code>$elapsed</code>
+      <code>$keyBytes</code>
+      <code>$keyBytes[0]</code>
+      <code>$message</code>
+      <code>$message_number_log[$i]</code>
+      <code>$raw</code>
+      <code>$raw</code>
+      <code>$raw</code>
+      <code>$raw</code>
+      <code>$response</code>
+      <code>$server_host_key_algorithm</code>
+      <code>$stop</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$this-&gt;errors[count($this-&gt;errors) - 1]</code>
+      <code>$this-&gt;window_size_client_to_server[$channel]</code>
+      <code>$this-&gt;window_size_client_to_server[$client_channel]</code>
+      <code>$this-&gt;window_size_server_to_client[$channel]</code>
+      <code>$this-&gt;window_size_server_to_client[$channel]</code>
+      <code>$window_size</code>
+      <code>$window_size</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="5">
+      <code>!Strings::is_stringable($password) &amp;&amp; !is_array($password) ? false : $this-&gt;keyboard_interactive_process($password)</code>
+      <code>$result</code>
+      <code>$this-&gt;errors[$count - 1]</code>
+      <code>$this-&gt;get_channel_packet($channel)</code>
+      <code>$this-&gt;keyboard_interactive_process($password)</code>
+    </MixedReturnStatement>
+    <MixedReturnTypeCoercion occurrences="2">
+      <code>$this-&gt;errors</code>
+      <code>string[]</code>
+    </MixedReturnTypeCoercion>
+    <PossiblyFalseArgument occurrences="49">
+      <code>$data</code>
+      <code>$logged</code>
+      <code>$nonce</code>
+      <code>$nonce</code>
+      <code>$nonce</code>
+      <code>$packet</code>
+      <code>$packet</code>
+      <code>$packet</code>
+      <code>$packet</code>
+      <code>$packet</code>
+      <code>$packet</code>
+      <code>$packet</code>
+      <code>$packet</code>
+      <code>$packet</code>
+      <code>$packet</code>
+      <code>$packet</code>
+      <code>$payload</code>
+      <code>$payload</code>
+      <code>$raw</code>
+      <code>$raw</code>
+      <code>$raw</code>
+      <code>$raw</code>
+      <code>$raw</code>
+      <code>$raw</code>
+      <code>$raw</code>
+      <code>$reconstructed</code>
+      <code>$tag</code>
+      <code>$tag</code>
+      <code>$this-&gt;hmac_size</code>
+      <code>$this-&gt;server_host_key_algorithms</code>
+      <code>$this-&gt;server_identifier</code>
+      <code>pack('C', MessageType::REQUEST_FAILURE)</code>
+      <code>pack('CN', MessageType::CHANNEL_CLOSE, $this-&gt;server_channels[$channel])</code>
+      <code>pack('CN', MessageType::CHANNEL_CLOSE, $this-&gt;server_channels[$channel])</code>
+      <code>pack('CN', MessageType::CHANNEL_CLOSE, $this-&gt;server_channels[$client_channel])</code>
+      <code>pack('CN', MessageType::CHANNEL_CLOSE, $this-&gt;server_channels[$client_channel])</code>
+      <code>pack('CN', MessageType::CHANNEL_EOF, $this-&gt;server_channels[$client_channel])</code>
+      <code>pack('CN', MessageType::CHANNEL_EOF, $this-&gt;server_channels[$client_channel])</code>
+      <code>pack('CN', MessageType::CHANNEL_SUCCESS, $this-&gt;server_channels[$channel])</code>
+      <code>pack('CN', MessageType::IGNORE, 0)</code>
+      <code>pack('CN', MessageType::IGNORE, 0)</code>
+      <code>pack('Na*', $this-&gt;get_seq_no, $reconstructed)</code>
+      <code>pack('Na*', $this-&gt;send_seq_no, $packet)</code>
+      <code>pack('Na*', $this-&gt;send_seq_no, $packet)</code>
+      <code>unpack('Npacket_length', $temp = Strings::shift($raw, 4))</code>
+      <code>unpack('Npacket_length', $temp)</code>
+      <code>unpack('Npacket_length', $temp)</code>
+      <code>unpack('Npacket_length/Cpadding_length', Strings::shift($raw, 5))</code>
+      <code>unpack('cpacket_type/Nchannel/Nlength', $payload)</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalseOperand occurrences="24">
+      <code>$dh_group_sizes_packed</code>
+      <code>$kexinit_payload_client</code>
+      <code>$keyBytes</code>
+      <code>$keyBytes</code>
+      <code>$keyBytes</code>
+      <code>$keyBytes</code>
+      <code>$keyBytes</code>
+      <code>$keyBytes</code>
+      <code>$keyBytes</code>
+      <code>$keyBytes</code>
+      <code>$keyBytes</code>
+      <code>$keyBytes</code>
+      <code>$keyBytes</code>
+      <code>$keyBytes</code>
+      <code>$keyBytes</code>
+      <code>$keyBytes</code>
+      <code>$logged</code>
+      <code>$packet</code>
+      <code>$packet</code>
+      <code>deflate_add($this-&gt;compress_context, $data, ZLIB_PARTIAL_FLUSH)</code>
+      <code>ftell($realtime_log_file)</code>
+      <code>pack('N', $this-&gt;get_seq_no)</code>
+      <code>pack('N', $this-&gt;send_seq_no)</code>
+      <code>pack('N', $this-&gt;send_seq_no)</code>
+    </PossiblyFalseOperand>
+    <PossiblyFalsePropertyAssignmentValue occurrences="2">
+      <code>@fsockopen($this-&gt;host, $this-&gt;port, $errno, $errstr, $this-&gt;curTimeout == 0 ? 100000 : $this-&gt;curTimeout)</code>
+      <code>inflate_init(ZLIB_ENCODING_RAW, ['window' =&gt; $cinfo + 8])</code>
+    </PossiblyFalsePropertyAssignmentValue>
+    <PossiblyFalseReference occurrences="4">
+      <code>decrypt</code>
+      <code>encrypt</code>
+      <code>setNonce</code>
+      <code>setNonce</code>
+    </PossiblyFalseReference>
+    <PossiblyInvalidArgument occurrences="17">
+      <code>$args</code>
+      <code>$engine</code>
+      <code>$response</code>
+      <code>$response</code>
+      <code>$response</code>
+      <code>$response</code>
+      <code>$response</code>
+      <code>$response</code>
+      <code>$response</code>
+      <code>$response</code>
+      <code>$response</code>
+      <code>$response</code>
+      <code>$response</code>
+      <code>$this-&gt;decompress_context</code>
+      <code>$this-&gt;fsock</code>
+      <code>$this-&gt;fsock</code>
+      <code>$this-&gt;realtime_log_file</code>
+    </PossiblyInvalidArgument>
+    <PossiblyInvalidArrayAccess occurrences="1">
+      <code>$temp['length']</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyInvalidCast occurrences="1">
+      <code>$args</code>
+    </PossiblyInvalidCast>
+    <PossiblyNullArgument occurrences="5">
+      <code>$this-&gt;curTimeout == 0 ? 100000 : $this-&gt;curTimeout</code>
+      <code>$this-&gt;decryptInvocationCounter</code>
+      <code>$this-&gt;encryptInvocationCounter</code>
+      <code>array_shift($message_log)</code>
+      <code>preg_replace_callback('#.#s', fn ($matches) =&gt; $this-&gt;log_boundary . str_pad(dechex(ord($matches[0])), 2, '0', STR_PAD_LEFT), $fragment)</code>
+    </PossiblyNullArgument>
+    <PossiblyNullOperand occurrences="5">
+      <code>$raw</code>
+      <code>$this-&gt;decryptFixedPart</code>
+      <code>$this-&gt;decryptInvocationCounter</code>
+      <code>$this-&gt;encryptFixedPart</code>
+      <code>$this-&gt;encryptInvocationCounter</code>
+    </PossiblyNullOperand>
+    <PossiblyNullPropertyAssignmentValue occurrences="4">
+      <code>self::encryption_algorithm_to_crypt_instance($decrypt)</code>
+      <code>self::encryption_algorithm_to_crypt_instance($decrypt)</code>
+      <code>self::encryption_algorithm_to_crypt_instance($encrypt)</code>
+      <code>self::encryption_algorithm_to_crypt_instance($encrypt)</code>
+    </PossiblyNullPropertyAssignmentValue>
+    <PossiblyNullReference occurrences="9">
+      <code>decrypt</code>
+      <code>encrypt</code>
+      <code>getLengthInBytes</code>
+      <code>isValidEngine</code>
+      <code>setKey</code>
+      <code>setKey</code>
+      <code>setNonce</code>
+      <code>usesNonce</code>
+      <code>usesNonce</code>
+    </PossiblyNullReference>
+    <PossiblyUndefinedIntArrayOffset occurrences="5">
+      <code>$matches[0]</code>
+      <code>$this-&gt;server_channels[self::CHANNEL_EXEC]</code>
+      <code>$this-&gt;server_channels[self::CHANNEL_EXEC]</code>
+      <code>$this-&gt;server_channels[self::CHANNEL_SHELL]</code>
+      <code>$this-&gt;server_channels[self::CHANNEL_SUBSYSTEM]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PossiblyUndefinedStringArrayOffset occurrences="1">
+      <code>$temp['length']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUndefinedVariable occurrences="7">
+      <code>$matches</code>
+      <code>$matches</code>
+      <code>$matches</code>
+      <code>$matches</code>
+      <code>$orig</code>
+      <code>$result</code>
+      <code>$temp</code>
+    </PossiblyUndefinedVariable>
+    <PossiblyUnusedMethod occurrences="27">
+      <code>disableSmartMFA</code>
+      <code>enableSmartMFA</code>
+      <code>getAlgorithmsNegotiated</code>
+      <code>getAuthMethodsToContinue</code>
+      <code>getBannerMessage</code>
+      <code>getErrors</code>
+      <code>getLastError</code>
+      <code>getLog</code>
+      <code>getServerAlgorithms</code>
+      <code>getStdError</code>
+      <code>getWindowColumns</code>
+      <code>getWindowRows</code>
+      <code>ping</code>
+      <code>reset</code>
+      <code>sendIdentificationStringFirst</code>
+      <code>sendIdentificationStringLast</code>
+      <code>sendKEXINITFirst</code>
+      <code>sendKEXINITLast</code>
+      <code>setCryptoEngine</code>
+      <code>setKeepAlive</code>
+      <code>setPreferredAlgorithms</code>
+      <code>setTerminal</code>
+      <code>setWindowColumns</code>
+      <code>setWindowRows</code>
+      <code>setWindowSize</code>
+      <code>startSubsystem</code>
+      <code>stopSubsystem</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedReturnValue occurrences="1">
+      <code>($callback is callable ? bool : string|bool)</code>
+    </PossiblyUnusedReturnValue>
+    <PropertyNotSetInConstructor occurrences="22">
+      <code>$agent</code>
+      <code>$decompress_context</code>
+      <code>$decryptFixedPart</code>
+      <code>$decryptInvocationCounter</code>
+      <code>$decryptName</code>
+      <code>$encryptFixedPart</code>
+      <code>$encryptInvocationCounter</code>
+      <code>$encryptName</code>
+      <code>$hmac_check_etm</code>
+      <code>$hmac_check_name</code>
+      <code>$hmac_create_etm</code>
+      <code>$hmac_create_name</code>
+      <code>$host</code>
+      <code>$identifier</code>
+      <code>$last_packet</code>
+      <code>$log_size</code>
+      <code>$port</code>
+      <code>$realtime_log_file</code>
+      <code>$realtime_log_size</code>
+      <code>$realtime_log_wrap</code>
+      <code>$server_public_host_key</code>
+      <code>$stdErrorLog</code>
+    </PropertyNotSetInConstructor>
+    <RedundantCondition occurrences="1">
+      <code>isset($this-&gt;keyboard_requests_responses)</code>
+    </RedundantCondition>
+    <RedundantConditionGivenDocblockType occurrences="3">
+      <code>Strings::is_stringable($arg)</code>
+      <code>is_bool($agent_response)</code>
+      <code>isset($this-&gt;realtime_log_file) &amp;&amp; is_resource($this-&gt;realtime_log_file)</code>
+    </RedundantConditionGivenDocblockType>
+    <RedundantPropertyInitializationCheck occurrences="3">
+      <code>isset($this-&gt;agent)</code>
+      <code>isset($this-&gt;agent)</code>
+      <code>isset($this-&gt;realtime_log_file)</code>
+    </RedundantPropertyInitializationCheck>
+    <ReferenceConstraintViolation occurrences="14">
+      <code>$payload</code>
+      <code>$payload</code>
+      <code>$payload</code>
+      <code>$payload</code>
+      <code>$payload</code>
+      <code>$payload</code>
+      <code>$payload</code>
+      <code>$realtime_log_file</code>
+      <code>$response</code>
+      <code>$response</code>
+      <code>$response</code>
+      <code>$response</code>
+      <code>$response</code>
+      <code>$response</code>
+    </ReferenceConstraintViolation>
+    <TooManyArguments occurrences="1">
+      <code>MessageType::findConstantNameByValue($value = ord($logged[0]), false)</code>
+    </TooManyArguments>
+    <TypeDoesNotContainType occurrences="2">
+      <code>$hasArray</code>
+      <code>$hasString</code>
+    </TypeDoesNotContainType>
+    <UndefinedConstant occurrences="2">
+      <code>NET_SSH2_LOGGING</code>
+      <code>NET_SSH2_LOG_REALTIME_FILENAME</code>
+    </UndefinedConstant>
+    <UndefinedInterfaceMethod occurrences="3">
+      <code>withPadding</code>
+      <code>withSignatureFormat</code>
+      <code>withSignatureFormat</code>
+    </UndefinedInterfaceMethod>
+    <UndefinedMethod occurrences="1">
+      <code>verify</code>
+    </UndefinedMethod>
+    <UnevaluatedCode occurrences="1">
+      <code>break;</code>
+    </UnevaluatedCode>
+    <UnnecessaryVarAnnotation occurrences="3">
+      <code>integer</code>
+      <code>integer</code>
+      <code>integer</code>
+    </UnnecessaryVarAnnotation>
+    <UnusedVariable occurrences="6">
+      <code>$a</code>
+      <code>$data_type_code</code>
+      <code>$first_kex_packet_follows</code>
+      <code>$key</code>
+      <code>$response</code>
+      <code>$server_cookie</code>
+    </UnusedVariable>
+  </file>
+  <file src="../phpseclib/System/SSH/Agent.php">
+    <DocblockTypeContradiction occurrences="2">
+      <code>!$this-&gt;fsock</code>
+      <code>$this-&gt;fsock</code>
+    </DocblockTypeContradiction>
+    <FalsableReturnStatement occurrences="2">
+      <code>false</code>
+      <code>pack('Na*', $agent_reply_bytes, $agent_reply_data)</code>
+    </FalsableReturnStatement>
+    <InvalidFalsableReturnType occurrences="1">
+      <code>string</code>
+    </InvalidFalsableReturnType>
+    <MissingParamType occurrences="1">
+      <code>$address</code>
+    </MissingParamType>
+    <MissingReturnType occurrences="1">
+      <code>request_forwarding</code>
+    </MissingReturnType>
+    <MixedArgument occurrences="6">
+      <code>$agent_reply_bytes</code>
+      <code>$key</code>
+      <code>$key_blob</code>
+      <code>$key_blob</code>
+      <code>$length</code>
+      <code>$temp</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="6">
+      <code>$agent_data_bytes</code>
+      <code>$agent_reply_bytes</code>
+      <code>$agent_reply_data</code>
+      <code>$length</code>
+      <code>$temp</code>
+      <code>$this-&gt;expected_bytes</code>
+    </MixedAssignment>
+    <MixedOperand occurrences="4">
+      <code>$address</code>
+      <code>$agent_data_bytes</code>
+      <code>$agent_data_bytes</code>
+      <code>$key_type</code>
+    </MixedOperand>
+    <PossiblyFalseArgument occurrences="6">
+      <code>$packet</code>
+      <code>$packet</code>
+      <code>unpack('N', $data)</code>
+      <code>unpack('N', $this-&gt;readBytes(4))</code>
+      <code>unpack('N', $this-&gt;readBytes(4))</code>
+      <code>unpack('a*', $agent_reply_data)</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalsePropertyAssignmentValue occurrences="1">
+      <code>fsockopen('unix://' . $address, 0, $errno, $errstr)</code>
+    </PossiblyFalsePropertyAssignmentValue>
+    <PossiblyUnusedMethod occurrences="1">
+      <code>startSSHForwarding</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedReturnValue occurrences="1">
+      <code>Agent</code>
+    </PossiblyUnusedReturnValue>
+    <UnusedVariable occurrences="1">
+      <code>$comment</code>
+    </UnusedVariable>
+  </file>
+  <file src="../phpseclib/System/SSH/Agent/Identity.php">
+    <MixedArgument occurrences="2">
+      <code>$length</code>
+      <code>$signature_blob</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="1">
+      <code>$length</code>
+    </MixedAssignment>
+    <MixedInferredReturnType occurrences="1">
+      <code>string</code>
+    </MixedInferredReturnType>
+    <MixedOperand occurrences="1">
+      <code>self::$curveAliases[$this-&gt;key-&gt;getCurve()]</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="2">
+      <code>$signature_blob</code>
+      <code>$signature_blob</code>
+    </MixedReturnStatement>
+    <PossiblyFalseArgument occurrences="1">
+      <code>unpack('N', $this-&gt;readBytes(4))</code>
+    </PossiblyFalseArgument>
+    <PossiblyInvalidArrayOffset occurrences="1">
+      <code>self::$curveAliases[$this-&gt;key-&gt;getCurve()]</code>
+    </PossiblyInvalidArrayOffset>
+    <PossiblyUnusedMethod occurrences="4">
+      <code>getCurve</code>
+      <code>withHash</code>
+      <code>withPadding</code>
+      <code>withSignatureFormat</code>
+    </PossiblyUnusedMethod>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>$key</code>
+      <code>$key_blob</code>
+    </PropertyNotSetInConstructor>
+    <UnusedVariable occurrences="1">
+      <code>$type</code>
+    </UnusedVariable>
+  </file>
+  <file src="../tests/Functional/Net/SFTPLargeFileTest.php">
+    <PropertyNotSetInConstructor occurrences="3">
+      <code>SFTPLargeFileTest</code>
+      <code>SFTPLargeFileTest</code>
+      <code>SFTPLargeFileTest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>SFTPLargeFileTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Functional/Net/SFTPStreamTest.php">
+    <InvalidArgument occurrences="1">
+      <code>$read</code>
+    </InvalidArgument>
+    <InvalidScalarArgument occurrences="1">
+      <code>$this-&gt;sftp-&gt;pwd()</code>
+    </InvalidScalarArgument>
+    <MissingParamType occurrences="1">
+      <code>$suffix</code>
+    </MissingParamType>
+    <MixedArgument occurrences="1">
+      <code>$suffix</code>
+    </MixedArgument>
+    <PossiblyFalseArgument occurrences="5">
+      <code>$dirs</code>
+      <code>$fp</code>
+      <code>$fp</code>
+      <code>$fp</code>
+      <code>$this-&gt;sftp-&gt;nlist()</code>
+    </PossiblyFalseArgument>
+    <PropertyNotSetInConstructor occurrences="3">
+      <code>SFTPStreamTest</code>
+      <code>SFTPStreamTest</code>
+      <code>SFTPStreamTest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>SFTPStreamTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Functional/Net/SFTPTestCase.php">
+    <MissingPropertyType occurrences="1">
+      <code>$scratchDir</code>
+    </MissingPropertyType>
+    <MixedArgument occurrences="1">
+      <code>$this-&gt;scratchDir</code>
+    </MixedArgument>
+    <RedundantConditionGivenDocblockType occurrences="2">
+      <code>$this-&gt;sftp</code>
+      <code>$this-&gt;sftp</code>
+    </RedundantConditionGivenDocblockType>
+  </file>
+  <file src="../tests/Functional/Net/SFTPUserStoryTest.php">
+    <InvalidScalarArgument occurrences="3">
+      <code>SORT_ASC</code>
+      <code>SORT_DESC</code>
+      <code>SORT_DESC</code>
+    </InvalidScalarArgument>
+    <MissingParamType occurrences="1">
+      <code>$length</code>
+    </MissingParamType>
+    <MissingPropertyType occurrences="3">
+      <code>$buffer</code>
+      <code>$exampleData</code>
+      <code>$exampleDataLength</code>
+    </MissingPropertyType>
+    <MissingReturnType occurrences="34">
+      <code>demoCallback</code>
+      <code>testChDirOnFile</code>
+      <code>testChDirScratch</code>
+      <code>testChDirUpHome</code>
+      <code>testChModOnFile</code>
+      <code>testDeleteEmptyDir</code>
+      <code>testDeleteRecursiveScratch</code>
+      <code>testExecNlist</code>
+      <code>testFileExistsIsFileIsDirDir</code>
+      <code>testFileExistsIsFileIsDirFile</code>
+      <code>testFileExistsIsFileIsDirFileNonexistent</code>
+      <code>testLinkFile</code>
+      <code>testMkDirScratch</code>
+      <code>testPasswordLogin</code>
+      <code>testPutSizeGetFile</code>
+      <code>testPutSizeGetFileCallback</code>
+      <code>testPwdHome</code>
+      <code>testRawlistDisabledStatCache</code>
+      <code>testReadableWritable</code>
+      <code>testReadlink</code>
+      <code>testResourceXfer</code>
+      <code>testRmDirScratch</code>
+      <code>testRmDirScratchNonexistent</code>
+      <code>testSortOrder</code>
+      <code>testStatLstatCache</code>
+      <code>testStatOnCWD</code>
+      <code>testStatOnDir</code>
+      <code>testStatVsLstat</code>
+      <code>testStatcacheFix</code>
+      <code>testSymlink</code>
+      <code>testTouch</code>
+      <code>testTruncate</code>
+      <code>testTruncateLargeFile</code>
+      <code>testUploadOffsets</code>
+    </MissingReturnType>
+    <MixedArgument occurrences="9">
+      <code>$file</code>
+      <code>$length</code>
+      <code>$sftp::SOURCE_CALLBACK</code>
+      <code>$stat['gid']</code>
+      <code>$stat['uid']</code>
+      <code>self::$buffer</code>
+      <code>self::$exampleData</code>
+      <code>self::$exampleData</code>
+      <code>self::$exampleDataLength - 100</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="4">
+      <code>$cur_size</code>
+      <code>$file</code>
+      <code>$last_size</code>
+      <code>self::$buffer</code>
+    </MixedAssignment>
+    <MixedOperand occurrences="3">
+      <code>self::$exampleData</code>
+      <code>self::$exampleDataLength</code>
+      <code>self::$exampleDataLength</code>
+    </MixedOperand>
+    <PossiblyFalseArgument occurrences="3">
+      <code>$fp</code>
+      <code>$fp</code>
+      <code>$fp</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalseIterator occurrences="1">
+      <code>$files</code>
+    </PossiblyFalseIterator>
+    <PossiblyInvalidArgument occurrences="4">
+      <code>$pwd</code>
+      <code>$pwd</code>
+      <code>$sftp-&gt;pwd()</code>
+      <code>$sftp-&gt;pwd()</code>
+    </PossiblyInvalidArgument>
+    <PossiblyInvalidArrayAccess occurrences="14">
+      <code>$stat2['gid']</code>
+      <code>$stat2['uid']</code>
+      <code>$stat['gid']</code>
+      <code>$stat['gid']</code>
+      <code>$stat['type']</code>
+      <code>$stat['type']</code>
+      <code>$stat['type']</code>
+      <code>$stat['type']</code>
+      <code>$stat['type']</code>
+      <code>$stat['type']</code>
+      <code>$stat['type']</code>
+      <code>$stat['type']</code>
+      <code>$stat['uid']</code>
+      <code>$stat['uid']</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyUndefinedStringArrayOffset occurrences="14">
+      <code>$stat2['gid']</code>
+      <code>$stat2['uid']</code>
+      <code>$stat['gid']</code>
+      <code>$stat['gid']</code>
+      <code>$stat['type']</code>
+      <code>$stat['type']</code>
+      <code>$stat['type']</code>
+      <code>$stat['type']</code>
+      <code>$stat['type']</code>
+      <code>$stat['type']</code>
+      <code>$stat['type']</code>
+      <code>$stat['type']</code>
+      <code>$stat['uid']</code>
+      <code>$stat['uid']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>SFTPUserStoryTest</code>
+      <code>SFTPUserStoryTest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>SFTPUserStoryTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Functional/Net/SFTPWrongServerTest.php">
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>SFTPWrongServerTest</code>
+      <code>SFTPWrongServerTest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>SFTPWrongServerTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Functional/Net/SSH2AgentTest.php">
+    <MissingParamType occurrences="1">
+      <code>$args</code>
+    </MissingParamType>
+    <MissingReturnType occurrences="1">
+      <code>testAgentForward</code>
+    </MissingReturnType>
+    <MixedArgument occurrences="2">
+      <code>$ssh-&gt;exec("ssh " . $username . "@" . $hostname . ' \'whoami\'')</code>
+      <code>$ssh-&gt;exec('whoami')</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="2">
+      <code>$args['ssh']</code>
+      <code>$args['ssh-agent']</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="2">
+      <code>$agent</code>
+      <code>$ssh</code>
+    </MixedAssignment>
+    <MixedMethodCall occurrences="3">
+      <code>exec</code>
+      <code>exec</code>
+      <code>startSSHForwarding</code>
+    </MixedMethodCall>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>SSH2AgentTest</code>
+      <code>SSH2AgentTest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>SSH2AgentTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Functional/Net/SSH2Test.php">
+    <ArgumentTypeCoercion occurrences="1">
+      <code>'stdClass'</code>
+    </ArgumentTypeCoercion>
+    <DeprecatedMethod occurrences="1">
+      <code>setMethods</code>
+    </DeprecatedMethod>
+    <InvalidArgument occurrences="1">
+      <code>[$callbackObject, 'callbackMethod']</code>
+    </InvalidArgument>
+    <PossiblyFalseArgument occurrences="1">
+      <code>$ssh-&gt;getServerIdentification()</code>
+    </PossiblyFalseArgument>
+    <PossiblyUndefinedIntArrayOffset occurrences="2">
+      <code>$matches[1]</code>
+      <code>$matches[1]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>SSH2Test</code>
+      <code>SSH2Test</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>SSH2Test</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/PhpseclibFunctionalTestCase.php">
+    <MissingParamType occurrences="2">
+      <code>$variable</code>
+      <code>$variable</code>
+    </MissingParamType>
+    <MissingReturnType occurrences="1">
+      <code>_getEnv</code>
+    </MissingReturnType>
+    <MixedInferredReturnType occurrences="1">
+      <code>string</code>
+    </MixedInferredReturnType>
+    <MixedOperand occurrences="1">
+      <code>$variable</code>
+    </MixedOperand>
+    <MixedReturnStatement occurrences="1">
+      <code>$this-&gt;_getEnv($variable)</code>
+    </MixedReturnStatement>
+    <PossiblyUnusedReturnValue occurrences="1">
+      <code>null</code>
+    </PossiblyUnusedReturnValue>
+  </file>
+  <file src="../tests/PhpseclibTestCase.php">
+    <DeprecatedMethod occurrences="1">
+      <code>parent::assertRegExp($pattern, $string, $message)</code>
+    </DeprecatedMethod>
+    <FalsableReturnStatement occurrences="1">
+      <code>$filename</code>
+    </FalsableReturnStatement>
+    <InvalidArgument occurrences="2">
+      <code>$haystack</code>
+      <code>$haystack</code>
+    </InvalidArgument>
+    <InvalidFalsableReturnType occurrences="1">
+      <code>string</code>
+    </InvalidFalsableReturnType>
+    <MissingParamType occurrences="10">
+      <code>$actual</code>
+      <code>$actual</code>
+      <code>$actual</code>
+      <code>$actual</code>
+      <code>$expected</code>
+      <code>$func</code>
+      <code>$obj</code>
+      <code>$obj</code>
+      <code>$params</code>
+      <code>$var</code>
+    </MissingParamType>
+    <MissingPropertyType occurrences="1">
+      <code>$tempFilesToUnlinkOnTearDown</code>
+    </MissingPropertyType>
+    <MissingReturnType occurrences="2">
+      <code>callFunc</code>
+      <code>getVar</code>
+    </MissingReturnType>
+    <MixedArgument occurrences="10">
+      <code>$expected</code>
+      <code>$expected</code>
+      <code>$filename</code>
+      <code>$filename</code>
+      <code>$func</code>
+      <code>$obj</code>
+      <code>$obj</code>
+      <code>$params</code>
+      <code>$value</code>
+      <code>$var</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="1">
+      <code>$this-&gt;tempFilesToUnlinkOnTearDown[$filename]</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="1">
+      <code>$this-&gt;tempFilesToUnlinkOnTearDown[]</code>
+    </MixedArrayAssignment>
+    <MixedArrayOffset occurrences="1">
+      <code>$this-&gt;tempFilesToUnlinkOnTearDown[$filename]</code>
+    </MixedArrayOffset>
+    <MixedAssignment occurrences="2">
+      <code>$filename</code>
+      <code>$value</code>
+    </MixedAssignment>
+    <PossiblyFalseArgument occurrences="5">
+      <code>$filename</code>
+      <code>$filename</code>
+      <code>$filename</code>
+      <code>$fp</code>
+      <code>$fp</code>
+    </PossiblyFalseArgument>
+    <PossiblyUnusedReturnValue occurrences="1">
+      <code>null</code>
+    </PossiblyUnusedReturnValue>
+  </file>
+  <file src="../tests/PsalmBaselineTest.php">
+    <PossiblyFalseArgument occurrences="1">
+      <code>$baseline</code>
+    </PossiblyFalseArgument>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>PsalmBaselineTest</code>
+      <code>PsalmBaselineTest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>PsalmBaselineTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Crypt/AES/EvalTest.php">
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>EvalTest</code>
+      <code>EvalTest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>EvalTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Crypt/AES/OpenSSLTest.php">
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>OpenSSLTest</code>
+      <code>OpenSSLTest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>OpenSSLTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Crypt/AES/PurePHPTest.php">
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>PurePHPTest</code>
+      <code>PurePHPTest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>PurePHPTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Crypt/AES/TestCase.php">
+    <ArgumentTypeCoercion occurrences="1">
+      <code>'LengthException'</code>
+    </ArgumentTypeCoercion>
+    <MissingParamType occurrences="11">
+      <code>$aes</code>
+      <code>$iv</code>
+      <code>$key</code>
+      <code>$mode</code>
+      <code>$mode</code>
+      <code>$mode</code>
+      <code>$op</code>
+      <code>$op</code>
+      <code>$plaintext</code>
+      <code>$test</code>
+      <code>$test</code>
+    </MissingParamType>
+    <MissingPropertyType occurrences="1">
+      <code>$engine</code>
+    </MissingPropertyType>
+    <MixedArgument occurrences="22">
+      <code>$c1</code>
+      <code>$c1</code>
+      <code>$iv</code>
+      <code>$key</code>
+      <code>$len</code>
+      <code>$len</code>
+      <code>$len</code>
+      <code>$len</code>
+      <code>$mode</code>
+      <code>$mode</code>
+      <code>$mode</code>
+      <code>$plaintext</code>
+      <code>$this-&gt;engine</code>
+      <code>$this-&gt;engine</code>
+      <code>$this-&gt;engine</code>
+      <code>$this-&gt;engine</code>
+      <code>$this-&gt;engine</code>
+      <code>$this-&gt;engine</code>
+      <code>$this-&gt;engine</code>
+      <code>$this-&gt;engine</code>
+      <code>$this-&gt;engine</code>
+      <code>$this-&gt;engine</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="8">
+      <code>$c1</code>
+      <code>$c1</code>
+      <code>$len</code>
+      <code>$len</code>
+      <code>$len</code>
+      <code>$len</code>
+      <code>$output</code>
+      <code>$output</code>
+    </MixedAssignment>
+    <MixedMethodCall occurrences="1">
+      <code>getEngine</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="3">
+      <code>$output</code>
+      <code>$output</code>
+      <code>$this-&gt;engine</code>
+    </MixedOperand>
+    <PossiblyFalseArgument occurrences="32">
+      <code>pack('H*', '00000000000000000000000000000000' . '00000000000000000000000000000000')</code>
+      <code>pack('H*', '00000000000000000000000000000000')</code>
+      <code>pack('H*', '00000000000000000000000000000000')</code>
+      <code>pack('H*', '00000000000000000000000000000000')</code>
+      <code>pack('H*', '00000000000000000000000000000000')</code>
+      <code>pack('H*', '000000000000000000000000000000000000000000000000')</code>
+      <code>pack('H*', '00d596e2c8189b2592fac358e7396ad2')</code>
+      <code>pack('H*', '014730f80ac625fe84f026c60bfd547d')</code>
+      <code>pack('H*', '0457bdb4a6712986688349a29eb82535')</code>
+      <code>pack('H*', '0457bdb4a6712986688349a29eb82535')</code>
+      <code>pack('H*', '0b24af36193ce4665f2825d7b4749c98')</code>
+      <code>pack('H*', '1b077a6af4b7f98229de786d7516b639')</code>
+      <code>pack('H*', '26aa49dcfe7629a8901a69a9914e6dfd')</code>
+      <code>pack('H*', '2b7e151628aed2a6abf7158809cf4f3c762e7160')</code>
+      <code>pack('H*', '2b7e151628aed2a6abf7158809cf4f3c762e7160')</code>
+      <code>pack('H*', '3243f6a8885a308d313198a2e0370734')</code>
+      <code>pack('H*', '3243f6a8885a308d313198a2e0370734')</code>
+      <code>pack('H*', '51719783d3185a535bd75adc65071ce1')</code>
+      <code>pack('H*', '58c8e00b2631686d54eab84b91f0aca1')</code>
+      <code>pack('H*', '6a118a874519e64e9963798a503f1d35')</code>
+      <code>pack('H*', '761c1fe41a18acf20d241650611d90f1')</code>
+      <code>pack('H*', '8a560769d605868ad80d819bdba03771')</code>
+      <code>pack('H*', '91fbef2d15a97816060bee1feaa49afe')</code>
+      <code>pack('H*', '941a4773058224e1ef66d10e0a6ee782')</code>
+      <code>pack('H*', '96ab5c2ff612d9dfaae8c31f30c42168')</code>
+      <code>pack('H*', '9798c4640bad75c7c3227db910174e72')</code>
+      <code>pack('H*', '9aa234ea7c750a8109a0f32d768b964e')</code>
+      <code>pack('H*', '9c2d8842e5f48f57648205d39a239af1')</code>
+      <code>pack('H*', 'b26aeb1874e47ca8358ff22378f09144')</code>
+      <code>pack('H*', 'bff52510095f518ecca60af4205444bb')</code>
+      <code>pack('H*', 'cb9fceec81286ca3e989bd979b0cb284')</code>
+      <code>pack('H*', 'f34481ec3cc627bacd5dc3fb08f273e6')</code>
+    </PossiblyFalseArgument>
+    <PossiblyUnusedMethod occurrences="17">
+      <code>continuousBufferBatteryCombosWithoutSingleCombos</code>
+      <code>continuousBufferCombos</code>
+      <code>testContinuousBuffer</code>
+      <code>testContinuousBufferBattery</code>
+      <code>testECBDecrypt</code>
+      <code>testEncryptDecryptWithContinuousBuffer</code>
+      <code>testGFSBox128</code>
+      <code>testGFSBox192</code>
+      <code>testGFSBox256</code>
+      <code>testGetKeyLengthDefault</code>
+      <code>testGetKeyLengthWith192BitKey</code>
+      <code>testKeyPaddingAES</code>
+      <code>testKeyPaddingRijndael</code>
+      <code>testNoKey</code>
+      <code>testNonContinuousBufferBattery</code>
+      <code>testSetKeyLengthWithLargerKey</code>
+      <code>testSetKeyLengthWithSmallerKey</code>
+    </PossiblyUnusedMethod>
+  </file>
+  <file src="../tests/Unit/Crypt/BlowfishTest.php">
+    <MissingParamType occurrences="4">
+      <code>$engine</code>
+      <code>$expected</code>
+      <code>$key</code>
+      <code>$plaintext</code>
+    </MissingParamType>
+    <MixedArgument occurrences="3">
+      <code>$engine</code>
+      <code>$key</code>
+      <code>$plaintext</code>
+    </MixedArgument>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>BlowfishTest</code>
+      <code>BlowfishTest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>BlowfishTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Crypt/ChaCha20Test.php">
+    <MixedAssignment occurrences="3">
+      <code>$actual</code>
+      <code>$result</code>
+      <code>$result</code>
+    </MixedAssignment>
+    <PossiblyFalseArgument occurrences="5">
+      <code>$aad</code>
+      <code>$key</code>
+      <code>$nonce</code>
+      <code>$nonce</code>
+      <code>$nonce</code>
+    </PossiblyFalseArgument>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>ChaCha20Test</code>
+      <code>ChaCha20Test</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>ChaCha20Test</code>
+    </UnusedClass>
+    <UnusedVariable occurrences="1">
+      <code>$result</code>
+    </UnusedVariable>
+  </file>
+  <file src="../tests/Unit/Crypt/DHTest.php">
+    <ArgumentTypeCoercion occurrences="1">
+      <code>$ourPriv</code>
+    </ArgumentTypeCoercion>
+    <ImplicitToStringCast occurrences="2">
+      <code>$theirPub</code>
+      <code>$theirPublic</code>
+    </ImplicitToStringCast>
+    <MixedArgument occurrences="13">
+      <code>$alicePublic</code>
+      <code>$alicePublic</code>
+      <code>$alicePublic-&gt;toString('MontgomeryPublic')</code>
+      <code>$alicePublic-&gt;toString('MontgomeryPublic')</code>
+      <code>$bobPublic</code>
+      <code>$bobPublic</code>
+      <code>$bobPublic-&gt;toString('MontgomeryPublic')</code>
+      <code>$bobPublic-&gt;toString('MontgomeryPublic')</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$secrets[$i]</code>
+      <code>$theirPub</code>
+      <code>$theirPublic</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="11">
+      <code>$alicePublic</code>
+      <code>$alicePublic</code>
+      <code>$bobPublic</code>
+      <code>$bobPublic</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$ourEphemeralPublic</code>
+      <code>$secrets[$i]</code>
+      <code>$secrets[$i]</code>
+      <code>$theirPub</code>
+      <code>$theirPublic</code>
+    </MixedAssignment>
+    <MixedMethodCall occurrences="5">
+      <code>toString</code>
+      <code>toString</code>
+      <code>toString</code>
+      <code>toString</code>
+      <code>toString</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="1">
+      <code>$ourEphemeralPublic-&gt;toString('MontgomeryPublic')</code>
+    </MixedOperand>
+    <PossiblyFalseArgument occurrences="4">
+      <code>pack('H*', '5dab087e624a8a4b79e17f8b83800ee66f3bb1292618b6fd1c2f8b27ff88e0eb')</code>
+      <code>pack('H*', '77076d0a7318a57d3c16c17251b26645df4c2f87ebc0992ab177fba51db92c2a')</code>
+    </PossiblyFalseArgument>
+    <PossiblyUndefinedIntArrayOffset occurrences="1">
+      <code>$secrets[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>DHTest</code>
+      <code>DHTest</code>
+    </PropertyNotSetInConstructor>
+    <UndefinedMethod occurrences="4">
+      <code>getPublicKey</code>
+      <code>getPublicKey</code>
+      <code>getPublicKey</code>
+      <code>getPublicKey</code>
+    </UndefinedMethod>
+    <UnusedClass occurrences="1">
+      <code>DHTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Crypt/DSA/CreateKeyTest.php">
+    <InvalidArgument occurrences="2">
+      <code>160</code>
+      <code>512</code>
+    </InvalidArgument>
+    <MissingParamType occurrences="1">
+      <code>$params</code>
+    </MissingParamType>
+    <MissingReturnType occurrences="1">
+      <code>testCreateParameters</code>
+    </MissingReturnType>
+    <MixedArgument occurrences="1">
+      <code>$params</code>
+    </MixedArgument>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>CreateKeyTest</code>
+      <code>CreateKeyTest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>CreateKeyTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Crypt/DSA/LoadDSAKeyTest.php">
+    <MixedAssignment occurrences="1">
+      <code>$sig</code>
+    </MixedAssignment>
+    <MixedMethodCall occurrences="3">
+      <code>toString</code>
+      <code>toString</code>
+      <code>toString</code>
+    </MixedMethodCall>
+    <PossiblyNullArgument occurrences="2">
+      <code>preg_replace('#\s#', '', $key)</code>
+      <code>preg_replace('#\s#', '', $pkcs8)</code>
+    </PossiblyNullArgument>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>LoadDSAKeyTest</code>
+      <code>LoadDSAKeyTest</code>
+    </PropertyNotSetInConstructor>
+    <UndefinedMethod occurrences="2">
+      <code>sign</code>
+      <code>verify</code>
+    </UndefinedMethod>
+    <UnusedClass occurrences="1">
+      <code>LoadDSAKeyTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Crypt/DSA/SignatureTest.php">
+    <MixedAssignment occurrences="13">
+      <code>$dsa</code>
+      <code>$dsa</code>
+      <code>$dsa</code>
+      <code>$dsa</code>
+      <code>$dsa</code>
+      <code>$dsa</code>
+      <code>$dsa</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$signature</code>
+      <code>$signature</code>
+      <code>$signature1</code>
+      <code>$signature2</code>
+    </MixedAssignment>
+    <MixedMethodCall occurrences="19">
+      <code>getPublicKey</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>withHash</code>
+      <code>withHash</code>
+      <code>withSignatureFormat</code>
+      <code>withSignatureFormat</code>
+    </MixedMethodCall>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>SignatureTest</code>
+      <code>SignatureTest</code>
+    </PropertyNotSetInConstructor>
+    <UndefinedMethod occurrences="4">
+      <code>withSignatureFormat</code>
+      <code>withSignatureFormat</code>
+      <code>withSignatureFormat</code>
+      <code>withSignatureFormat</code>
+    </UndefinedMethod>
+    <UnusedClass occurrences="1">
+      <code>SignatureTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Crypt/EC/CurveTest.php">
+    <ArgumentTypeCoercion occurrences="2">
+      <code>$class</code>
+      <code>'phpseclib3\Crypt\EC\Formats\Keys\PKCS8'</code>
+    </ArgumentTypeCoercion>
+    <InvalidStringClass occurrences="2">
+      <code>new $class()</code>
+      <code>new $class()</code>
+    </InvalidStringClass>
+    <MissingParamType occurrences="6">
+      <code>$name</code>
+      <code>$name</code>
+      <code>$name</code>
+      <code>$name</code>
+      <code>$name</code>
+      <code>$name</code>
+    </MissingParamType>
+    <MixedArgument occurrences="19">
+      <code>$name</code>
+      <code>$name</code>
+      <code>$name</code>
+      <code>$sig = $privateKey-&gt;sign("\x03")</code>
+      <code>$sig = $privateKey-&gt;sign("\x03")</code>
+      <code>$sig = $privateKey-&gt;sign("\x72")</code>
+      <code>$sig = $privateKey-&gt;sign("\xaf\x82")</code>
+      <code>$sig = $privateKey-&gt;sign($message)</code>
+      <code>$sig = $privateKey-&gt;sign($message)</code>
+      <code>$sig = $privateKey-&gt;sign($message)</code>
+      <code>$sig = $privateKey-&gt;sign($message)</code>
+      <code>$sig = $privateKey-&gt;sign($message)</code>
+      <code>$sig = $privateKey-&gt;sign($message)</code>
+      <code>$sig = $privateKey-&gt;sign($message)</code>
+      <code>$sig = $privateKey-&gt;sign($message)</code>
+      <code>$sig = $privateKey-&gt;sign($message)</code>
+      <code>$sig = $privateKey-&gt;sign($message)</code>
+      <code>$sig = $privateKey-&gt;sign('')</code>
+      <code>$sig = $privateKey-&gt;sign('')</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="34">
+      <code>$QA</code>
+      <code>$curve</code>
+      <code>$dA</code>
+      <code>$oid</code>
+      <code>$privateKey</code>
+      <code>$public</code>
+      <code>$publicKey</code>
+      <code>$publickey</code>
+      <code>$publickey</code>
+      <code>$publickey</code>
+      <code>$sig</code>
+      <code>$sig</code>
+      <code>$sig</code>
+      <code>$sig</code>
+      <code>$sig</code>
+      <code>$sig</code>
+      <code>$sig</code>
+      <code>$sig</code>
+      <code>$sig</code>
+      <code>$sig</code>
+      <code>$sig</code>
+      <code>$sig</code>
+      <code>$sig</code>
+      <code>$sig</code>
+      <code>$sig</code>
+      <code>$sig</code>
+      <code>$sig</code>
+      <code>$sig</code>
+      <code>$sig</code>
+      <code>$signature</code>
+      <code>$signature1</code>
+      <code>$signature1</code>
+      <code>$signature2</code>
+      <code>$signature2</code>
+    </MixedAssignment>
+    <MixedMethodCall occurrences="16">
+      <code>createRandomMultiplier</code>
+      <code>getBasePoint</code>
+      <code>getBasePoint</code>
+      <code>multiplyPoint</code>
+      <code>sign</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verifyPoint</code>
+      <code>verifyPoint</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="2">
+      <code>$name</code>
+      <code>$name</code>
+    </MixedOperand>
+    <PossiblyFalseArgument occurrences="22">
+      <code>$private</code>
+      <code>$private</code>
+      <code>$private</code>
+      <code>$private</code>
+      <code>$private</code>
+      <code>$private</code>
+      <code>$private</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$public</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalseOperand occurrences="16">
+      <code>$private</code>
+      <code>$private</code>
+      <code>$private</code>
+      <code>$private</code>
+      <code>$private</code>
+      <code>$private</code>
+      <code>$private</code>
+      <code>$private</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$public</code>
+    </PossiblyFalseOperand>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>CurveTest</code>
+      <code>CurveTest</code>
+    </PropertyNotSetInConstructor>
+    <UndefinedMethod occurrences="39">
+      <code>getPublicKey</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>withContext</code>
+      <code>withContext</code>
+    </UndefinedMethod>
+    <UnusedClass occurrences="1">
+      <code>CurveTest</code>
+    </UnusedClass>
+    <UnusedForeachValue occurrences="1">
+      <code>$oid</code>
+    </UnusedForeachValue>
+  </file>
+  <file src="../tests/Unit/Crypt/EC/Ed448PrivateKey.php">
+    <MissingParamType occurrences="1">
+      <code>$key</code>
+    </MissingParamType>
+    <MixedArgument occurrences="1">
+      <code>$components['dA']</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="2">
+      <code>$components['dA']</code>
+      <code>$components['secret']</code>
+    </MixedAssignment>
+    <PossiblyUndefinedStringArrayOffset occurrences="2">
+      <code>$arr['dA']</code>
+      <code>$arr['secret']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PossiblyUnusedMethod occurrences="1">
+      <code>load</code>
+    </PossiblyUnusedMethod>
+  </file>
+  <file src="../tests/Unit/Crypt/EC/Ed448PublicKey.php">
+    <MissingParamType occurrences="1">
+      <code>$key</code>
+    </MissingParamType>
+    <PossiblyUnusedMethod occurrences="1">
+      <code>load</code>
+    </PossiblyUnusedMethod>
+  </file>
+  <file src="../tests/Unit/Crypt/EC/KeyTest.php">
+    <ArgumentTypeCoercion occurrences="2">
+      <code>$key-&gt;toString('XML')</code>
+      <code>'RangeException'</code>
+    </ArgumentTypeCoercion>
+    <MissingParamType occurrences="3">
+      <code>$actual</code>
+      <code>$expected</code>
+      <code>$message</code>
+    </MissingParamType>
+    <MixedArgument occurrences="3">
+      <code>$actual</code>
+      <code>$expected</code>
+      <code>$message</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="5">
+      <code>$sig</code>
+      <code>$sig</code>
+      <code>$sig</code>
+      <code>$sig</code>
+      <code>$sig2</code>
+    </MixedAssignment>
+    <MixedMethodCall occurrences="5">
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>sign</code>
+      <code>verify</code>
+    </MixedMethodCall>
+    <PossiblyFalseArgument occurrences="1">
+      <code>$raw</code>
+    </PossiblyFalseArgument>
+    <PossiblyNullOperand occurrences="2">
+      <code>$keyWithoutWS</code>
+      <code>$keyWithoutWS</code>
+    </PossiblyNullOperand>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>KeyTest</code>
+      <code>KeyTest</code>
+    </PropertyNotSetInConstructor>
+    <UndefinedMethod occurrences="38">
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getCurve</code>
+      <code>getPublicKey</code>
+      <code>getPublicKey</code>
+      <code>getPublicKey</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>withSignatureFormat</code>
+      <code>withSignatureFormat</code>
+    </UndefinedMethod>
+    <UnusedClass occurrences="1">
+      <code>KeyTest</code>
+    </UnusedClass>
+    <UnusedVariable occurrences="1">
+      <code>$private</code>
+    </UnusedVariable>
+  </file>
+  <file src="../tests/Unit/Crypt/GCMTest.php">
+    <MissingParamType occurrences="14">
+      <code>$aad</code>
+      <code>$aad</code>
+      <code>$ciphertext</code>
+      <code>$ciphertext</code>
+      <code>$engine</code>
+      <code>$engine</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$nonce</code>
+      <code>$nonce</code>
+      <code>$plaintext</code>
+      <code>$plaintext</code>
+      <code>$tag</code>
+      <code>$tag</code>
+    </MissingParamType>
+    <MixedArgument occurrences="14">
+      <code>$aad</code>
+      <code>$aad</code>
+      <code>$ciphertext</code>
+      <code>$ciphertext</code>
+      <code>$engine</code>
+      <code>$engine</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$nonce</code>
+      <code>$nonce</code>
+      <code>$plaintext</code>
+      <code>$plaintext</code>
+      <code>$tag</code>
+      <code>$tag</code>
+    </MixedArgument>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>GCMTest</code>
+      <code>GCMTest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>GCMTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Crypt/HashTest.php">
+    <MissingParamType occurrences="27">
+      <code>$algo</code>
+      <code>$algorithm</code>
+      <code>$error</code>
+      <code>$expected</code>
+      <code>$expected</code>
+      <code>$hash</code>
+      <code>$hash</code>
+      <code>$hash</code>
+      <code>$hash</code>
+      <code>$hash</code>
+      <code>$hash</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$length</code>
+      <code>$message</code>
+      <code>$message</code>
+      <code>$message</code>
+      <code>$message</code>
+      <code>$message</code>
+      <code>$message</code>
+      <code>$message</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$tag</code>
+    </MissingParamType>
+    <MixedArgument occurrences="16">
+      <code>$algo</code>
+      <code>$algorithm</code>
+      <code>$error</code>
+      <code>$expected</code>
+      <code>$expected</code>
+      <code>$hash</code>
+      <code>$hash</code>
+      <code>$hash</code>
+      <code>$hash</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$message</code>
+      <code>$message</code>
+      <code>$message</code>
+      <code>$result</code>
+      <code>$result</code>
+    </MixedArgument>
+    <MixedOperand occurrences="3">
+      <code>$hash</code>
+      <code>$hash</code>
+      <code>$hash</code>
+    </MixedOperand>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>HashTest</code>
+      <code>HashTest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>HashTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Crypt/RC2Test.php">
+    <MissingParamType occurrences="5">
+      <code>$ciphertext</code>
+      <code>$engine</code>
+      <code>$key</code>
+      <code>$keyLen</code>
+      <code>$plaintext</code>
+    </MissingParamType>
+    <MissingPropertyType occurrences="1">
+      <code>$engines</code>
+    </MissingPropertyType>
+    <MixedArgument occurrences="2">
+      <code>$engine</code>
+      <code>$keyLen</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="1">
+      <code>$engine</code>
+    </MixedAssignment>
+    <PossiblyFalseArgument occurrences="3">
+      <code>pack('H*', $ciphertext)</code>
+      <code>pack('H*', $key)</code>
+      <code>pack('H*', $plaintext)</code>
+    </PossiblyFalseArgument>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>RC2Test</code>
+      <code>RC2Test</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>RC2Test</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Crypt/RC4Test.php">
+    <MissingParamType occurrences="4">
+      <code>$engine</code>
+      <code>$expected</code>
+      <code>$key</code>
+      <code>$offset</code>
+    </MissingParamType>
+    <MixedArgument occurrences="3">
+      <code>$engine</code>
+      <code>$key</code>
+      <code>$offset + 16</code>
+    </MixedArgument>
+    <MixedOperand occurrences="1">
+      <code>$offset</code>
+    </MixedOperand>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>RC4Test</code>
+      <code>RC4Test</code>
+    </PropertyNotSetInConstructor>
+    <TooManyArguments occurrences="2">
+      <code>new RC4(RC4::MODE_CTR)</code>
+      <code>new RC4(RC4::MODE_CTR)</code>
+    </TooManyArguments>
+    <UnusedClass occurrences="1">
+      <code>RC4Test</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Crypt/RSA/CreateKeyTest.php">
+    <MissingParamType occurrences="1">
+      <code>$args</code>
+    </MissingParamType>
+    <MixedArgument occurrences="3">
+      <code>$r['primes']</code>
+      <code>$r['primes']</code>
+      <code>$rsa-&gt;getPublicKey()-&gt;toString('PKCS1')</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="2">
+      <code>$privatekey</code>
+      <code>$publickey</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="6">
+      <code>$actual</code>
+      <code>$ciphertext</code>
+      <code>$plaintext</code>
+      <code>$prime</code>
+      <code>$signature</code>
+      <code>[$publickey, $privatekey]</code>
+    </MixedAssignment>
+    <MixedMethodCall occurrences="4">
+      <code>decrypt</code>
+      <code>encrypt</code>
+      <code>getLength</code>
+      <code>toString</code>
+    </MixedMethodCall>
+    <PossiblyUndefinedStringArrayOffset occurrences="3">
+      <code>$r['primes']</code>
+      <code>$r['primes']</code>
+      <code>PKCS8::extractEncryptionAlgorithm($key)['algorithm']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>CreateKeyTest</code>
+      <code>CreateKeyTest</code>
+    </PropertyNotSetInConstructor>
+    <UndefinedMethod occurrences="3">
+      <code>getPublicKey</code>
+      <code>sign</code>
+      <code>verify</code>
+    </UndefinedMethod>
+    <UnusedClass occurrences="1">
+      <code>CreateKeyTest</code>
+    </UnusedClass>
+    <UnusedVariable occurrences="1">
+      <code>$i</code>
+    </UnusedVariable>
+  </file>
+  <file src="../tests/Unit/Crypt/RSA/LoadKeyTest.php">
+    <InvalidCast occurrences="1">
+      <code>$key</code>
+    </InvalidCast>
+    <MissingParamType occurrences="2">
+      <code>$key</code>
+      <code>$pass</code>
+    </MissingParamType>
+    <MixedArgument occurrences="7">
+      <code>$key</code>
+      <code>$key</code>
+      <code>$pass</code>
+      <code>$r['meta']['algorithm']</code>
+      <code>$r['meta']['cipher']</code>
+      <code>$r['meta']['prf']</code>
+      <code>$rsa-&gt;sign('zzzz')</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="12">
+      <code>$key['d']</code>
+      <code>$key['e']</code>
+      <code>$key['n']</code>
+      <code>$key['primes']</code>
+      <code>$key['primes']</code>
+      <code>$r2['meta']['algorithm']</code>
+      <code>$r2['meta']['cipher']</code>
+      <code>$r2['meta']['prf']</code>
+      <code>$r['meta']['algorithm']</code>
+      <code>$r['meta']['algorithm']</code>
+      <code>$r['meta']['cipher']</code>
+      <code>$r['meta']['prf']</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="6">
+      <code>$key</code>
+      <code>$rsa</code>
+      <code>$rsa</code>
+      <code>$rsa2</code>
+      <code>$sig</code>
+      <code>$sig</code>
+    </MixedAssignment>
+    <MixedMethodCall occurrences="3">
+      <code>sign</code>
+      <code>toString</code>
+      <code>withPadding</code>
+    </MixedMethodCall>
+    <PossiblyFalseArgument occurrences="3">
+      <code>$key</code>
+      <code>$raw</code>
+      <code>hex2bin($key)</code>
+    </PossiblyFalseArgument>
+    <PossiblyInvalidArgument occurrences="1">
+      <code>$ciphertext</code>
+    </PossiblyInvalidArgument>
+    <PossiblyInvalidArrayAccess occurrences="1">
+      <code>$raw['comment']</code>
+    </PossiblyInvalidArrayAccess>
+    <PossiblyNullArgument occurrences="5">
+      <code>$key</code>
+      <code>$key</code>
+      <code>$orig</code>
+      <code>preg_replace('#\s#', '', $key)</code>
+      <code>preg_replace('#\s#', '', $newkey)</code>
+    </PossiblyNullArgument>
+    <PossiblyNullOperand occurrences="1">
+      <code>$keyWithoutWS</code>
+    </PossiblyNullOperand>
+    <PossiblyUndefinedStringArrayOffset occurrences="13">
+      <code>$r2['MGFHash']</code>
+      <code>$r2['hash']</code>
+      <code>$r2['meta']</code>
+      <code>$r2['meta']</code>
+      <code>$r2['meta']</code>
+      <code>$r2['saltLength']</code>
+      <code>$r['MGFHash']</code>
+      <code>$r['hash']</code>
+      <code>$r['meta']</code>
+      <code>$r['meta']['algorithm']</code>
+      <code>$r['meta']['prf']</code>
+      <code>$r['saltLength']</code>
+      <code>$raw['comment']</code>
+    </PossiblyUndefinedStringArrayOffset>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>LoadKeyTest</code>
+      <code>LoadKeyTest</code>
+    </PropertyNotSetInConstructor>
+    <UndefinedMethod occurrences="9">
+      <code>asPrivateKey</code>
+      <code>sign</code>
+      <code>sign</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>withMGFHash</code>
+      <code>withPassword</code>
+      <code>withPassword</code>
+      <code>withPassword</code>
+    </UndefinedMethod>
+    <UnusedClass occurrences="1">
+      <code>LoadKeyTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Crypt/RSA/ModeTest.php">
+    <ArgumentTypeCoercion occurrences="1">
+      <code>'LengthException'</code>
+    </ArgumentTypeCoercion>
+    <MixedArgument occurrences="1">
+      <code>$rsa-&gt;decrypt($result)</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="12">
+      <code>$ciphertext</code>
+      <code>$result</code>
+      <code>$rsa</code>
+      <code>$rsa</code>
+      <code>$rsa</code>
+      <code>$rsa</code>
+      <code>$rsa</code>
+      <code>$rsa</code>
+      <code>$rsa</code>
+      <code>$rsa</code>
+      <code>$rsa</code>
+      <code>$rsa</code>
+    </MixedAssignment>
+    <MixedMethodCall occurrences="25">
+      <code>decrypt</code>
+      <code>decrypt</code>
+      <code>encrypt</code>
+      <code>encrypt</code>
+      <code>getHash</code>
+      <code>getHash</code>
+      <code>getMGFHash</code>
+      <code>getMGFHash</code>
+      <code>getPublicKey</code>
+      <code>getSaltLength</code>
+      <code>getSaltLength</code>
+      <code>sign</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>verify</code>
+      <code>withHash</code>
+      <code>withHash</code>
+      <code>withMGFHash</code>
+      <code>withMGFHash</code>
+      <code>withMGFHash</code>
+      <code>withMGFHash</code>
+      <code>withPadding</code>
+      <code>withSaltLength</code>
+    </MixedMethodCall>
+    <PossiblyFalseArgument occurrences="2">
+      <code>base64_decode('158753FF2AF4D1E5BBAB574D5AE6B54D')</code>
+      <code>base64_decode('272435F22706FA96DE26E980D22DFF67')</code>
+    </PossiblyFalseArgument>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>ModeTest</code>
+      <code>ModeTest</code>
+    </PropertyNotSetInConstructor>
+    <UndefinedMethod occurrences="12">
+      <code>decrypt</code>
+      <code>encrypt</code>
+      <code>getPublicKey</code>
+      <code>withLabel</code>
+      <code>withLabel</code>
+      <code>withMGFHash</code>
+      <code>withPadding</code>
+      <code>withPadding</code>
+      <code>withPadding</code>
+      <code>withSaltLength</code>
+      <code>withSaltLength</code>
+      <code>withSaltLength</code>
+    </UndefinedMethod>
+    <UnusedClass occurrences="1">
+      <code>ModeTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Crypt/RandomTest.php">
+    <MissingParamType occurrences="2">
+      <code>$length</code>
+      <code>$x</code>
+    </MissingParamType>
+    <MixedArgument occurrences="1">
+      <code>$length</code>
+    </MixedArgument>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>RandomTest</code>
+      <code>RandomTest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>RandomTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Crypt/Salsa20Test.php">
+    <MissingParamType occurrences="4">
+      <code>$engine</code>
+      <code>$expected</code>
+      <code>$iv</code>
+      <code>$key</code>
+    </MissingParamType>
+    <MixedArgument occurrences="2">
+      <code>$engine</code>
+      <code>$key</code>
+    </MixedArgument>
+    <PossiblyFalseArgument occurrences="2">
+      <code>pack('H*', $iv)</code>
+      <code>pack('H*', $key)</code>
+    </PossiblyFalseArgument>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>Salsa20Test</code>
+      <code>Salsa20Test</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>Salsa20Test</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Crypt/TripleDESTest.php">
+    <MissingParamType occurrences="9">
+      <code>$engine</code>
+      <code>$engine</code>
+      <code>$expected</code>
+      <code>$expected</code>
+      <code>$iv</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$plaintext</code>
+      <code>$plaintext</code>
+    </MissingParamType>
+    <MissingPropertyType occurrences="1">
+      <code>$engines</code>
+    </MissingPropertyType>
+    <MixedArgument occurrences="8">
+      <code>$engine</code>
+      <code>$engine</code>
+      <code>$engine</code>
+      <code>$iv</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$plaintext</code>
+      <code>$plaintext</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="2">
+      <code>$engine</code>
+      <code>$engine</code>
+    </MixedAssignment>
+    <PossiblyFalseArgument occurrences="1">
+      <code>base64_decode($key)</code>
+    </PossiblyFalseArgument>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>TripleDESTest</code>
+      <code>TripleDESTest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>TripleDESTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Crypt/TwofishTest.php">
+    <PossiblyFalseArgument occurrences="9">
+      <code>$key</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>$plaintext</code>
+      <code>$plaintext</code>
+      <code>$plaintext</code>
+      <code>$plaintext</code>
+      <code>$plaintext</code>
+      <code>$plaintext</code>
+    </PossiblyFalseArgument>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>TwofishTest</code>
+      <code>TwofishTest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>TwofishTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/File/ANSITest.php">
+    <PossiblyUndefinedIntArrayOffset occurrences="1">
+      <code>$lines[22]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>ANSITest</code>
+      <code>ANSITest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>ANSITest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/File/ASN1Test.php">
+    <MixedArgument occurrences="7">
+      <code>$a[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]['content']</code>
+      <code>$decoded[0]['content']</code>
+      <code>$decoded[0]['content'][1]['content'][0]['content']</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="4">
+      <code>$decoded[0]['content']</code>
+      <code>$decoded[0]['content']</code>
+      <code>$decoded[0]['content']</code>
+      <code>$decoded[0]['content']</code>
+    </MixedArrayAccess>
+    <PossiblyFalseArgument occurrences="17">
+      <code>$a</code>
+      <code>$data</code>
+      <code>$em</code>
+      <code>$em</code>
+      <code>$em</code>
+      <code>$em</code>
+      <code>$em</code>
+      <code>$em</code>
+      <code>$em</code>
+      <code>$em</code>
+      <code>$em</code>
+      <code>$orig</code>
+      <code>base64_decode($str)</code>
+      <code>base64_decode($str)</code>
+      <code>base64_decode($str)</code>
+      <code>base64_decode('MBaAFJtUo7c00HsI5EPZ4bkICfkOY2Pv')</code>
+      <code>file_get_contents(dirname(__FILE__) . '/ASN1/FE.pdf.p7m')</code>
+    </PossiblyFalseArgument>
+    <PossiblyFalseOperand occurrences="1">
+      <code>base64_decode('MD6gJQYKKwYBBAGCNxQCA6AXDBVvZmZpY2VAY2VydGRpZ2l0YWwucm+BFW9mZmljZUBjZXJ0ZGlnaXRhbC5ybw==')</code>
+    </PossiblyFalseOperand>
+    <PossiblyNullArgument occurrences="7">
+      <code>$a[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]['content']</code>
+      <code>$decoded[0]['content']</code>
+      <code>$decoded[0]['content'][1]['content'][0]['content']</code>
+    </PossiblyNullArgument>
+    <PossiblyNullArrayAccess occurrences="8">
+      <code>$a[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+    </PossiblyNullArrayAccess>
+    <PossiblyUndefinedIntArrayOffset occurrences="8">
+      <code>$a[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+      <code>$decoded[0]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>ASN1Test</code>
+      <code>ASN1Test</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>ASN1Test</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/File/X509/CRLTest.php">
+    <InvalidArgument occurrences="1">
+      <code>$CAPubKey</code>
+    </InvalidArgument>
+    <MixedArgument occurrences="4">
+      <code>$r['signatureAlgorithm']</code>
+      <code>$result</code>
+      <code>$x509-&gt;signCRL($CAIssuer, $x509)</code>
+      <code>$x509-&gt;signCRL($CAIssuer, new X509())</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="1">
+      <code>$r['signatureAlgorithm']</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="3">
+      <code>$crl</code>
+      <code>$r</code>
+      <code>$result</code>
+    </MixedAssignment>
+    <PossiblyFalseArgument occurrences="2">
+      <code>$CA</code>
+      <code>$test</code>
+    </PossiblyFalseArgument>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>CRLTest</code>
+      <code>CRLTest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>CRLTest</code>
+    </UnusedClass>
+    <UnusedVariable occurrences="1">
+      <code>$crl</code>
+    </UnusedVariable>
+  </file>
+  <file src="../tests/Unit/File/X509/CSRTest.php">
+    <MixedArgument occurrences="3">
+      <code>$rsa</code>
+      <code>$x509-&gt;signCSR()</code>
+      <code>$x509-&gt;signCSR()</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="4">
+      <code>$csr</code>
+      <code>$csr</code>
+      <code>$rsa</code>
+      <code>$spkac</code>
+    </MixedAssignment>
+    <MixedMethodCall occurrences="5">
+      <code>getPadding</code>
+      <code>getPadding</code>
+      <code>getPadding</code>
+      <code>getPadding</code>
+      <code>withHash</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="4">
+      <code>$x509-&gt;getPublicKey()-&gt;getPadding()</code>
+      <code>$x509-&gt;getPublicKey()-&gt;getPadding()</code>
+      <code>$x509-&gt;getPublicKey()-&gt;getPadding()</code>
+      <code>$x509-&gt;getPublicKey()-&gt;getPadding()</code>
+    </MixedOperand>
+    <PossiblyFalseArgument occurrences="2">
+      <code>$csr</code>
+      <code>$x509-&gt;saveCSR($x509-&gt;signCSR(), X509::FORMAT_DER)</code>
+    </PossiblyFalseArgument>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>CSRTest</code>
+      <code>CSRTest</code>
+    </PropertyNotSetInConstructor>
+    <UndefinedMethod occurrences="1">
+      <code>withPadding</code>
+    </UndefinedMethod>
+    <UnusedClass occurrences="1">
+      <code>CSRTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/File/X509/SPKACTest.php">
+    <InvalidArgument occurrences="2">
+      <code>$privatekey</code>
+      <code>$privatekey</code>
+    </InvalidArgument>
+    <MixedArgument occurrences="3">
+      <code>$spkac</code>
+      <code>$spkac</code>
+      <code>$spkac</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="1">
+      <code>$spkac['publicKeyAndChallenge']</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="1">
+      <code>$spkac['publicKeyAndChallenge']</code>
+    </MixedArrayAssignment>
+    <MixedAssignment occurrences="6">
+      <code>$pubKey</code>
+      <code>$spkac</code>
+      <code>$spkac</code>
+      <code>$spkac</code>
+      <code>$spkac</code>
+      <code>$spkac</code>
+    </MixedAssignment>
+    <PossiblyFalseArgument occurrences="1">
+      <code>$x509-&gt;saveSPKAC($spkac)</code>
+    </PossiblyFalseArgument>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>SPKACTest</code>
+      <code>SPKACTest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>SPKACTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/File/X509/X509ExtensionTest.php">
+    <ArgumentTypeCoercion occurrences="1">
+      <code>'phpseclib3\Math\BigInteger'</code>
+    </ArgumentTypeCoercion>
+    <InvalidArgument occurrences="1">
+      <code>$publicKey</code>
+    </InvalidArgument>
+    <MixedArgument occurrences="3">
+      <code>$authority-&gt;sign($issuer, $subject)</code>
+      <code>$result</code>
+      <code>$subjectKey</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="9">
+      <code>$customExtensionDecodedData['list']</code>
+      <code>$customExtensionDecodedData['name']</code>
+      <code>$customExtensionDecodedData['num']</code>
+      <code>$customExtensionDecodedData['num']</code>
+      <code>$customExtensionDecodedData['toggle']</code>
+      <code>$decodedData['tbsCertificate']</code>
+      <code>$extension['extnId']</code>
+      <code>$extension['extnValue']</code>
+      <code>$loader-&gt;loadX509($cert)['tbsCertificate']</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="5">
+      <code>$customExtensionDecodedData</code>
+      <code>$decodedData</code>
+      <code>$extension</code>
+      <code>$result</code>
+      <code>$subjectKey</code>
+    </MixedAssignment>
+    <PossiblyFalseArgument occurrences="2">
+      <code>$cert</code>
+      <code>$certificate</code>
+    </PossiblyFalseArgument>
+    <PossiblyNullArrayAccess occurrences="5">
+      <code>$customExtensionDecodedData['list']</code>
+      <code>$customExtensionDecodedData['name']</code>
+      <code>$customExtensionDecodedData['num']</code>
+      <code>$customExtensionDecodedData['num']</code>
+      <code>$customExtensionDecodedData['toggle']</code>
+    </PossiblyNullArrayAccess>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>X509ExtensionTest</code>
+      <code>X509ExtensionTest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>X509ExtensionTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/File/X509/X509Test.php">
+    <InvalidArgument occurrences="5">
+      <code>$private</code>
+      <code>$private</code>
+      <code>$private</code>
+      <code>$private</code>
+      <code>$privatekey</code>
+    </InvalidArgument>
+    <MixedArgument occurrences="27">
+      <code>$cakey</code>
+      <code>$cert</code>
+      <code>$cert['signatureAlgorithm']</code>
+      <code>$cert['tbsCertificate']['signature']</code>
+      <code>$cert['tbsCertificate']['subjectPublicKeyInfo']['algorithm']</code>
+      <code>$crt</code>
+      <code>$decoded</code>
+      <code>$newcert-&gt;sign($ca, $oldcert)</code>
+      <code>$privKey</code>
+      <code>$private</code>
+      <code>$private-&gt;getPublicKey()</code>
+      <code>$pubKey</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$publickey</code>
+      <code>$r</code>
+      <code>$r['signatureAlgorithm']</code>
+      <code>$r['tbsCertificate']['signature']</code>
+      <code>$r['tbsCertificate']['subjectPublicKeyInfo']['algorithm']</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result['tbsCertificate']['extensions']</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="37">
+      <code>$cert['signatureAlgorithm']</code>
+      <code>$cert['tbsCertificate']</code>
+      <code>$cert['tbsCertificate']</code>
+      <code>$cert['tbsCertificate']</code>
+      <code>$cert['tbsCertificate']</code>
+      <code>$cert['tbsCertificate']</code>
+      <code>$cert['tbsCertificate']</code>
+      <code>$cert['tbsCertificate']</code>
+      <code>$cert['tbsCertificate']</code>
+      <code>$cert['tbsCertificate']</code>
+      <code>$r['signatureAlgorithm']</code>
+      <code>$r['signatureAlgorithm']</code>
+      <code>$r['signatureAlgorithm']</code>
+      <code>$r['signatureAlgorithm']</code>
+      <code>$r['signatureAlgorithm']</code>
+      <code>$r['signatureAlgorithm']</code>
+      <code>$r['signatureAlgorithm']</code>
+      <code>$r['signatureAlgorithm']</code>
+      <code>$r['tbsCertificate']</code>
+      <code>$r['tbsCertificate']</code>
+      <code>$r['tbsCertificate']</code>
+      <code>$r['tbsCertificate']</code>
+      <code>$r['tbsCertificate']</code>
+      <code>$r['tbsCertificate']</code>
+      <code>$r['tbsCertificate']</code>
+      <code>$r['tbsCertificate']</code>
+      <code>$r['tbsCertificate']</code>
+      <code>$r['tbsCertificate']</code>
+      <code>$r['tbsCertificate']</code>
+      <code>$r['tbsCertificate']</code>
+      <code>$r['tbsCertificate']</code>
+      <code>$r['tbsCertificate']</code>
+      <code>$r['tbsCertificate']</code>
+      <code>$r['tbsCertificate']</code>
+      <code>$r['tbsCertificate']</code>
+      <code>$r['tbsCertificate']</code>
+      <code>$result['tbsCertificate']</code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment occurrences="1">
+      <code>$cert['tbsCertificate']</code>
+    </MixedArrayAssignment>
+    <MixedAssignment occurrences="38">
+      <code>$authorityKeyIdentifier</code>
+      <code>$authorityKeyIdentifier</code>
+      <code>$cakey</code>
+      <code>$cert</code>
+      <code>$cert</code>
+      <code>$cert</code>
+      <code>$cert</code>
+      <code>$cert</code>
+      <code>$cert</code>
+      <code>$cert</code>
+      <code>$crt</code>
+      <code>$decoded</code>
+      <code>$privKey</code>
+      <code>$private</code>
+      <code>$pubKey</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$public</code>
+      <code>$publickey</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+    </MixedAssignment>
+    <MixedMethodCall occurrences="5">
+      <code>getPublicKey</code>
+      <code>getPublicKey</code>
+      <code>withHash</code>
+      <code>withHash</code>
+      <code>withHash</code>
+    </MixedMethodCall>
+    <PossiblyFalseArgument occurrences="10">
+      <code>$a</code>
+      <code>$cert</code>
+      <code>$newcert-&gt;saveX509($newcert-&gt;sign($ca, $oldcert))</code>
+      <code>$r</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$result</code>
+      <code>$x509-&gt;saveX509($cert)</code>
+      <code>$x509-&gt;saveX509($decoded)</code>
+    </PossiblyFalseArgument>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>X509Test</code>
+      <code>X509Test</code>
+    </PropertyNotSetInConstructor>
+    <UndefinedMethod occurrences="8">
+      <code>getPublicKey</code>
+      <code>getPublicKey</code>
+      <code>getPublicKey</code>
+      <code>getPublicKey</code>
+      <code>getPublicKey</code>
+      <code>withPadding</code>
+      <code>withPadding</code>
+      <code>withPadding</code>
+    </UndefinedMethod>
+    <UnusedClass occurrences="1">
+      <code>X509Test</code>
+    </UnusedClass>
+    <UnusedVariable occurrences="1">
+      <code>$cert</code>
+    </UnusedVariable>
+  </file>
+  <file src="../tests/Unit/Math/BigInteger/BCMathTest.php">
+    <ArgumentTypeCoercion occurrences="1">
+      <code>'DefaultEngine'</code>
+    </ArgumentTypeCoercion>
+    <MissingParamType occurrences="2">
+      <code>$base</code>
+      <code>$x</code>
+    </MissingParamType>
+    <MixedArgument occurrences="1">
+      <code>$base</code>
+    </MixedArgument>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>BCMathTest</code>
+      <code>BCMathTest</code>
+    </PropertyNotSetInConstructor>
+    <UndefinedClass occurrences="1">
+      <code>'DefaultEngine'</code>
+    </UndefinedClass>
+    <UnusedClass occurrences="1">
+      <code>BCMathTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Math/BigInteger/DefaultTest.php">
+    <MissingParamType occurrences="2">
+      <code>$base</code>
+      <code>$x</code>
+    </MissingParamType>
+    <MixedArgument occurrences="2">
+      <code>$base</code>
+      <code>$x</code>
+    </MixedArgument>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>DefaultTest</code>
+      <code>DefaultTest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>DefaultTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Math/BigInteger/GMPTest.php">
+    <ArgumentTypeCoercion occurrences="1">
+      <code>'DefaultEngine'</code>
+    </ArgumentTypeCoercion>
+    <MissingParamType occurrences="2">
+      <code>$base</code>
+      <code>$x</code>
+    </MissingParamType>
+    <MixedArgument occurrences="1">
+      <code>$base</code>
+    </MixedArgument>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>GMPTest</code>
+      <code>GMPTest</code>
+    </PropertyNotSetInConstructor>
+    <UndefinedClass occurrences="1">
+      <code>'DefaultEngine'</code>
+    </UndefinedClass>
+    <UnusedClass occurrences="1">
+      <code>GMPTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Math/BigInteger/PHP32Test.php">
+    <ArgumentTypeCoercion occurrences="1">
+      <code>'DefaultEngine'</code>
+    </ArgumentTypeCoercion>
+    <MissingParamType occurrences="2">
+      <code>$base</code>
+      <code>$x</code>
+    </MissingParamType>
+    <MixedArgument occurrences="1">
+      <code>$base</code>
+    </MixedArgument>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>PHP32Test</code>
+      <code>PHP32Test</code>
+    </PropertyNotSetInConstructor>
+    <UndefinedClass occurrences="1">
+      <code>'DefaultEngine'</code>
+    </UndefinedClass>
+    <UnusedClass occurrences="1">
+      <code>PHP32Test</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Math/BigInteger/PHP64OpenSSLTest.php">
+    <ArgumentTypeCoercion occurrences="1">
+      <code>'OpenSSL'</code>
+    </ArgumentTypeCoercion>
+    <MissingParamType occurrences="2">
+      <code>$base</code>
+      <code>$x</code>
+    </MissingParamType>
+    <MixedArgument occurrences="1">
+      <code>$base</code>
+    </MixedArgument>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>PHP64OpenSSLTest</code>
+      <code>PHP64OpenSSLTest</code>
+    </PropertyNotSetInConstructor>
+    <UndefinedClass occurrences="1">
+      <code>'OpenSSL'</code>
+    </UndefinedClass>
+    <UnusedClass occurrences="1">
+      <code>PHP64OpenSSLTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Math/BigInteger/PHP64Test.php">
+    <ArgumentTypeCoercion occurrences="1">
+      <code>'DefaultEngine'</code>
+    </ArgumentTypeCoercion>
+    <MissingParamType occurrences="2">
+      <code>$base</code>
+      <code>$x</code>
+    </MissingParamType>
+    <MixedArgument occurrences="1">
+      <code>$base</code>
+    </MixedArgument>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>PHP64Test</code>
+      <code>PHP64Test</code>
+    </PropertyNotSetInConstructor>
+    <UndefinedClass occurrences="1">
+      <code>'DefaultEngine'</code>
+    </UndefinedClass>
+    <UnusedClass occurrences="1">
+      <code>PHP64Test</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Math/BigInteger/TestCase.php">
+    <MixedArgument occurrences="1">
+      <code>$r</code>
+    </MixedArgument>
+    <MixedArrayAccess occurrences="11">
+      <code>$arr['gcd']</code>
+      <code>$arr['x']</code>
+      <code>$arr['y']</code>
+      <code>$q</code>
+      <code>$q</code>
+      <code>$q</code>
+      <code>$q</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+      <code>$r</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="115">
+      <code>$a</code>
+      <code>$a</code>
+      <code>$a</code>
+      <code>$a</code>
+      <code>$a</code>
+      <code>$a</code>
+      <code>$a</code>
+      <code>$a</code>
+      <code>$a</code>
+      <code>$a</code>
+      <code>$a</code>
+      <code>$alicePrivate</code>
+      <code>$alicePublic</code>
+      <code>$aliceShared</code>
+      <code>$arr</code>
+      <code>$b</code>
+      <code>$b</code>
+      <code>$b</code>
+      <code>$b</code>
+      <code>$b</code>
+      <code>$b</code>
+      <code>$b</code>
+      <code>$b</code>
+      <code>$b</code>
+      <code>$b</code>
+      <code>$bigInteger</code>
+      <code>$bigInteger</code>
+      <code>$bigInteger</code>
+      <code>$bigInteger</code>
+      <code>$bigInteger</code>
+      <code>$bigInteger</code>
+      <code>$bobPrivate</code>
+      <code>$bobPublic</code>
+      <code>$bobShared</code>
+      <code>$c</code>
+      <code>$c</code>
+      <code>$c</code>
+      <code>$c</code>
+      <code>$c</code>
+      <code>$c</code>
+      <code>$class</code>
+      <code>$class</code>
+      <code>$class</code>
+      <code>$class</code>
+      <code>$d</code>
+      <code>$d</code>
+      <code>$d</code>
+      <code>$e</code>
+      <code>$generator</code>
+      <code>$max</code>
+      <code>$max</code>
+      <code>$max</code>
+      <code>$min</code>
+      <code>$min</code>
+      <code>$min</code>
+      <code>$n</code>
+      <code>$n</code>
+      <code>$num</code>
+      <code>$prime</code>
+      <code>$prime</code>
+      <code>$r</code>
+      <code>$rand1</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$temp</code>
+      <code>$three</code>
+      <code>$two</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x</code>
+      <code>$x2</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$y</code>
+      <code>$z</code>
+      <code>$z</code>
+      <code>$z</code>
+      <code>$z</code>
+      <code>$z</code>
+      <code>$z</code>
+      <code>[$q, $r]</code>
+      <code>[$q, $r]</code>
+      <code>[$q, $r]</code>
+      <code>[$q, $r]</code>
+    </MixedAssignment>
+    <MixedClone occurrences="2">
+      <code>clone $a</code>
+      <code>clone $x</code>
+    </MixedClone>
+    <MixedMethodCall occurrences="109">
+      <code>$class::max($max, $min)</code>
+      <code>$class::max($min, $max)</code>
+      <code>$class::min($max, $min)</code>
+      <code>$class::min($min, $max)</code>
+      <code>$class::randomPrime(128)</code>
+      <code>$class::randomRange($min, $max)</code>
+      <code>abs</code>
+      <code>add</code>
+      <code>add</code>
+      <code>bitwise_AND</code>
+      <code>bitwise_LeftShift</code>
+      <code>bitwise_NOT</code>
+      <code>bitwise_OR</code>
+      <code>bitwise_OR</code>
+      <code>bitwise_OR</code>
+      <code>bitwise_RightShift</code>
+      <code>bitwise_RightShift</code>
+      <code>bitwise_RightShift</code>
+      <code>bitwise_XOR</code>
+      <code>bitwise_not</code>
+      <code>bitwise_xor</code>
+      <code>bitwise_xor</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>compare</code>
+      <code>divide</code>
+      <code>divide</code>
+      <code>divide</code>
+      <code>divide</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>equals</code>
+      <code>extendedGCD</code>
+      <code>gcd</code>
+      <code>getLength</code>
+      <code>getPrecision</code>
+      <code>getPrecision</code>
+      <code>getPrecision</code>
+      <code>getPrecision</code>
+      <code>modInverse</code>
+      <code>modPow</code>
+      <code>modPow</code>
+      <code>modPow</code>
+      <code>modPow</code>
+      <code>modPow</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>multiply</code>
+      <code>pow</code>
+      <code>pow</code>
+      <code>powMod</code>
+      <code>root</code>
+      <code>root</code>
+      <code>setPrecision</code>
+      <code>setPrecision</code>
+      <code>subtract</code>
+      <code>toBits</code>
+      <code>toBits</code>
+      <code>toBits</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toBytes</code>
+      <code>toHex</code>
+      <code>toHex</code>
+      <code>toHex</code>
+      <code>toHex</code>
+      <code>toHex</code>
+      <code>toHex</code>
+      <code>toHex</code>
+      <code>toHex</code>
+      <code>toHex</code>
+      <code>toHex</code>
+      <code>toHex</code>
+      <code>toHex</code>
+      <code>toHex</code>
+      <code>toHex</code>
+      <code>toHex</code>
+      <code>toHex</code>
+      <code>toHex</code>
+      <code>toHex</code>
+      <code>toString</code>
+      <code>toString</code>
+      <code>toString</code>
+      <code>toString</code>
+      <code>toString</code>
+      <code>toString</code>
+      <code>toString</code>
+      <code>toString</code>
+      <code>toString</code>
+      <code>toString</code>
+      <code>toString</code>
+      <code>toString</code>
+    </MixedMethodCall>
+    <MixedOperand occurrences="2">
+      <code>$a-&gt;toString()</code>
+      <code>$b-&gt;toString()</code>
+    </MixedOperand>
+    <PossiblyUnusedMethod occurrences="41">
+      <code>test48ToHex</code>
+      <code>testAbs</code>
+      <code>testAdd</code>
+      <code>testBitwiseAND</code>
+      <code>testBitwiseLeftShift</code>
+      <code>testBitwiseNOT</code>
+      <code>testBitwiseOR</code>
+      <code>testBitwiseRightShift</code>
+      <code>testBitwiseXOR</code>
+      <code>testClone</code>
+      <code>testCompare</code>
+      <code>testConstructorBase10</code>
+      <code>testConstructorBase16</code>
+      <code>testConstructorBase2</code>
+      <code>testConstructorBase256</code>
+      <code>testDebugInfo</code>
+      <code>testDiffieHellmanKeyAgreement</code>
+      <code>testDivide</code>
+      <code>testEquals</code>
+      <code>testExtendedGCD</code>
+      <code>testGCD</code>
+      <code>testMax</code>
+      <code>testMin</code>
+      <code>testModInverse</code>
+      <code>testModPow</code>
+      <code>testMultiply</code>
+      <code>testNegativePrecision</code>
+      <code>testPow</code>
+      <code>testPrecision</code>
+      <code>testRandomPrime</code>
+      <code>testRandomTwoArgument</code>
+      <code>testRoot</code>
+      <code>testSerializable</code>
+      <code>testSlidingWindow</code>
+      <code>testSubtract</code>
+      <code>testToBits</code>
+      <code>testToBytes</code>
+      <code>testToBytesTwosCompliment</code>
+      <code>testToHex</code>
+      <code>testZeroBase10</code>
+      <code>testZeros</code>
+    </PossiblyUnusedMethod>
+    <UndefinedMethod occurrences="102">
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>getInstance</code>
+      <code>static::getStaticClass()</code>
+      <code>static::getStaticClass()</code>
+      <code>static::getStaticClass()</code>
+      <code>static::getStaticClass()</code>
+    </UndefinedMethod>
+    <UnusedVariable occurrences="1">
+      <code>$q</code>
+    </UnusedVariable>
+  </file>
+  <file src="../tests/Unit/Math/BigIntegerTest.php">
+    <InvalidArgument occurrences="2">
+      <code>$engine[0]</code>
+      <code>$engine[1]</code>
+    </InvalidArgument>
+    <InvalidCast occurrences="1">
+      <code>$engine[0]</code>
+    </InvalidCast>
+    <PossiblyUndefinedIntArrayOffset occurrences="2">
+      <code>$engine[0]</code>
+      <code>$engine[1]</code>
+    </PossiblyUndefinedIntArrayOffset>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>BigIntegerTest</code>
+      <code>BigIntegerTest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>BigIntegerTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Net/SFTPStreamUnitTest.php">
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>SFTPStreamUnitTest</code>
+      <code>SFTPStreamUnitTest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>SFTPStreamUnitTest</code>
+    </UnusedClass>
+  </file>
+  <file src="../tests/Unit/Net/SSH2UnitTest.php">
+    <ArgumentTypeCoercion occurrences="1">
+      <code>'phpseclib3\Net\SSH2'</code>
+    </ArgumentTypeCoercion>
+    <DeprecatedMethod occurrences="1">
+      <code>setMethods</code>
+    </DeprecatedMethod>
+    <InvalidReturnStatement occurrences="1"/>
+    <InvalidReturnType occurrences="1">
+      <code>SSH2</code>
+    </InvalidReturnType>
+    <MissingParamType occurrences="1">
+      <code>$expected</code>
+    </MissingParamType>
+    <MixedArgument occurrences="1">
+      <code>$identifier</code>
+    </MixedArgument>
+    <MixedAssignment occurrences="2">
+      <code>$identifier</code>
+      <code>$result</code>
+    </MixedAssignment>
+    <PropertyNotSetInConstructor occurrences="2">
+      <code>SSH2UnitTest</code>
+      <code>SSH2UnitTest</code>
+    </PropertyNotSetInConstructor>
+    <UnusedClass occurrences="1">
+      <code>SSH2UnitTest</code>
+    </UnusedClass>
+  </file>
+</files>
diff --git a/build/sami.conf.php b/build/sami.conf.php
deleted file mode 100644
index 9fe0286c4..000000000
--- a/build/sami.conf.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-// Prevent e.g. 'Notice: Constant MATH_BIGINTEGER_MONTGOMERY already defined'.
-class MyArrayStore extends Sami\Store\ArrayStore
-{
-    public function removeClass(Sami\Project $project, $name)
-    {
-        unset($this->classes[$name]);
-    }
-}
-
-$iterator = Symfony\Component\Finder\Finder::create()
-    ->files()
-    ->name('*.php')
-    ->in(__DIR__ . '/../phpseclib/')
-;
-
-$versions = Sami\Version\GitVersionCollection::create(__DIR__ . '/../')
-    ->add('1.0')
-    ->add('2.0')
-    ->add('master')
-;
-
-return new Sami\Sami($iterator, array(
-    'theme'                => 'enhanced',
-    'versions'             => $versions,
-    'title'                => 'phpseclib API Documentation',
-    'build_dir'            => __DIR__.'/api/output/%version%',
-    'cache_dir'            => __DIR__.'/api/cache/%version%',
-    'default_opened_level' => 2,
-    'store'                => new MyArrayStore,
-));
diff --git a/composer.json b/composer.json
index 10315f3a8..5ca5c4e52 100644
--- a/composer.json
+++ b/composer.json
@@ -20,8 +20,8 @@
         "asn1",
         "asn.1",
         "BigInteger"
-        ],
-    "homepage": "http://phpseclib.sourceforge.net",
+    ],
+    "homepage": "https://phpseclib.com/",
     "license": "MIT",
     "authors": [
         {
@@ -48,26 +48,63 @@
             "name": "Graham Campbell",
             "email": "graham@alt-three.com",
             "role": "Developer"
+        },
+        {
+            "name": "Jack Worman",
+            "email": "jack.worman@gmail.com",
+            "role": "Developer",
+            "homepage": "https://jackworman.com"
         }
     ],
     "require": {
-        "php": ">=5.3.3"
+        "php": ">=8.1",
+        "paragonie/constant_time_encoding": "^2|^3"
     },
     "require-dev": {
-        "phing/phing": "~2.7",
-        "phpunit/phpunit": "~4.0",
-        "sami/sami": "~2.0",
-        "squizlabs/php_codesniffer": "~2.0"
+        "ext-xml": "*",
+        "brianium/paratest": "^6.6",
+        "friendsofphp/php-cs-fixer": "^3.12",
+        "php-parallel-lint/php-parallel-lint": "^1.3",
+        "squizlabs/php_codesniffer": "^3.7",
+        "vimeo/psalm": "^4.29"
     },
     "suggest": {
         "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
         "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations.",
-        "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
-        "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations."
+        "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
+        "ext-dom": "Install the DOM extension to load XML formatted public keys."
     },
     "autoload": {
+        "files": [
+            "phpseclib/bootstrap.php"
+        ],
         "psr-4": {
-            "phpseclib\\": "phpseclib/"
+            "phpseclib3\\": "phpseclib/"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "phpseclib3\\Tests\\": "tests/"
+        }
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "scripts": {
+        "lint": "vendor/bin/parallel-lint --show-deprecated build phpseclib tests",
+        "php_codesniffer": "vendor/bin/phpcs --standard=build/php_codesniffer.xml",
+        "php_codesniffer-fix": "vendor/bin/phpcbf --standard=build/php_codesniffer.xml",
+        "php-cs-fixer": "vendor/bin/php-cs-fixer fix --config=build/php-cs-fixer.php --diff --using-cache=no --dry-run",
+        "php-cs-fixer-fix": "vendor/bin/php-cs-fixer fix --config=build/php-cs-fixer.php --diff --using-cache=no",
+        "psalm": "vendor/bin/psalm --config=build/psalm.xml --no-cache --long-progress --threads=4",
+        "psalm-set-baseline": "vendor/bin/psalm --config=build/psalm.xml --no-cache --long-progress --set-baseline=psalm_baseline.xml --threads=4",
+        "test": "vendor/bin/paratest --verbose --configuration=tests/phpunit.xml --runner=WrapperRunner",
+        "all-quality-tools": [
+            "@lint",
+            "@phpcs",
+            "@php-cs-fixer",
+            "@psalm",
+            "@test"
+        ]
     }
 }
diff --git a/composer.lock b/composer.lock
deleted file mode 100644
index c4d48f39a..000000000
--- a/composer.lock
+++ /dev/null
@@ -1,1588 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
-        "This file is @generated automatically"
-    ],
-    "hash": "7faf707048f74c867bd2fc2857d35fa0",
-    "packages": [],
-    "packages-dev": [
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f976e5de371104877ebc89bd8fecb0019ed9c119",
-                "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3,<8.0-DEV"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "2.0.*@ALPHA"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Doctrine\\Instantiator\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2014-10-13 12:58:55"
-        },
-        {
-            "name": "michelf/php-markdown",
-            "version": "1.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/michelf/php-markdown.git",
-                "reference": "de9a19c7bf352d41cc99ed86c3c0ef17e87394b6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/michelf/php-markdown/zipball/de9a19c7bf352d41cc99ed86c3c0ef17e87394b6",
-                "reference": "de9a19c7bf352d41cc99ed86c3c0ef17e87394b6",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-lib": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Michelf": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Michel Fortin",
-                    "email": "michel.fortin@michelf.ca",
-                    "homepage": "http://michelf.ca/",
-                    "role": "Developer"
-                },
-                {
-                    "name": "John Gruber",
-                    "homepage": "http://daringfireball.net/"
-                }
-            ],
-            "description": "PHP Markdown",
-            "homepage": "http://michelf.ca/projects/php-markdown/",
-            "keywords": [
-                "markdown"
-            ],
-            "time": "2014-05-05 02:43:50"
-        },
-        {
-            "name": "nikic/php-parser",
-            "version": "v0.9.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "ef70767475434bdb3615b43c327e2cae17ef12eb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ef70767475434bdb3615b43c327e2cae17ef12eb",
-                "reference": "ef70767475434bdb3615b43c327e2cae17ef12eb",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.9-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "PHPParser": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Nikita Popov"
-                }
-            ],
-            "description": "A PHP parser written in PHP",
-            "keywords": [
-                "parser",
-                "php"
-            ],
-            "time": "2014-07-23 18:24:17"
-        },
-        {
-            "name": "phing/phing",
-            "version": "2.9.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phingofficial/phing.git",
-                "reference": "393edeffa8a85d43636ce0c9b4deb1ff9ac60a5c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phingofficial/phing/zipball/393edeffa8a85d43636ce0c9b4deb1ff9ac60a5c",
-                "reference": "393edeffa8a85d43636ce0c9b4deb1ff9ac60a5c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.2.0"
-            },
-            "require-dev": {
-                "ext-pdo_sqlite": "*",
-                "lastcraft/simpletest": "@dev",
-                "pdepend/pdepend": "1.x",
-                "pear-pear.php.net/http_request2": "2.2.x",
-                "pear-pear.php.net/net_growl": "2.7.x",
-                "pear-pear.php.net/pear_packagefilemanager": "1.7.x",
-                "pear-pear.php.net/pear_packagefilemanager2": "1.0.x",
-                "pear-pear.php.net/xml_serializer": "0.20.x",
-                "pear/pear_exception": "@dev",
-                "pear/versioncontrol_git": "@dev",
-                "pear/versioncontrol_svn": "@dev",
-                "phpdocumentor/phpdocumentor": "2.x",
-                "phploc/phploc": "2.x",
-                "phpunit/phpunit": ">=3.7",
-                "sebastian/phpcpd": "2.x",
-                "squizlabs/php_codesniffer": "1.5.x"
-            },
-            "suggest": {
-                "pdepend/pdepend": "PHP version of JDepend",
-                "pear/archive_tar": "Tar file management class",
-                "pear/versioncontrol_git": "A library that provides OO interface to handle Git repository",
-                "pear/versioncontrol_svn": "A simple OO-style interface for Subversion, the free/open-source version control system",
-                "phpdocumentor/phpdocumentor": "Documentation Generator for PHP",
-                "phploc/phploc": "A tool for quickly measuring the size of a PHP project",
-                "phpmd/phpmd": "PHP version of PMD tool",
-                "phpunit/php-code-coverage": "Library that provides collection, processing, and rendering functionality for PHP code coverage information",
-                "phpunit/phpunit": "The PHP Unit Testing Framework",
-                "sebastian/phpcpd": "Copy/Paste Detector (CPD) for PHP code",
-                "tedivm/jshrink": "Javascript Minifier built in PHP"
-            },
-            "bin": [
-                "bin/phing"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.9.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "classes/phing/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                "classes"
-            ],
-            "license": [
-                "LGPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "Phing Community",
-                    "homepage": "http://www.phing.info/trac/wiki/Development/Contributors"
-                },
-                {
-                    "name": "Michiel Rook",
-                    "email": "mrook@php.net"
-                }
-            ],
-            "description": "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant.",
-            "homepage": "http://www.phing.info/",
-            "keywords": [
-                "build",
-                "phing",
-                "task",
-                "tool"
-            ],
-            "time": "2014-12-03 09:18:46"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "2.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
-                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "suggest": {
-                "dflydev/markdown": "~1.0",
-                "erusev/parsedown": "~1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "phpDocumentor": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "mike.vanriel@naenius.com"
-                }
-            ],
-            "time": "2015-02-03 12:10:50"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "v1.3.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "9ca52329bcdd1500de24427542577ebf3fc2f1c9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/9ca52329bcdd1500de24427542577ebf3fc2f1c9",
-                "reference": "9ca52329bcdd1500de24427542577ebf3fc2f1c9",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "~1.0,>=1.0.2",
-                "phpdocumentor/reflection-docblock": "~2.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "http://phpspec.org",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "time": "2014-11-17 16:23:49"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "2.0.15",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "34cc484af1ca149188d0d9e91412191e398e0b67"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/34cc484af1ca149188d0d9e91412191e398e0b67",
-                "reference": "34cc484af1ca149188d0d9e91412191e398e0b67",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "phpunit/php-file-iterator": "~1.3",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-token-stream": "~1.3",
-                "sebastian/environment": "~1.0",
-                "sebastian/version": "~1.0"
-            },
-            "require-dev": {
-                "ext-xdebug": ">=2.1.4",
-                "phpunit/phpunit": "~4"
-            },
-            "suggest": {
-                "ext-dom": "*",
-                "ext-xdebug": ">=2.2.1",
-                "ext-xmlwriter": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "time": "2015-01-24 10:06:35"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "1.3.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
-                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "File/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "time": "2013-10-10 15:34:57"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
-                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "Text/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "time": "2014-01-30 17:20:04"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
-                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "PHP/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "time": "2013-08-02 07:42:54"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "db32c18eba00b121c145575fcbcd4d4d24e6db74"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/db32c18eba00b121c145575fcbcd4d4d24e6db74",
-                "reference": "db32c18eba00b121c145575fcbcd4d4d24e6db74",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "time": "2015-01-17 09:51:32"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "4.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "5b578d3865a9128b9c209b011fda6539ec06e7a5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5b578d3865a9128b9c209b011fda6539ec06e7a5",
-                "reference": "5b578d3865a9128b9c209b011fda6539ec06e7a5",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "php": ">=5.3.3",
-                "phpspec/prophecy": "~1.3.1",
-                "phpunit/php-code-coverage": "~2.0",
-                "phpunit/php-file-iterator": "~1.3.2",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": "~1.0.2",
-                "phpunit/phpunit-mock-objects": "~2.3",
-                "sebastian/comparator": "~1.1",
-                "sebastian/diff": "~1.1",
-                "sebastian/environment": "~1.2",
-                "sebastian/exporter": "~1.2",
-                "sebastian/global-state": "~1.0",
-                "sebastian/version": "~1.0",
-                "symfony/yaml": "~2.0"
-            },
-            "suggest": {
-                "phpunit/php-invoker": "~1.1"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.5.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "time": "2015-02-05 15:51:19"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "2.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "c63d2367247365f688544f0d500af90a11a44c65"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/c63d2367247365f688544f0d500af90a11a44c65",
-                "reference": "c63d2367247365f688544f0d500af90a11a44c65",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "~1.0,>=1.0.1",
-                "php": ">=5.3.3",
-                "phpunit/php-text-template": "~1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.3"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "time": "2014-10-03 05:12:11"
-        },
-        {
-            "name": "pimple/pimple",
-            "version": "v2.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/silexphp/Pimple.git",
-                "reference": "ea22fb2880faf7b7b0e17c9809c6fe25b071fd76"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/ea22fb2880faf7b7b0e17c9809c6fe25b071fd76",
-                "reference": "ea22fb2880faf7b7b0e17c9809c6fe25b071fd76",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Pimple": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Pimple is a simple Dependency Injection Container for PHP 5.3",
-            "homepage": "http://pimple.sensiolabs.org",
-            "keywords": [
-                "container",
-                "dependency injection"
-            ],
-            "time": "2014-07-24 07:10:08"
-        },
-        {
-            "name": "sami/sami",
-            "version": "v2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/FriendsOfPHP/Sami.git",
-                "reference": "fa58b324f41aa2aefe21dac4f22d8c98965fc012"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/Sami/zipball/fa58b324f41aa2aefe21dac4f22d8c98965fc012",
-                "reference": "fa58b324f41aa2aefe21dac4f22d8c98965fc012",
-                "shasum": ""
-            },
-            "require": {
-                "michelf/php-markdown": "~1.3",
-                "nikic/php-parser": "0.9.*",
-                "php": ">=5.3.0",
-                "pimple/pimple": "2.*",
-                "symfony/console": "~2.1",
-                "symfony/filesystem": "~2.1",
-                "symfony/finder": "~2.1",
-                "symfony/process": "~2.1",
-                "symfony/yaml": "~2.1",
-                "twig/twig": "1.*"
-            },
-            "bin": [
-                "sami.php"
-            ],
-            "type": "application",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Sami": "."
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Sami, an API documentation generator",
-            "homepage": "http://sami.sensiolabs.org",
-            "keywords": [
-                "phpdoc"
-            ],
-            "time": "2014-06-25 12:05:18"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "1dd8869519a225f7f2b9eb663e225298fade819e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dd8869519a225f7f2b9eb663e225298fade819e",
-                "reference": "1dd8869519a225f7f2b9eb663e225298fade819e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/diff": "~1.2",
-                "sebastian/exporter": "~1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "time": "2015-01-29 16:28:08"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "5843509fed39dee4b356a306401e9dd1a931fec7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/5843509fed39dee4b356a306401e9dd1a931fec7",
-                "reference": "5843509fed39dee4b356a306401e9dd1a931fec7",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "http://www.github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff"
-            ],
-            "time": "2014-08-15 10:29:00"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e6c71d918088c251b181ba8b3088af4ac336dd7",
-                "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "time": "2014-10-25 08:00:45"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "84839970d05254c73cde183a721c7af13aede943"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/84839970d05254c73cde183a721c7af13aede943",
-                "reference": "84839970d05254c73cde183a721c7af13aede943",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/recursion-context": "~1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "time": "2015-01-27 07:23:06"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
-                "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "time": "2014-10-06 09:23:50"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "3989662bbb30a29d20d9faa04a846af79b276252"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/3989662bbb30a29d20d9faa04a846af79b276252",
-                "reference": "3989662bbb30a29d20d9faa04a846af79b276252",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2015-01-24 09:48:32"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "1.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/a77d9123f8e809db3fbdea15038c27a95da4058b",
-                "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2014-12-15 14:25:24"
-        },
-        {
-            "name": "squizlabs/php_codesniffer",
-            "version": "2.3.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "c1a26c729508f73560c1a4f767f60b8ab6b4a666"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/c1a26c729508f73560c1a4f767f60b8ab6b4a666",
-                "reference": "c1a26c729508f73560c1a4f767f60b8ab6b4a666",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "ext-xmlwriter": "*",
-                "php": ">=5.1.2"
-            },
-            "bin": [
-                "scripts/phpcs",
-                "scripts/phpcbf"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "CodeSniffer.php",
-                    "CodeSniffer/CLI.php",
-                    "CodeSniffer/Exception.php",
-                    "CodeSniffer/File.php",
-                    "CodeSniffer/Fixer.php",
-                    "CodeSniffer/Report.php",
-                    "CodeSniffer/Reporting.php",
-                    "CodeSniffer/Sniff.php",
-                    "CodeSniffer/Tokens.php",
-                    "CodeSniffer/Reports/",
-                    "CodeSniffer/Tokenizers/",
-                    "CodeSniffer/DocGenerators/",
-                    "CodeSniffer/Standards/AbstractPatternSniff.php",
-                    "CodeSniffer/Standards/AbstractScopeSniff.php",
-                    "CodeSniffer/Standards/AbstractVariableSniff.php",
-                    "CodeSniffer/Standards/IncorrectPatternException.php",
-                    "CodeSniffer/Standards/Generic/Sniffs/",
-                    "CodeSniffer/Standards/MySource/Sniffs/",
-                    "CodeSniffer/Standards/PEAR/Sniffs/",
-                    "CodeSniffer/Standards/PSR1/Sniffs/",
-                    "CodeSniffer/Standards/PSR2/Sniffs/",
-                    "CodeSniffer/Standards/Squiz/Sniffs/",
-                    "CodeSniffer/Standards/Zend/Sniffs/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Sherwood",
-                    "role": "lead"
-                }
-            ],
-            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-            "homepage": "http://www.squizlabs.com/php-codesniffer",
-            "keywords": [
-                "phpcs",
-                "standards"
-            ],
-            "time": "2015-06-24 03:16:23"
-        },
-        {
-            "name": "symfony/console",
-            "version": "v2.6.4",
-            "target-dir": "Symfony/Component/Console",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Console.git",
-                "reference": "e44154bfe3e41e8267d7a3794cd9da9a51cfac34"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Console/zipball/e44154bfe3e41e8267d7a3794cd9da9a51cfac34",
-                "reference": "e44154bfe3e41e8267d7a3794cd9da9a51cfac34",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/event-dispatcher": "~2.1",
-                "symfony/process": "~2.1"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/process": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\Console\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Symfony Console Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-01-25 04:39:26"
-        },
-        {
-            "name": "symfony/filesystem",
-            "version": "v2.6.4",
-            "target-dir": "Symfony/Component/Filesystem",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Filesystem.git",
-                "reference": "a1f566d1f92e142fa1593f4555d6d89e3044a9b7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/a1f566d1f92e142fa1593f4555d6d89e3044a9b7",
-                "reference": "a1f566d1f92e142fa1593f4555d6d89e3044a9b7",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\Filesystem\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Symfony Filesystem Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-01-03 21:13:09"
-        },
-        {
-            "name": "symfony/finder",
-            "version": "v2.6.4",
-            "target-dir": "Symfony/Component/Finder",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Finder.git",
-                "reference": "16513333bca64186c01609961a2bb1b95b5e1355"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Finder/zipball/16513333bca64186c01609961a2bb1b95b5e1355",
-                "reference": "16513333bca64186c01609961a2bb1b95b5e1355",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\Finder\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Symfony Finder Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-01-03 08:01:59"
-        },
-        {
-            "name": "symfony/process",
-            "version": "v2.6.4",
-            "target-dir": "Symfony/Component/Process",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Process.git",
-                "reference": "ecfc23e89d9967999fa5f60a1e9af7384396e9ae"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Process/zipball/ecfc23e89d9967999fa5f60a1e9af7384396e9ae",
-                "reference": "ecfc23e89d9967999fa5f60a1e9af7384396e9ae",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\Process\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Symfony Process Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-01-25 04:39:26"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v2.6.4",
-            "target-dir": "Symfony/Component/Yaml",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Yaml.git",
-                "reference": "60ed7751671113cf1ee7d7778e691642c2e9acd8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/60ed7751671113cf1ee7d7778e691642c2e9acd8",
-                "reference": "60ed7751671113cf1ee7d7778e691642c2e9acd8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\Yaml\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-01-25 04:39:26"
-        },
-        {
-            "name": "twig/twig",
-            "version": "v1.18.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "4cf7464348e7f9893a93f7096a90b73722be99cf"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/4cf7464348e7f9893a93f7096a90b73722be99cf",
-                "reference": "4cf7464348e7f9893a93f7096a90b73722be99cf",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.2.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.18-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Twig_": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
-                {
-                    "name": "Armin Ronacher",
-                    "email": "armin.ronacher@active-4.com",
-                    "role": "Project Founder"
-                },
-                {
-                    "name": "Twig Team",
-                    "homepage": "http://twig.sensiolabs.org/contributors",
-                    "role": "Contributors"
-                }
-            ],
-            "description": "Twig, the flexible, fast, and secure template language for PHP",
-            "homepage": "http://twig.sensiolabs.org",
-            "keywords": [
-                "templating"
-            ],
-            "time": "2015-01-25 17:32:08"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "php": ">=5.3.3"
-    },
-    "platform-dev": []
-}
diff --git a/phpseclib/Common/ConstantUtilityTrait.php b/phpseclib/Common/ConstantUtilityTrait.php
new file mode 100644
index 000000000..a349c3316
--- /dev/null
+++ b/phpseclib/Common/ConstantUtilityTrait.php
@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Common;
+
+use phpseclib3\Exception\InvalidArgumentException;
+
+/**
+ * @internal
+ */
+trait ConstantUtilityTrait
+{
+    /** @var string[]|null */
+    private static $valueToConstantNameMap = null;
+
+    /**
+     * @param string|int $value
+     */
+    public static function findConstantNameByValue($value): ?string
+    {
+        if (!self::$valueToConstantNameMap) {
+            $reflectionClass = new \ReflectionClass(static::class);
+            $constantNameToValueMap = $reflectionClass->getConstants();
+            self::$valueToConstantNameMap = array_flip($constantNameToValueMap);
+        }
+        if (isset(self::$valueToConstantNameMap[$value])) {
+            return self::$valueToConstantNameMap[$value];
+        }
+        return null;
+    }
+
+    /**
+     * @param string|int $value
+     */
+    public static function getConstantNameByValue($value): string
+    {
+        $constantName = static::findConstantNameByValue($value);
+        if ($constantName === null) {
+            throw new InvalidArgumentException(sprintf('"%s" does not have constant with value "%s".', static::class, $value));
+        }
+        return $constantName;
+    }
+}
diff --git a/phpseclib/Common/Functions/Strings.php b/phpseclib/Common/Functions/Strings.php
new file mode 100644
index 000000000..07828ae1e
--- /dev/null
+++ b/phpseclib/Common/Functions/Strings.php
@@ -0,0 +1,461 @@
+<?php
+
+/**
+ * Common String Functions
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Common\Functions;
+
+use ParagonIE\ConstantTime\Base64;
+use ParagonIE\ConstantTime\Base64UrlSafe;
+use ParagonIE\ConstantTime\Hex;
+use phpseclib3\Exception\InvalidArgumentException;
+use phpseclib3\Exception\LengthException;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Math\Common\FiniteField;
+
+/**
+ * Common String Functions
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Strings
+{
+    /**
+     * String Shift
+     *
+     * Inspired by array_shift
+     */
+    public static function shift(string &$string, int $index = 1): string
+    {
+        $substr = substr($string, 0, $index);
+        $string = substr($string, $index);
+        return $substr;
+    }
+
+    /**
+     * String Pop
+     *
+     * Inspired by array_pop
+     */
+    public static function pop(string &$string, int $index = 1): string
+    {
+        $substr = substr($string, -$index);
+        $string = substr($string, 0, -$index);
+        return $substr;
+    }
+
+    /**
+     * Parse SSH2-style string
+     *
+     * Returns either an array or a boolean if $data is malformed.
+     *
+     * Valid characters for $format are as follows:
+     *
+     * C = byte
+     * b = boolean (true/false)
+     * N = uint32
+     * Q = uint64
+     * s = string
+     * i = mpint
+     * L = name-list
+     *
+     * uint64 is not supported.
+     */
+    public static function unpackSSH2(string $format, string &$data): array
+    {
+        $format = self::formatPack($format);
+        $result = [];
+        for ($i = 0; $i < strlen($format); $i++) {
+            switch ($format[$i]) {
+                case 'C':
+                case 'b':
+                    if (!strlen($data)) {
+                        throw new LengthException('At least one byte needs to be present for successful C / b decodes');
+                    }
+                    break;
+                case 'N':
+                case 'i':
+                case 's':
+                case 'L':
+                    if (strlen($data) < 4) {
+                        throw new LengthException('At least four byte needs to be present for successful N / i / s / L decodes');
+                    }
+                    break;
+                case 'Q':
+                    if (strlen($data) < 8) {
+                        throw new LengthException('At least eight byte needs to be present for successful N / i / s / L decodes');
+                    }
+                    break;
+
+                default:
+                    throw new InvalidArgumentException('$format contains an invalid character');
+            }
+            switch ($format[$i]) {
+                case 'C':
+                    $result[] = ord(self::shift($data));
+                    continue 2;
+                case 'b':
+                    $result[] = ord(self::shift($data)) != 0;
+                    continue 2;
+                case 'N':
+                    [, $temp] = unpack('N', self::shift($data, 4));
+                    $result[] = $temp;
+                    continue 2;
+                case 'Q':
+                    // pack() added support for Q in PHP 5.6.3 and PHP 5.6 is phpseclib 3's minimum version
+                    // so in theory we could support this BUT, "64-bit format codes are not available for
+                    // 32-bit versions" and phpseclib works on 32-bit installs. on 32-bit installs
+                    // 64-bit floats can be used to get larger numbers then 32-bit signed ints would allow
+                    // for. sure, you're not gonna get the full precision of 64-bit numbers but just because
+                    // you need > 32-bit precision doesn't mean you need the full 64-bit precision
+                    ['upper' => $upper, 'lower' => $lower] = unpack('Nupper/Nlower', self::shift($data, 8));
+                    $temp = $upper ? 4294967296 * $upper : 0;
+                    $temp += $lower < 0 ? ($lower & 0x7FFFFFFFF) + 0x80000000 : $lower;
+                    // $temp = hexdec(bin2hex(self::shift($data, 8)));
+                    $result[] = $temp;
+                    continue 2;
+            }
+            [, $length] = unpack('N', self::shift($data, 4));
+            if (strlen($data) < $length) {
+                throw new LengthException("$length bytes needed; " . strlen($data) . ' bytes available');
+            }
+            $temp = self::shift($data, $length);
+            switch ($format[$i]) {
+                case 'i':
+                    $result[] = new BigInteger($temp, -256);
+                    break;
+                case 's':
+                    $result[] = $temp;
+                    break;
+                case 'L':
+                    $result[] = explode(',', $temp);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Create SSH2-style string
+     *
+     * @param string|int|float|array|bool ...$elements
+     */
+    public static function packSSH2(string $format, ...$elements): string
+    {
+        $format = self::formatPack($format);
+        if (strlen($format) != count($elements)) {
+            throw new InvalidArgumentException('There must be as many arguments as there are characters in the $format string');
+        }
+        $result = '';
+        for ($i = 0; $i < strlen($format); $i++) {
+            $element = $elements[$i];
+            switch ($format[$i]) {
+                case 'C':
+                    if (!is_int($element)) {
+                        throw new InvalidArgumentException('Bytes must be represented as an integer between 0 and 255, inclusive.');
+                    }
+                    $result .= pack('C', $element);
+                    break;
+                case 'b':
+                    if (!is_bool($element)) {
+                        throw new InvalidArgumentException('A boolean parameter was expected.');
+                    }
+                    $result .= $element ? "\1" : "\0";
+                    break;
+                case 'Q':
+                    if (!is_int($element) && !is_float($element)) {
+                        throw new InvalidArgumentException('An integer was expected.');
+                    }
+                    // 4294967296 == 1 << 32
+                    $result .= pack('NN', $element / 4294967296, $element);
+                    break;
+                case 'N':
+                    if (is_float($element)) {
+                        $element = (int) $element;
+                    }
+                    if (!is_int($element)) {
+                        throw new InvalidArgumentException('An integer was expected.');
+                    }
+                    $result .= pack('N', $element);
+                    break;
+                case 's':
+                    if (!self::is_stringable($element)) {
+                        throw new InvalidArgumentException('A string was expected.');
+                    }
+                    $result .= pack('Na*', strlen($element), $element);
+                    break;
+                case 'i':
+                    if (!$element instanceof BigInteger && !$element instanceof FiniteField\Integer) {
+                        throw new InvalidArgumentException('A phpseclib3\Math\BigInteger or phpseclib3\Math\Common\FiniteField\Integer object was expected.');
+                    }
+                    $element = $element->toBytes(true);
+                    $result .= pack('Na*', strlen($element), $element);
+                    break;
+                case 'L':
+                    if (!is_array($element)) {
+                        throw new InvalidArgumentException('An array was expected.');
+                    }
+                    $element = implode(',', $element);
+                    $result .= pack('Na*', strlen($element), $element);
+                    break;
+                default:
+                    throw new InvalidArgumentException('$format contains an invalid character');
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Expand a pack string
+     *
+     * Converts C5 to CCCCC, for example.
+     */
+    private static function formatPack(string $format): string
+    {
+        $parts = preg_split('#(\d+)#', $format, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $format = '';
+        for ($i = 1; $i < count($parts); $i += 2) {
+            $format .= substr($parts[$i - 1], 0, -1) . str_repeat($parts[$i - 1][-1], (int) $parts[$i]);
+        }
+        $format .= $parts[$i - 1];
+
+        return $format;
+    }
+
+    /**
+     * Convert binary data into bits
+     *
+     * bin2hex / hex2bin refer to base-256 encoded data as binary, whilst
+     * decbin / bindec refer to base-2 encoded data as binary. For the purposes
+     * of this function, bin refers to base-256 encoded data whilst bits refers
+     * to base-2 encoded data
+     */
+    public static function bits2bin(string $x): string
+    {
+        /*
+        // the pure-PHP approach is faster than the GMP approach
+        if (function_exists('gmp_export')) {
+             return strlen($x) ? gmp_export(gmp_init($x, 2)) : gmp_init(0);
+        }
+        */
+
+        if (preg_match('#[^01]#', $x)) {
+            throw new RuntimeException('The only valid characters are 0 and 1');
+        }
+
+        if (!defined('PHP_INT_MIN')) {
+            define('PHP_INT_MIN', ~PHP_INT_MAX);
+        }
+
+        $length = strlen($x);
+        if (!$length) {
+            return '';
+        }
+        $block_size = PHP_INT_SIZE << 3;
+        $pad = $block_size - ($length % $block_size);
+        if ($pad != $block_size) {
+            $x = str_repeat('0', $pad) . $x;
+        }
+
+        $parts = str_split($x, $block_size);
+        $str = '';
+        foreach ($parts as $part) {
+            $xor = $part[0] == '1' ? PHP_INT_MIN : 0;
+            $part[0] = '0';
+            $str .= pack(
+                PHP_INT_SIZE == 4 ? 'N' : 'J',
+                $xor ^ eval('return 0b' . $part . ';')
+            );
+        }
+        return ltrim($str, "\0");
+    }
+
+    /**
+     * Convert bits to binary data
+     */
+    public static function bin2bits(string $x, bool $trim = true): string
+    {
+        /*
+        // the pure-PHP approach is slower than the GMP approach BUT
+        // i want to the pure-PHP version to be easily unit tested as well
+        if (function_exists('gmp_import')) {
+            return gmp_strval(gmp_import($x), 2);
+        }
+        */
+
+        $len = strlen($x);
+        $mod = $len % PHP_INT_SIZE;
+        if ($mod) {
+            $x = str_pad($x, $len + PHP_INT_SIZE - $mod, "\0", STR_PAD_LEFT);
+        }
+
+        $bits = '';
+        if (PHP_INT_SIZE == 4) {
+            $digits = unpack('N*', $x);
+            foreach ($digits as $digit) {
+                $bits .= sprintf('%032b', $digit);
+            }
+        } else {
+            $digits = unpack('J*', $x);
+            foreach ($digits as $digit) {
+                $bits .= sprintf('%064b', $digit);
+            }
+        }
+
+        return $trim ? ltrim($bits, '0') : $bits;
+    }
+
+    /**
+     * Switch Endianness Bit Order
+     */
+    public static function switchEndianness(string $x): string
+    {
+        $r = '';
+        for ($i = strlen($x) - 1; $i >= 0; $i--) {
+            $b = ord($x[$i]);
+            if (PHP_INT_SIZE === 8) {
+                // 3 operations
+                // from http://graphics.stanford.edu/~seander/bithacks.html#ReverseByteWith64BitsDiv
+                $r .= chr((($b * 0x0202020202) & 0x010884422010) % 1023);
+            } else {
+                // 7 operations
+                // from http://graphics.stanford.edu/~seander/bithacks.html#ReverseByteWith32Bits
+                $p1 = ($b * 0x0802) & 0x22110;
+                $p2 = ($b * 0x8020) & 0x88440;
+                $r .= chr(
+                    (($p1 | $p2) * 0x10101) >> 16
+                );
+            }
+        }
+        return $r;
+    }
+
+    /**
+     * Increment the current string
+     */
+    public static function increment_str(string &$var): string
+    {
+        if (function_exists('sodium_increment')) {
+            $var = strrev($var);
+            sodium_increment($var);
+            $var = strrev($var);
+            return $var;
+        }
+
+        for ($i = 4; $i <= strlen($var); $i += 4) {
+            $temp = substr($var, -$i, 4);
+            switch ($temp) {
+                case "\xFF\xFF\xFF\xFF":
+                    $var = substr_replace($var, "\x00\x00\x00\x00", -$i, 4);
+                    break;
+                case "\x7F\xFF\xFF\xFF":
+                    $var = substr_replace($var, "\x80\x00\x00\x00", -$i, 4);
+                    return $var;
+                default:
+                    $temp = unpack('Nnum', $temp);
+                    $var = substr_replace($var, pack('N', $temp['num'] + 1), -$i, 4);
+                    return $var;
+            }
+        }
+
+        $remainder = strlen($var) % 4;
+
+        if ($remainder == 0) {
+            return $var;
+        }
+
+        $temp = unpack('Nnum', str_pad(substr($var, 0, $remainder), 4, "\0", STR_PAD_LEFT));
+        $temp = substr(pack('N', $temp['num'] + 1), -$remainder);
+        $var = substr_replace($var, $temp, 0, $remainder);
+
+        return $var;
+    }
+
+    /**
+     * Find whether the type of a variable is string (or could be converted to one)
+     *
+     * @psalm-assert-if-true string|\Stringable $var
+     */
+    public static function is_stringable($var): bool
+    {
+        return is_string($var) || (is_object($var) && method_exists($var, '__toString'));
+    }
+
+    /**
+     * Constant Time Base64-decoding
+     *
+     * ParagoneIE\ConstantTime doesn't use libsodium if it's available so we'll do so
+     * ourselves. see https://github.com/paragonie/constant_time_encoding/issues/39
+     */
+    public static function base64_decode(string $data): string
+    {
+        return function_exists('sodium_base642bin') ?
+            sodium_base642bin($data, SODIUM_BASE64_VARIANT_ORIGINAL_NO_PADDING, '=') :
+            Base64::decode($data);
+    }
+
+    /**
+     * Constant Time Base64-decoding (URL safe)
+     */
+    public static function base64url_decode(string $data): string
+    {
+        // return self::base64_decode(str_replace(['-', '_'], ['+', '/'], $data));
+
+        return function_exists('sodium_base642bin') ?
+            sodium_base642bin($data, SODIUM_BASE64_VARIANT_URLSAFE_NO_PADDING, '=') :
+            Base64UrlSafe::decode($data);
+    }
+
+    /**
+     * Constant Time Base64-encoding
+     */
+    public static function base64_encode(string $data): string
+    {
+        return function_exists('sodium_bin2base64') ?
+            sodium_bin2base64($data, SODIUM_BASE64_VARIANT_ORIGINAL) :
+            Base64::encode($data);
+    }
+
+    /**
+     * Constant Time Base64-encoding (URL safe)
+     */
+    public static function base64url_encode(string $data): string
+    {
+        // return str_replace(['+', '/'], ['-', '_'], self::base64_encode($data));
+
+        return function_exists('sodium_bin2base64') ?
+            sodium_bin2base64($data, SODIUM_BASE64_VARIANT_URLSAFE_NO_PADDING) :
+            Base64UrlSafe::encode($data);
+    }
+
+    /**
+     * Constant Time Hex Decoder
+     */
+    public static function hex2bin(string $data): string
+    {
+        return function_exists('sodium_hex2bin') ?
+            sodium_hex2bin($data) :
+            Hex::decode($data);
+    }
+
+    /**
+     * Constant Time Hex Encoder
+     */
+    public static function bin2hex(string $data): string
+    {
+        return function_exists('sodium_bin2hex') ?
+            sodium_bin2hex($data) :
+            Hex::encode($data);
+    }
+}
diff --git a/phpseclib/Crypt/AES.php b/phpseclib/Crypt/AES.php
index 2bb4d5e8f..0009d2f71 100644
--- a/phpseclib/Crypt/AES.php
+++ b/phpseclib/Crypt/AES.php
@@ -3,7 +3,7 @@
 /**
  * Pure-PHP implementation of AES.
  *
- * Uses mcrypt, if available/possible, and an internal implementation, otherwise.
+ * Uses OpenSSL, if available/possible, and an internal implementation, otherwise
  *
  * PHP version 5
  *
@@ -16,7 +16,7 @@
  * it'll be null-padded to 192-bits and 192 bits will be the key length until {@link self::setKey() setKey()}
  * is called, again, at which point, it'll be recalculated.
  *
- * Since \phpseclib\Crypt\AES extends \phpseclib\Crypt\Rijndael, some functions are available to be called that, in the context of AES, don't
+ * Since \phpseclib3\Crypt\AES extends \phpseclib3\Crypt\Rijndael, some functions are available to be called that, in the context of AES, don't
  * make a whole lot of sense.  {@link self::setBlockLength() setBlockLength()}, for instance.  Calling that function,
  * however possible, won't do anything (AES has a fixed block length whereas Rijndael has a variable one).
  *
@@ -25,7 +25,7 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $aes = new \phpseclib\Crypt\AES();
+ *    $aes = new \phpseclib3\Crypt\AES('ctr');
  *
  *    $aes->setKey('abcdefghijklmnop');
  *
@@ -39,59 +39,56 @@
  * ?>
  * </code>
  *
- * @category  Crypt
- * @package   AES
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2008 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\Crypt;
+declare(strict_types=1);
 
-use phpseclib\Crypt\Rijndael;
+namespace phpseclib3\Crypt;
+
+use phpseclib3\Exception\BadMethodCallException;
+use phpseclib3\Exception\LengthException;
 
 /**
  * Pure-PHP implementation of AES.
  *
- * @package AES
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class AES extends Rijndael
 {
     /**
      * Dummy function
      *
-     * Since \phpseclib\Crypt\AES extends \phpseclib\Crypt\Rijndael, this function is, technically, available, but it doesn't do anything.
+     * Since \phpseclib3\Crypt\AES extends \phpseclib3\Crypt\Rijndael, this function is, technically, available, but it doesn't do anything.
      *
-     * @see \phpseclib\Crypt\Rijndael::setBlockLength()
-     * @access public
-     * @param int $length
+     * @throws BadMethodCallException anytime it's called
+     * @see \phpseclib3\Crypt\Rijndael::setBlockLength()
      */
-    function setBlockLength($length)
+    public function setBlockLength(int $length): void
     {
-        return;
+        throw new BadMethodCallException('The block length cannot be set for AES.');
     }
 
     /**
      * Sets the key length
      *
-     * Valid key lengths are 128, 192, and 256.  If the length is less than 128, it will be rounded up to
-     * 128.  If the length is greater than 128 and invalid, it will be rounded down to the closest valid amount.
+     * Valid key lengths are 128, 192, and 256.  Set the link to bool(false) to disable a fixed key length
      *
-     * @see \phpseclib\Crypt\Rijndael:setKeyLength()
-     * @access public
-     * @param int $length
+     * @throws LengthException if the key length isn't supported
+     * @see \phpseclib3\Crypt\Rijndael:setKeyLength()
      */
-    function setKeyLength($length)
+    public function setKeyLength(int $length): void
     {
         switch ($length) {
-            case 160:
-                $length = 192;
+            case 128:
+            case 192:
+            case 256:
                 break;
-            case 224:
-                $length = 256;
+            default:
+                throw new LengthException('Key of size ' . $length . ' not supported by this algorithm. Only keys of sizes 128, 192 or 256 supported');
         }
         parent::setKeyLength($length);
     }
@@ -101,28 +98,21 @@ function setKeyLength($length)
      *
      * Rijndael supports five different key lengths, AES only supports three.
      *
-     * @see \phpseclib\Crypt\Rijndael:setKey()
+     * @throws LengthException if the key length isn't supported
+     * @see \phpseclib3\Crypt\Rijndael:setKey()
      * @see setKeyLength()
-     * @access public
-     * @param string $key
      */
-    function setKey($key)
+    public function setKey(string $key): void
     {
-        parent::setKey($key);
-
-        if (!$this->explicit_key_length) {
-            $length = strlen($key);
-            switch (true) {
-                case $length <= 16:
-                    $this->key_length = 16;
-                    break;
-                case $length <= 24:
-                    $this->key_length = 24;
-                    break;
-                default:
-                    $this->key_length = 32;
-            }
-            $this->_setEngine();
+        switch (strlen($key)) {
+            case 16:
+            case 24:
+            case 32:
+                break;
+            default:
+                throw new LengthException('Key of size ' . strlen($key) . ' not supported by this algorithm. Only keys of sizes 16, 24 or 32 supported');
         }
+
+        parent::setKey($key);
     }
 }
diff --git a/phpseclib/Crypt/Base.php b/phpseclib/Crypt/Base.php
deleted file mode 100644
index cbc2b0cf9..000000000
--- a/phpseclib/Crypt/Base.php
+++ /dev/null
@@ -1,2550 +0,0 @@
-<?php
-
-/**
- * Base Class for all \phpseclib\Crypt\* cipher classes
- *
- * PHP version 5
- *
- * Internally for phpseclib developers:
- *  If you plan to add a new cipher class, please note following rules:
- *
- *  - The new \phpseclib\Crypt\* cipher class should extend \phpseclib\Crypt\Base
- *
- *  - Following methods are then required to be overridden/overloaded:
- *
- *    - _encryptBlock()
- *
- *    - _decryptBlock()
- *
- *    - _setupKey()
- *
- *  - All other methods are optional to be overridden/overloaded
- *
- *  - Look at the source code of the current ciphers how they extend \phpseclib\Crypt\Base
- *    and take one of them as a start up for the new cipher class.
- *
- *  - Please read all the other comments/notes/hints here also for each class var/method
- *
- * @category  Crypt
- * @package   Base
- * @author    Jim Wigginton <terrafrost@php.net>
- * @author    Hans-Juergen Petrich <petrich@tronic-media.com>
- * @copyright 2007 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Crypt;
-
-use phpseclib\Crypt\Hash;
-
-/**
- * Base Class for all \phpseclib\Crypt\* cipher classes
- *
- * @package Base
- * @author  Jim Wigginton <terrafrost@php.net>
- * @author  Hans-Juergen Petrich <petrich@tronic-media.com>
- */
-abstract class Base
-{
-    /**#@+
-     * @access public
-     * @see \phpseclib\Crypt\Base::encrypt()
-     * @see \phpseclib\Crypt\Base::decrypt()
-     */
-    /**
-     * Encrypt / decrypt using the Counter mode.
-     *
-     * Set to -1 since that's what Crypt/Random.php uses to index the CTR mode.
-     *
-     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
-     */
-    const MODE_CTR = -1;
-    /**
-     * Encrypt / decrypt using the Electronic Code Book mode.
-     *
-     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
-     */
-    const MODE_ECB = 1;
-    /**
-     * Encrypt / decrypt using the Code Book Chaining mode.
-     *
-     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
-     */
-    const MODE_CBC = 2;
-    /**
-     * Encrypt / decrypt using the Cipher Feedback mode.
-     *
-     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher_feedback_.28CFB.29
-     */
-    const MODE_CFB = 3;
-    /**
-     * Encrypt / decrypt using the Output Feedback mode.
-     *
-     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Output_feedback_.28OFB.29
-     */
-    const MODE_OFB = 4;
-    /**
-     * Encrypt / decrypt using streaming mode.
-     */
-    const MODE_STREAM = 5;
-    /**#@-*/
-
-    /**
-     * Whirlpool available flag
-     *
-     * @see \phpseclib\Crypt\Base::_hashInlineCryptFunction()
-     * @var bool
-     * @access private
-     */
-    static $WHIRLPOOL_AVAILABLE;
-
-    /**#@+
-     * @access private
-     * @see \phpseclib\Crypt\Base::__construct()
-     */
-    /**
-     * Base value for the internal implementation $engine switch
-     */
-    const ENGINE_INTERNAL = 1;
-    /**
-     * Base value for the mcrypt implementation $engine switch
-     */
-    const ENGINE_MCRYPT = 2;
-    /**
-     * Base value for the mcrypt implementation $engine switch
-     */
-    const ENGINE_OPENSSL = 3;
-    /**#@-*/
-
-    /**
-     * The Encryption Mode
-     *
-     * @see self::__construct()
-     * @var int
-     * @access private
-     */
-    var $mode;
-
-    /**
-     * The Block Length of the block cipher
-     *
-     * @var int
-     * @access private
-     */
-    var $block_size = 16;
-
-    /**
-     * The Key
-     *
-     * @see self::setKey()
-     * @var string
-     * @access private
-     */
-    var $key = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
-
-    /**
-     * The Initialization Vector
-     *
-     * @see self::setIV()
-     * @var string
-     * @access private
-     */
-    var $iv;
-
-    /**
-     * A "sliding" Initialization Vector
-     *
-     * @see self::enableContinuousBuffer()
-     * @see self::_clearBuffers()
-     * @var string
-     * @access private
-     */
-    var $encryptIV;
-
-    /**
-     * A "sliding" Initialization Vector
-     *
-     * @see self::enableContinuousBuffer()
-     * @see self::_clearBuffers()
-     * @var string
-     * @access private
-     */
-    var $decryptIV;
-
-    /**
-     * Continuous Buffer status
-     *
-     * @see self::enableContinuousBuffer()
-     * @var bool
-     * @access private
-     */
-    var $continuousBuffer = false;
-
-    /**
-     * Encryption buffer for CTR, OFB and CFB modes
-     *
-     * @see self::encrypt()
-     * @see self::_clearBuffers()
-     * @var array
-     * @access private
-     */
-    var $enbuffer;
-
-    /**
-     * Decryption buffer for CTR, OFB and CFB modes
-     *
-     * @see self::decrypt()
-     * @see self::_clearBuffers()
-     * @var array
-     * @access private
-     */
-    var $debuffer;
-
-    /**
-     * mcrypt resource for encryption
-     *
-     * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
-     * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
-     *
-     * @see self::encrypt()
-     * @var resource
-     * @access private
-     */
-    var $enmcrypt;
-
-    /**
-     * mcrypt resource for decryption
-     *
-     * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
-     * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
-     *
-     * @see self::decrypt()
-     * @var resource
-     * @access private
-     */
-    var $demcrypt;
-
-    /**
-     * Does the enmcrypt resource need to be (re)initialized?
-     *
-     * @see \phpseclib\Crypt\Twofish::setKey()
-     * @see \phpseclib\Crypt\Twofish::setIV()
-     * @var bool
-     * @access private
-     */
-    var $enchanged = true;
-
-    /**
-     * Does the demcrypt resource need to be (re)initialized?
-     *
-     * @see \phpseclib\Crypt\Twofish::setKey()
-     * @see \phpseclib\Crypt\Twofish::setIV()
-     * @var bool
-     * @access private
-     */
-    var $dechanged = true;
-
-    /**
-     * mcrypt resource for CFB mode
-     *
-     * mcrypt's CFB mode, in (and only in) buffered context,
-     * is broken, so phpseclib implements the CFB mode by it self,
-     * even when the mcrypt php extension is available.
-     *
-     * In order to do the CFB-mode work (fast) phpseclib
-     * use a separate ECB-mode mcrypt resource.
-     *
-     * @link http://phpseclib.sourceforge.net/cfb-demo.phps
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @see self::_setupMcrypt()
-     * @var resource
-     * @access private
-     */
-    var $ecb;
-
-    /**
-     * Optimizing value while CFB-encrypting
-     *
-     * Only relevant if $continuousBuffer enabled
-     * and $engine == self::ENGINE_MCRYPT
-     *
-     * It's faster to re-init $enmcrypt if
-     * $buffer bytes > $cfb_init_len than
-     * using the $ecb resource furthermore.
-     *
-     * This value depends of the chosen cipher
-     * and the time it would be needed for it's
-     * initialization [by mcrypt_generic_init()]
-     * which, typically, depends on the complexity
-     * on its internaly Key-expanding algorithm.
-     *
-     * @see self::encrypt()
-     * @var int
-     * @access private
-     */
-    var $cfb_init_len = 600;
-
-    /**
-     * Does internal cipher state need to be (re)initialized?
-     *
-     * @see self::setKey()
-     * @see self::setIV()
-     * @see self::disableContinuousBuffer()
-     * @var bool
-     * @access private
-     */
-    var $changed = true;
-
-    /**
-     * Padding status
-     *
-     * @see self::enablePadding()
-     * @var bool
-     * @access private
-     */
-    var $padding = true;
-
-    /**
-     * Is the mode one that is paddable?
-     *
-     * @see self::__construct()
-     * @var bool
-     * @access private
-     */
-    var $paddable = false;
-
-    /**
-     * Holds which crypt engine internaly should be use,
-     * which will be determined automatically on __construct()
-     *
-     * Currently available $engines are:
-     * - self::ENGINE_OPENSSL  (very fast, php-extension: openssl, extension_loaded('openssl') required)
-     * - self::ENGINE_MCRYPT   (fast, php-extension: mcrypt, extension_loaded('mcrypt') required)
-     * - self::ENGINE_INTERNAL (slower, pure php-engine, no php-extension required)
-     *
-     * @see self::_setEngine()
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @var int
-     * @access private
-     */
-    var $engine;
-
-    /**
-     * Holds the preferred crypt engine
-     *
-     * @see self::_setEngine()
-     * @see self::setPreferredEngine()
-     * @var int
-     * @access private
-     */
-    var $preferredEngine;
-
-    /**
-     * The mcrypt specific name of the cipher
-     *
-     * Only used if $engine == self::ENGINE_MCRYPT
-     *
-     * @link http://www.php.net/mcrypt_module_open
-     * @link http://www.php.net/mcrypt_list_algorithms
-     * @see self::_setupMcrypt()
-     * @var string
-     * @access private
-     */
-    var $cipher_name_mcrypt;
-
-    /**
-     * The openssl specific name of the cipher
-     *
-     * Only used if $engine == self::ENGINE_OPENSSL
-     *
-     * @link http://www.php.net/openssl-get-cipher-methods
-     * @var string
-     * @access private
-     */
-    var $cipher_name_openssl;
-
-    /**
-     * The openssl specific name of the cipher in ECB mode
-     *
-     * If OpenSSL does not support the mode we're trying to use (CTR)
-     * it can still be emulated with ECB mode.
-     *
-     * @link http://www.php.net/openssl-get-cipher-methods
-     * @var string
-     * @access private
-     */
-    var $cipher_name_openssl_ecb;
-
-    /**
-     * The default salt used by setPassword()
-     *
-     * @see self::setPassword()
-     * @var string
-     * @access private
-     */
-    var $password_default_salt = 'phpseclib/salt';
-
-    /**
-     * The name of the performance-optimized callback function
-     *
-     * Used by encrypt() / decrypt()
-     * only if $engine == self::ENGINE_INTERNAL
-     *
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @see self::_setupInlineCrypt()
-     * @see self::$use_inline_crypt
-     * @var Callback
-     * @access private
-     */
-    var $inline_crypt;
-
-    /**
-     * Holds whether performance-optimized $inline_crypt() can/should be used.
-     *
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @see self::inline_crypt
-     * @var mixed
-     * @access private
-     */
-    var $use_inline_crypt;
-
-    /**
-     * If OpenSSL can be used in ECB but not in CTR we can emulate CTR
-     *
-     * @see self::_openssl_ctr_process()
-     * @var bool
-     * @access private
-     */
-    var $openssl_emulate_ctr = false;
-
-    /**
-     * Determines what options are passed to openssl_encrypt/decrypt
-     *
-     * @see self::isValidEngine()
-     * @var mixed
-     * @access private
-     */
-    var $openssl_options;
-
-    /**
-     * Has the key length explicitly been set or should it be derived from the key, itself?
-     *
-     * @see self::setKeyLength()
-     * @var bool
-     * @access private
-     */
-    var $explicit_key_length = false;
-
-    /**
-     * Don't truncate / null pad key
-     *
-     * @see self::_clearBuffers()
-     * @var bool
-     * @access private
-     */
-    var $skip_key_adjustment = false;
-
-    /**
-     * Default Constructor.
-     *
-     * Determines whether or not the mcrypt extension should be used.
-     *
-     * $mode could be:
-     *
-     * - self::MODE_ECB
-     *
-     * - self::MODE_CBC
-     *
-     * - self::MODE_CTR
-     *
-     * - self::MODE_CFB
-     *
-     * - self::MODE_OFB
-     *
-     * If not explicitly set, self::MODE_CBC will be used.
-     *
-     * @param int $mode
-     * @access public
-     */
-    function __construct($mode = self::MODE_CBC)
-    {
-        // $mode dependent settings
-        switch ($mode) {
-            case self::MODE_ECB:
-                $this->paddable = true;
-                $this->mode = self::MODE_ECB;
-                break;
-            case self::MODE_CTR:
-            case self::MODE_CFB:
-            case self::MODE_OFB:
-            case self::MODE_STREAM:
-                $this->mode = $mode;
-                break;
-            case self::MODE_CBC:
-            default:
-                $this->paddable = true;
-                $this->mode = self::MODE_CBC;
-        }
-
-        $this->_setEngine();
-
-        // Determining whether inline crypting can be used by the cipher
-        if ($this->use_inline_crypt !== false && function_exists('create_function')) {
-            $this->use_inline_crypt = true;
-        }
-    }
-
-    /**
-     * Sets the initialization vector. (optional)
-     *
-     * SetIV is not required when self::MODE_ECB (or ie for AES: \phpseclib\Crypt\AES::MODE_ECB) is being used.  If not explicitly set, it'll be assumed
-     * to be all zero's.
-     *
-     * @access public
-     * @param string $iv
-     * @internal Can be overwritten by a sub class, but does not have to be
-     */
-    function setIV($iv)
-    {
-        if ($this->mode == self::MODE_ECB) {
-            return;
-        }
-
-        $this->iv = $iv;
-        $this->changed = true;
-    }
-
-    /**
-     * Sets the key length.
-     *
-     * Keys with explicitly set lengths need to be treated accordingly
-     *
-     * @access public
-     * @param int $length
-     */
-    function setKeyLength($length)
-    {
-        $this->explicit_key_length = true;
-        $this->changed = true;
-        $this->_setEngine();
-    }
-
-    /**
-     * Returns the current key length in bits
-     *
-     * @access public
-     * @return int
-     */
-    function getKeyLength()
-    {
-        return $this->key_length << 3;
-    }
-
-    /**
-     * Returns the current block length in bits
-     *
-     * @access public
-     * @return int
-     */
-    function getBlockLength()
-    {
-        return $this->block_size << 3;
-    }
-
-    /**
-     * Sets the key.
-     *
-     * The min/max length(s) of the key depends on the cipher which is used.
-     * If the key not fits the length(s) of the cipher it will paded with null bytes
-     * up to the closest valid key length.  If the key is more than max length,
-     * we trim the excess bits.
-     *
-     * If the key is not explicitly set, it'll be assumed to be all null bytes.
-     *
-     * @access public
-     * @param string $key
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function setKey($key)
-    {
-        if (!$this->explicit_key_length) {
-            $this->setKeyLength(strlen($key) << 3);
-            $this->explicit_key_length = false;
-        }
-
-        $this->key = $key;
-        $this->changed = true;
-        $this->_setEngine();
-    }
-
-    /**
-     * Sets the password.
-     *
-     * Depending on what $method is set to, setPassword()'s (optional) parameters are as follows:
-     *     {@link http://en.wikipedia.org/wiki/PBKDF2 pbkdf2} or pbkdf1:
-     *         $hash, $salt, $count, $dkLen
-     *
-     *         Where $hash (default = sha1) currently supports the following hashes: see: Crypt/Hash.php
-     *
-     * @see Crypt/Hash.php
-     * @param string $password
-     * @param string $method
-     * @throws \LengthException if pbkdf1 is being used and the derived key length exceeds the hash length
-     * @return bool
-     * @access public
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function setPassword($password, $method = 'pbkdf2')
-    {
-        $key = '';
-
-        switch ($method) {
-            default: // 'pbkdf2' or 'pbkdf1'
-                $func_args = func_get_args();
-
-                // Hash function
-                $hash = isset($func_args[2]) ? $func_args[2] : 'sha1';
-
-                // WPA and WPA2 use the SSID as the salt
-                $salt = isset($func_args[3]) ? $func_args[3] : $this->password_default_salt;
-
-                // RFC2898#section-4.2 uses 1,000 iterations by default
-                // WPA and WPA2 use 4,096.
-                $count = isset($func_args[4]) ? $func_args[4] : 1000;
-
-                // Keylength
-                if (isset($func_args[5])) {
-                    $dkLen = $func_args[5];
-                } else {
-                    $dkLen = $method == 'pbkdf1' ? 2 * $this->key_length : $this->key_length;
-                }
-
-                switch (true) {
-                    case $method == 'pbkdf1':
-                        $hashObj = new Hash();
-                        $hashObj->setHash($hash);
-                        if ($dkLen > $hashObj->getLength()) {
-                            throw new \LengthException('Derived key length cannot be longer than the hash length');
-                        }
-                        $t = $password . $salt;
-                        for ($i = 0; $i < $count; ++$i) {
-                            $t = $hashObj->hash($t);
-                        }
-                        $key = substr($t, 0, $dkLen);
-
-                        $this->setKey(substr($key, 0, $dkLen >> 1));
-                        $this->setIV(substr($key, $dkLen >> 1));
-
-                        return true;
-                    // Determining if php[>=5.5.0]'s hash_pbkdf2() function avail- and useable
-                    case !function_exists('hash_pbkdf2'):
-                    case !function_exists('hash_algos'):
-                    case !in_array($hash, hash_algos()):
-                        $i = 1;
-                        while (strlen($key) < $dkLen) {
-                            $hmac = new Hash();
-                            $hmac->setHash($hash);
-                            $hmac->setKey($password);
-                            $f = $u = $hmac->hash($salt . pack('N', $i++));
-                            for ($j = 2; $j <= $count; ++$j) {
-                                $u = $hmac->hash($u);
-                                $f^= $u;
-                            }
-                            $key.= $f;
-                        }
-                        $key = substr($key, 0, $dkLen);
-                        break;
-                    default:
-                        $key = hash_pbkdf2($hash, $password, $salt, $count, $dkLen, true);
-                }
-        }
-
-        $this->setKey($key);
-
-        return true;
-    }
-
-    /**
-     * Encrypts a message.
-     *
-     * $plaintext will be padded with additional bytes such that it's length is a multiple of the block size. Other cipher
-     * implementations may or may not pad in the same manner.  Other common approaches to padding and the reasons why it's
-     * necessary are discussed in the following
-     * URL:
-     *
-     * {@link http://www.di-mgt.com.au/cryptopad.html http://www.di-mgt.com.au/cryptopad.html}
-     *
-     * An alternative to padding is to, separately, send the length of the file.  This is what SSH, in fact, does.
-     * strlen($plaintext) will still need to be a multiple of the block size, however, arbitrary values can be added to make it that
-     * length.
-     *
-     * @see self::decrypt()
-     * @access public
-     * @param string $plaintext
-     * @return string $ciphertext
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function encrypt($plaintext)
-    {
-        if ($this->paddable) {
-            $plaintext = $this->_pad($plaintext);
-        }
-
-        if ($this->engine === self::ENGINE_OPENSSL) {
-            if ($this->changed) {
-                $this->_clearBuffers();
-                $this->changed = false;
-            }
-            switch ($this->mode) {
-                case self::MODE_STREAM:
-                    return openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, $this->openssl_options);
-                case self::MODE_ECB:
-                    $result = openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, $this->openssl_options);
-                    return !defined('OPENSSL_RAW_DATA') ? substr($result, 0, -$this->block_size) : $result;
-                case self::MODE_CBC:
-                    $result = openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $this->encryptIV);
-                    if ($this->continuousBuffer) {
-                        $this->encryptIV = substr($result, -$this->block_size);
-                    }
-                    return !defined('OPENSSL_RAW_DATA') ? substr($result, 0, -$this->block_size) : $result;
-                case self::MODE_CTR:
-                    return $this->_openssl_ctr_process($plaintext, $this->encryptIV, $this->enbuffer);
-                case self::MODE_CFB:
-                    // cfb loosely routines inspired by openssl's:
-                    // {@link http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1}
-                    $ciphertext = '';
-                    if ($this->continuousBuffer) {
-                        $iv = &$this->encryptIV;
-                        $pos = &$this->enbuffer['pos'];
-                    } else {
-                        $iv = $this->encryptIV;
-                        $pos = 0;
-                    }
-                    $len = strlen($plaintext);
-                    $i = 0;
-                    if ($pos) {
-                        $orig_pos = $pos;
-                        $max = $this->block_size - $pos;
-                        if ($len >= $max) {
-                            $i = $max;
-                            $len-= $max;
-                            $pos = 0;
-                        } else {
-                            $i = $len;
-                            $pos+= $len;
-                            $len = 0;
-                        }
-                        // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
-                        $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
-                        $iv = substr_replace($iv, $ciphertext, $orig_pos, $i);
-                        $plaintext = substr($plaintext, $i);
-                    }
-
-                    $overflow = $len % $this->block_size;
-
-                    if ($overflow) {
-                        $ciphertext.= openssl_encrypt(substr($plaintext, 0, -$overflow) . str_repeat("\0", $this->block_size), $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
-                        $iv = $this->_string_pop($ciphertext, $this->block_size);
-
-                        $size = $len - $overflow;
-                        $block = $iv ^ substr($plaintext, -$overflow);
-                        $iv = substr_replace($iv, $block, 0, $overflow);
-                        $ciphertext.= $block;
-                        $pos = $overflow;
-                    } elseif ($len) {
-                        $ciphertext = openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
-                        $iv = substr($ciphertext, -$this->block_size);
-                    }
-
-                    return $ciphertext;
-                case self::MODE_OFB:
-                    return $this->_openssl_ofb_process($plaintext, $this->encryptIV, $this->enbuffer);
-            }
-        }
-
-        if ($this->engine === self::ENGINE_MCRYPT) {
-            if ($this->changed) {
-                $this->_setupMcrypt();
-                $this->changed = false;
-            }
-            if ($this->enchanged) {
-                mcrypt_generic_init($this->enmcrypt, $this->key, $this->encryptIV);
-                $this->enchanged = false;
-            }
-
-            // re: {@link http://phpseclib.sourceforge.net/cfb-demo.phps}
-            // using mcrypt's default handing of CFB the above would output two different things.  using phpseclib's
-            // rewritten CFB implementation the above outputs the same thing twice.
-            if ($this->mode == self::MODE_CFB && $this->continuousBuffer) {
-                $block_size = $this->block_size;
-                $iv = &$this->encryptIV;
-                $pos = &$this->enbuffer['pos'];
-                $len = strlen($plaintext);
-                $ciphertext = '';
-                $i = 0;
-                if ($pos) {
-                    $orig_pos = $pos;
-                    $max = $block_size - $pos;
-                    if ($len >= $max) {
-                        $i = $max;
-                        $len-= $max;
-                        $pos = 0;
-                    } else {
-                        $i = $len;
-                        $pos+= $len;
-                        $len = 0;
-                    }
-                    $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
-                    $iv = substr_replace($iv, $ciphertext, $orig_pos, $i);
-                    $this->enbuffer['enmcrypt_init'] = true;
-                }
-                if ($len >= $block_size) {
-                    if ($this->enbuffer['enmcrypt_init'] === false || $len > $this->cfb_init_len) {
-                        if ($this->enbuffer['enmcrypt_init'] === true) {
-                            mcrypt_generic_init($this->enmcrypt, $this->key, $iv);
-                            $this->enbuffer['enmcrypt_init'] = false;
-                        }
-                        $ciphertext.= mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % $block_size));
-                        $iv = substr($ciphertext, -$block_size);
-                        $len%= $block_size;
-                    } else {
-                        while ($len >= $block_size) {
-                            $iv = mcrypt_generic($this->ecb, $iv) ^ substr($plaintext, $i, $block_size);
-                            $ciphertext.= $iv;
-                            $len-= $block_size;
-                            $i+= $block_size;
-                        }
-                    }
-                }
-
-                if ($len) {
-                    $iv = mcrypt_generic($this->ecb, $iv);
-                    $block = $iv ^ substr($plaintext, -$len);
-                    $iv = substr_replace($iv, $block, 0, $len);
-                    $ciphertext.= $block;
-                    $pos = $len;
-                }
-
-                return $ciphertext;
-            }
-
-            $ciphertext = mcrypt_generic($this->enmcrypt, $plaintext);
-
-            if (!$this->continuousBuffer) {
-                mcrypt_generic_init($this->enmcrypt, $this->key, $this->encryptIV);
-            }
-
-            return $ciphertext;
-        }
-
-        if ($this->changed) {
-            $this->_setup();
-            $this->changed = false;
-        }
-        if ($this->use_inline_crypt) {
-            $inline = $this->inline_crypt;
-            return $inline('encrypt', $this, $plaintext);
-        }
-
-        $buffer = &$this->enbuffer;
-        $block_size = $this->block_size;
-        $ciphertext = '';
-        switch ($this->mode) {
-            case self::MODE_ECB:
-                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                    $ciphertext.= $this->_encryptBlock(substr($plaintext, $i, $block_size));
-                }
-                break;
-            case self::MODE_CBC:
-                $xor = $this->encryptIV;
-                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                    $block = substr($plaintext, $i, $block_size);
-                    $block = $this->_encryptBlock($block ^ $xor);
-                    $xor = $block;
-                    $ciphertext.= $block;
-                }
-                if ($this->continuousBuffer) {
-                    $this->encryptIV = $xor;
-                }
-                break;
-            case self::MODE_CTR:
-                $xor = $this->encryptIV;
-                if (strlen($buffer['ciphertext'])) {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                        $block = substr($plaintext, $i, $block_size);
-                        if (strlen($block) > strlen($buffer['ciphertext'])) {
-                            $buffer['ciphertext'].= $this->_encryptBlock($xor);
-                        }
-                        $this->_increment_str($xor);
-                        $key = $this->_string_shift($buffer['ciphertext'], $block_size);
-                        $ciphertext.= $block ^ $key;
-                    }
-                } else {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                        $block = substr($plaintext, $i, $block_size);
-                        $key = $this->_encryptBlock($xor);
-                        $this->_increment_str($xor);
-                        $ciphertext.= $block ^ $key;
-                    }
-                }
-                if ($this->continuousBuffer) {
-                    $this->encryptIV = $xor;
-                    if ($start = strlen($plaintext) % $block_size) {
-                        $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
-                    }
-                }
-                break;
-            case self::MODE_CFB:
-                // cfb loosely routines inspired by openssl's:
-                // {@link http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1}
-                if ($this->continuousBuffer) {
-                    $iv = &$this->encryptIV;
-                    $pos = &$buffer['pos'];
-                } else {
-                    $iv = $this->encryptIV;
-                    $pos = 0;
-                }
-                $len = strlen($plaintext);
-                $i = 0;
-                if ($pos) {
-                    $orig_pos = $pos;
-                    $max = $block_size - $pos;
-                    if ($len >= $max) {
-                        $i = $max;
-                        $len-= $max;
-                        $pos = 0;
-                    } else {
-                        $i = $len;
-                        $pos+= $len;
-                        $len = 0;
-                    }
-                    // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
-                    $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
-                    $iv = substr_replace($iv, $ciphertext, $orig_pos, $i);
-                }
-                while ($len >= $block_size) {
-                    $iv = $this->_encryptBlock($iv) ^ substr($plaintext, $i, $block_size);
-                    $ciphertext.= $iv;
-                    $len-= $block_size;
-                    $i+= $block_size;
-                }
-                if ($len) {
-                    $iv = $this->_encryptBlock($iv);
-                    $block = $iv ^ substr($plaintext, $i);
-                    $iv = substr_replace($iv, $block, 0, $len);
-                    $ciphertext.= $block;
-                    $pos = $len;
-                }
-                break;
-            case self::MODE_OFB:
-                $xor = $this->encryptIV;
-                if (strlen($buffer['xor'])) {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                        $block = substr($plaintext, $i, $block_size);
-                        if (strlen($block) > strlen($buffer['xor'])) {
-                            $xor = $this->_encryptBlock($xor);
-                            $buffer['xor'].= $xor;
-                        }
-                        $key = $this->_string_shift($buffer['xor'], $block_size);
-                        $ciphertext.= $block ^ $key;
-                    }
-                } else {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                        $xor = $this->_encryptBlock($xor);
-                        $ciphertext.= substr($plaintext, $i, $block_size) ^ $xor;
-                    }
-                    $key = $xor;
-                }
-                if ($this->continuousBuffer) {
-                    $this->encryptIV = $xor;
-                    if ($start = strlen($plaintext) % $block_size) {
-                        $buffer['xor'] = substr($key, $start) . $buffer['xor'];
-                    }
-                }
-                break;
-            case self::MODE_STREAM:
-                $ciphertext = $this->_encryptBlock($plaintext);
-                break;
-        }
-
-        return $ciphertext;
-    }
-
-    /**
-     * Decrypts a message.
-     *
-     * If strlen($ciphertext) is not a multiple of the block size, null bytes will be added to the end of the string until
-     * it is.
-     *
-     * @see self::encrypt()
-     * @access public
-     * @param string $ciphertext
-     * @return string $plaintext
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function decrypt($ciphertext)
-    {
-        if ($this->paddable) {
-            // we pad with chr(0) since that's what mcrypt_generic does.  to quote from {@link http://www.php.net/function.mcrypt-generic}:
-            // "The data is padded with "\0" to make sure the length of the data is n * blocksize."
-            $ciphertext = str_pad($ciphertext, strlen($ciphertext) + ($this->block_size - strlen($ciphertext) % $this->block_size) % $this->block_size, chr(0));
-        }
-
-        if ($this->engine === self::ENGINE_OPENSSL) {
-            if ($this->changed) {
-                $this->_clearBuffers();
-                $this->changed = false;
-            }
-            switch ($this->mode) {
-                case self::MODE_STREAM:
-                    $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options);
-                    break;
-                case self::MODE_ECB:
-                    if (!defined('OPENSSL_RAW_DATA')) {
-                        $ciphertext.= openssl_encrypt('', $this->cipher_name_openssl_ecb, $this->key, true);
-                    }
-                    $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options);
-                    break;
-                case self::MODE_CBC:
-                    if (!defined('OPENSSL_RAW_DATA')) {
-                        $padding = str_repeat(chr($this->block_size), $this->block_size) ^ substr($ciphertext, -$this->block_size);
-                        $ciphertext.= substr(openssl_encrypt($padding, $this->cipher_name_openssl_ecb, $this->key, true), 0, $this->block_size);
-                    }
-                    $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $this->decryptIV);
-                    if ($this->continuousBuffer) {
-                        $this->decryptIV = substr($ciphertext, -$this->block_size);
-                    }
-                    break;
-                case self::MODE_CTR:
-                    $plaintext = $this->_openssl_ctr_process($ciphertext, $this->decryptIV, $this->debuffer);
-                    break;
-                case self::MODE_CFB:
-                    // cfb loosely routines inspired by openssl's:
-                    // {@link http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1}
-                    $plaintext = '';
-                    if ($this->continuousBuffer) {
-                        $iv = &$this->decryptIV;
-                        $pos = &$this->buffer['pos'];
-                    } else {
-                        $iv = $this->decryptIV;
-                        $pos = 0;
-                    }
-                    $len = strlen($ciphertext);
-                    $i = 0;
-                    if ($pos) {
-                        $orig_pos = $pos;
-                        $max = $this->block_size - $pos;
-                        if ($len >= $max) {
-                            $i = $max;
-                            $len-= $max;
-                            $pos = 0;
-                        } else {
-                            $i = $len;
-                            $pos+= $len;
-                            $len = 0;
-                        }
-                        // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $this->blocksize
-                        $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
-                        $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
-                        $ciphertext = substr($ciphertext, $i);
-                    }
-                    $overflow = $len % $this->block_size;
-                    if ($overflow) {
-                        $plaintext.= openssl_decrypt(substr($ciphertext, 0, -$overflow), $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
-                        if ($len - $overflow) {
-                            $iv = substr($ciphertext, -$overflow - $this->block_size, -$overflow);
-                        }
-                        $iv = openssl_encrypt(str_repeat("\0", $this->block_size), $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
-                        $plaintext.= $iv ^ substr($ciphertext, -$overflow);
-                        $iv = substr_replace($iv, substr($ciphertext, -$overflow), 0, $overflow);
-                        $pos = $overflow;
-                    } elseif ($len) {
-                        $plaintext.= openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
-                        $iv = substr($ciphertext, -$this->block_size);
-                    }
-                    break;
-                case self::MODE_OFB:
-                    $plaintext = $this->_openssl_ofb_process($ciphertext, $this->decryptIV, $this->debuffer);
-            }
-
-            return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
-        }
-
-        if ($this->engine === self::ENGINE_MCRYPT) {
-            $block_size = $this->block_size;
-            if ($this->changed) {
-                $this->_setupMcrypt();
-                $this->changed = false;
-            }
-            if ($this->dechanged) {
-                mcrypt_generic_init($this->demcrypt, $this->key, $this->decryptIV);
-                $this->dechanged = false;
-            }
-
-            if ($this->mode == self::MODE_CFB && $this->continuousBuffer) {
-                $iv = &$this->decryptIV;
-                $pos = &$this->debuffer['pos'];
-                $len = strlen($ciphertext);
-                $plaintext = '';
-                $i = 0;
-                if ($pos) {
-                    $orig_pos = $pos;
-                    $max = $block_size - $pos;
-                    if ($len >= $max) {
-                        $i = $max;
-                        $len-= $max;
-                        $pos = 0;
-                    } else {
-                        $i = $len;
-                        $pos+= $len;
-                        $len = 0;
-                    }
-                    // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
-                    $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
-                    $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
-                }
-                if ($len >= $block_size) {
-                    $cb = substr($ciphertext, $i, $len - $len % $block_size);
-                    $plaintext.= mcrypt_generic($this->ecb, $iv . $cb) ^ $cb;
-                    $iv = substr($cb, -$block_size);
-                    $len%= $block_size;
-                }
-                if ($len) {
-                    $iv = mcrypt_generic($this->ecb, $iv);
-                    $plaintext.= $iv ^ substr($ciphertext, -$len);
-                    $iv = substr_replace($iv, substr($ciphertext, -$len), 0, $len);
-                    $pos = $len;
-                }
-
-                return $plaintext;
-            }
-
-            $plaintext = mdecrypt_generic($this->demcrypt, $ciphertext);
-
-            if (!$this->continuousBuffer) {
-                mcrypt_generic_init($this->demcrypt, $this->key, $this->decryptIV);
-            }
-
-            return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
-        }
-
-        if ($this->changed) {
-            $this->_setup();
-            $this->changed = false;
-        }
-        if ($this->use_inline_crypt) {
-            $inline = $this->inline_crypt;
-            return $inline('decrypt', $this, $ciphertext);
-        }
-
-        $block_size = $this->block_size;
-
-        $buffer = &$this->debuffer;
-        $plaintext = '';
-        switch ($this->mode) {
-            case self::MODE_ECB:
-                for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                    $plaintext.= $this->_decryptBlock(substr($ciphertext, $i, $block_size));
-                }
-                break;
-            case self::MODE_CBC:
-                $xor = $this->decryptIV;
-                for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                    $block = substr($ciphertext, $i, $block_size);
-                    $plaintext.= $this->_decryptBlock($block) ^ $xor;
-                    $xor = $block;
-                }
-                if ($this->continuousBuffer) {
-                    $this->decryptIV = $xor;
-                }
-                break;
-            case self::MODE_CTR:
-                $xor = $this->decryptIV;
-                if (strlen($buffer['ciphertext'])) {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                        $block = substr($ciphertext, $i, $block_size);
-                        if (strlen($block) > strlen($buffer['ciphertext'])) {
-                            $buffer['ciphertext'].= $this->_encryptBlock($xor);
-                            $this->_increment_str($xor);
-                        }
-                        $key = $this->_string_shift($buffer['ciphertext'], $block_size);
-                        $plaintext.= $block ^ $key;
-                    }
-                } else {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                        $block = substr($ciphertext, $i, $block_size);
-                        $key = $this->_encryptBlock($xor);
-                        $this->_increment_str($xor);
-                        $plaintext.= $block ^ $key;
-                    }
-                }
-                if ($this->continuousBuffer) {
-                    $this->decryptIV = $xor;
-                    if ($start = strlen($ciphertext) % $block_size) {
-                        $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
-                    }
-                }
-                break;
-            case self::MODE_CFB:
-                if ($this->continuousBuffer) {
-                    $iv = &$this->decryptIV;
-                    $pos = &$buffer['pos'];
-                } else {
-                    $iv = $this->decryptIV;
-                    $pos = 0;
-                }
-                $len = strlen($ciphertext);
-                $i = 0;
-                if ($pos) {
-                    $orig_pos = $pos;
-                    $max = $block_size - $pos;
-                    if ($len >= $max) {
-                        $i = $max;
-                        $len-= $max;
-                        $pos = 0;
-                    } else {
-                        $i = $len;
-                        $pos+= $len;
-                        $len = 0;
-                    }
-                    // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
-                    $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
-                    $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
-                }
-                while ($len >= $block_size) {
-                    $iv = $this->_encryptBlock($iv);
-                    $cb = substr($ciphertext, $i, $block_size);
-                    $plaintext.= $iv ^ $cb;
-                    $iv = $cb;
-                    $len-= $block_size;
-                    $i+= $block_size;
-                }
-                if ($len) {
-                    $iv = $this->_encryptBlock($iv);
-                    $plaintext.= $iv ^ substr($ciphertext, $i);
-                    $iv = substr_replace($iv, substr($ciphertext, $i), 0, $len);
-                    $pos = $len;
-                }
-                break;
-            case self::MODE_OFB:
-                $xor = $this->decryptIV;
-                if (strlen($buffer['xor'])) {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                        $block = substr($ciphertext, $i, $block_size);
-                        if (strlen($block) > strlen($buffer['xor'])) {
-                            $xor = $this->_encryptBlock($xor);
-                            $buffer['xor'].= $xor;
-                        }
-                        $key = $this->_string_shift($buffer['xor'], $block_size);
-                        $plaintext.= $block ^ $key;
-                    }
-                } else {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                        $xor = $this->_encryptBlock($xor);
-                        $plaintext.= substr($ciphertext, $i, $block_size) ^ $xor;
-                    }
-                    $key = $xor;
-                }
-                if ($this->continuousBuffer) {
-                    $this->decryptIV = $xor;
-                    if ($start = strlen($ciphertext) % $block_size) {
-                        $buffer['xor'] = substr($key, $start) . $buffer['xor'];
-                    }
-                }
-                break;
-            case self::MODE_STREAM:
-                $plaintext = $this->_decryptBlock($ciphertext);
-                break;
-        }
-        return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
-    }
-
-    /**
-     * OpenSSL CTR Processor
-     *
-     * PHP's OpenSSL bindings do not operate in continuous mode so we'll wrap around it. Since the keystream
-     * for CTR is the same for both encrypting and decrypting this function is re-used by both Base::encrypt()
-     * and Base::decrypt(). Also, OpenSSL doesn't implement CTR for all of it's symmetric ciphers so this
-     * function will emulate CTR with ECB when necesary.
-     *
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @param string $plaintext
-     * @param string $encryptIV
-     * @param array $buffer
-     * @return string
-     * @access private
-     */
-    function _openssl_ctr_process($plaintext, &$encryptIV, &$buffer)
-    {
-        $ciphertext = '';
-
-        $block_size = $this->block_size;
-        $key = $this->key;
-
-        if ($this->openssl_emulate_ctr) {
-            $xor = $encryptIV;
-            if (strlen($buffer['ciphertext'])) {
-                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                    $block = substr($plaintext, $i, $block_size);
-                    if (strlen($block) > strlen($buffer['ciphertext'])) {
-                        $result = openssl_encrypt($xor, $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
-                        $result = !defined('OPENSSL_RAW_DATA') ? substr($result, 0, -$this->block_size) : $result;
-                        $buffer['ciphertext'].= $result;
-                    }
-                    $this->_increment_str($xor);
-                    $otp = $this->_string_shift($buffer['ciphertext'], $block_size);
-                    $ciphertext.= $block ^ $otp;
-                }
-            } else {
-                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                    $block = substr($plaintext, $i, $block_size);
-                    $otp = openssl_encrypt($xor, $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
-                    $otp = !defined('OPENSSL_RAW_DATA') ? substr($otp, 0, -$this->block_size) : $otp;
-                    $this->_increment_str($xor);
-                    $ciphertext.= $block ^ $otp;
-                }
-            }
-            if ($this->continuousBuffer) {
-                $encryptIV = $xor;
-                if ($start = strlen($plaintext) % $block_size) {
-                    $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
-                }
-            }
-
-            return $ciphertext;
-        }
-
-        if (strlen($buffer['ciphertext'])) {
-            $ciphertext = $plaintext ^ $this->_string_shift($buffer['ciphertext'], strlen($plaintext));
-            $plaintext = substr($plaintext, strlen($ciphertext));
-
-            if (!strlen($plaintext)) {
-                return $ciphertext;
-            }
-        }
-
-        $overflow = strlen($plaintext) % $block_size;
-        if ($overflow) {
-            $plaintext2 = $this->_string_pop($plaintext, $overflow); // ie. trim $plaintext to a multiple of $block_size and put rest of $plaintext in $plaintext2
-            $encrypted = openssl_encrypt($plaintext . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
-            $temp = $this->_string_pop($encrypted, $block_size);
-            $ciphertext.= $encrypted . ($plaintext2 ^ $temp);
-            if ($this->continuousBuffer) {
-                $buffer['ciphertext'] = substr($temp, $overflow);
-                $encryptIV = $temp;
-            }
-        } elseif (!strlen($buffer['ciphertext'])) {
-            $ciphertext.= openssl_encrypt($plaintext . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
-            $temp = $this->_string_pop($ciphertext, $block_size);
-            if ($this->continuousBuffer) {
-                $encryptIV = $temp;
-            }
-        }
-        if ($this->continuousBuffer) {
-            if (!defined('OPENSSL_RAW_DATA')) {
-                $encryptIV.= openssl_encrypt('', $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
-            }
-            $encryptIV = openssl_decrypt($encryptIV, $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
-            if ($overflow) {
-                $this->_increment_str($encryptIV);
-            }
-        }
-
-        return $ciphertext;
-    }
-
-    /**
-     * OpenSSL OFB Processor
-     *
-     * PHP's OpenSSL bindings do not operate in continuous mode so we'll wrap around it. Since the keystream
-     * for OFB is the same for both encrypting and decrypting this function is re-used by both Base::encrypt()
-     * and Base::decrypt().
-     *
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @param string $plaintext
-     * @param string $encryptIV
-     * @param array $buffer
-     * @return string
-     * @access private
-     */
-    function _openssl_ofb_process($plaintext, &$encryptIV, &$buffer)
-    {
-        if (strlen($buffer['xor'])) {
-            $ciphertext = $plaintext ^ $buffer['xor'];
-            $buffer['xor'] = substr($buffer['xor'], strlen($ciphertext));
-            $plaintext = substr($plaintext, strlen($ciphertext));
-        } else {
-            $ciphertext = '';
-        }
-
-        $block_size = $this->block_size;
-
-        $len = strlen($plaintext);
-        $key = $this->key;
-        $overflow = $len % $block_size;
-
-        if (strlen($plaintext)) {
-            if ($overflow) {
-                $ciphertext.= openssl_encrypt(substr($plaintext, 0, -$overflow) . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
-                $xor = $this->_string_pop($ciphertext, $block_size);
-                if ($this->continuousBuffer) {
-                    $encryptIV = $xor;
-                }
-                $ciphertext.= $this->_string_shift($xor, $overflow) ^ substr($plaintext, -$overflow);
-                if ($this->continuousBuffer) {
-                    $buffer['xor'] = $xor;
-                }
-            } else {
-                $ciphertext = openssl_encrypt($plaintext, $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
-                if ($this->continuousBuffer) {
-                    $encryptIV = substr($ciphertext, -$block_size) ^ substr($plaintext, -$block_size);
-                }
-            }
-        }
-
-        return $ciphertext;
-    }
-
-    /**
-     * phpseclib <-> OpenSSL Mode Mapper
-     *
-     * May need to be overwritten by classes extending this one in some cases
-     *
-     * @return int
-     * @access private
-     */
-    function _openssl_translate_mode()
-    {
-        switch ($this->mode) {
-            case self::MODE_ECB:
-                return 'ecb';
-            case self::MODE_CBC:
-                return 'cbc';
-            case self::MODE_CTR:
-                return 'ctr';
-            case self::MODE_CFB:
-                return 'cfb';
-            case self::MODE_OFB:
-                return 'ofb';
-        }
-    }
-
-    /**
-     * Pad "packets".
-     *
-     * Block ciphers working by encrypting between their specified [$this->]block_size at a time
-     * If you ever need to encrypt or decrypt something that isn't of the proper length, it becomes necessary to
-     * pad the input so that it is of the proper length.
-     *
-     * Padding is enabled by default.  Sometimes, however, it is undesirable to pad strings.  Such is the case in SSH,
-     * where "packets" are padded with random bytes before being encrypted.  Unpad these packets and you risk stripping
-     * away characters that shouldn't be stripped away. (SSH knows how many bytes are added because the length is
-     * transmitted separately)
-     *
-     * @see self::disablePadding()
-     * @access public
-     */
-    function enablePadding()
-    {
-        $this->padding = true;
-    }
-
-    /**
-     * Do not pad packets.
-     *
-     * @see self::enablePadding()
-     * @access public
-     */
-    function disablePadding()
-    {
-        $this->padding = false;
-    }
-
-    /**
-     * Treat consecutive "packets" as if they are a continuous buffer.
-     *
-     * Say you have a 32-byte plaintext $plaintext.  Using the default behavior, the two following code snippets
-     * will yield different outputs:
-     *
-     * <code>
-     *    echo $rijndael->encrypt(substr($plaintext,  0, 16));
-     *    echo $rijndael->encrypt(substr($plaintext, 16, 16));
-     * </code>
-     * <code>
-     *    echo $rijndael->encrypt($plaintext);
-     * </code>
-     *
-     * The solution is to enable the continuous buffer.  Although this will resolve the above discrepancy, it creates
-     * another, as demonstrated with the following:
-     *
-     * <code>
-     *    $rijndael->encrypt(substr($plaintext, 0, 16));
-     *    echo $rijndael->decrypt($rijndael->encrypt(substr($plaintext, 16, 16)));
-     * </code>
-     * <code>
-     *    echo $rijndael->decrypt($rijndael->encrypt(substr($plaintext, 16, 16)));
-     * </code>
-     *
-     * With the continuous buffer disabled, these would yield the same output.  With it enabled, they yield different
-     * outputs.  The reason is due to the fact that the initialization vector's change after every encryption /
-     * decryption round when the continuous buffer is enabled.  When it's disabled, they remain constant.
-     *
-     * Put another way, when the continuous buffer is enabled, the state of the \phpseclib\Crypt\*() object changes after each
-     * encryption / decryption round, whereas otherwise, it'd remain constant.  For this reason, it's recommended that
-     * continuous buffers not be used.  They do offer better security and are, in fact, sometimes required (SSH uses them),
-     * however, they are also less intuitive and more likely to cause you problems.
-     *
-     * @see self::disableContinuousBuffer()
-     * @access public
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function enableContinuousBuffer()
-    {
-        if ($this->mode == self::MODE_ECB) {
-            return;
-        }
-
-        $this->continuousBuffer = true;
-
-        $this->_setEngine();
-    }
-
-    /**
-     * Treat consecutive packets as if they are a discontinuous buffer.
-     *
-     * The default behavior.
-     *
-     * @see self::enableContinuousBuffer()
-     * @access public
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function disableContinuousBuffer()
-    {
-        if ($this->mode == self::MODE_ECB) {
-            return;
-        }
-        if (!$this->continuousBuffer) {
-            return;
-        }
-
-        $this->continuousBuffer = false;
-        $this->changed = true;
-
-        $this->_setEngine();
-    }
-
-    /**
-     * Test for engine validity
-     *
-     * @see self::__construct()
-     * @param int $engine
-     * @access public
-     * @return bool
-     */
-    function isValidEngine($engine)
-    {
-        switch ($engine) {
-            case self::ENGINE_OPENSSL:
-                if ($this->mode == self::MODE_STREAM && $this->continuousBuffer) {
-                    return false;
-                }
-                $this->openssl_emulate_ctr = false;
-                $result = $this->cipher_name_openssl &&
-                          extension_loaded('openssl') &&
-                          // PHP 5.3.0 - 5.3.2 did not let you set IV's
-                          version_compare(PHP_VERSION, '5.3.3', '>=');
-                if (!$result) {
-                    return false;
-                }
-
-                // prior to PHP 5.4.0 OPENSSL_RAW_DATA and OPENSSL_ZERO_PADDING were not defined. instead of expecting an integer
-                // $options openssl_encrypt expected a boolean $raw_data.
-                if (!defined('OPENSSL_RAW_DATA')) {
-                    $this->openssl_options = true;
-                } else {
-                    $this->openssl_options = OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING;
-                }
-
-                $methods = openssl_get_cipher_methods();
-                if (in_array($this->cipher_name_openssl, $methods)) {
-                    return true;
-                }
-                // not all of openssl's symmetric cipher's support ctr. for those
-                // that don't we'll emulate it
-                switch ($this->mode) {
-                    case self::MODE_CTR:
-                        if (in_array($this->cipher_name_openssl_ecb, $methods)) {
-                            $this->openssl_emulate_ctr = true;
-                            return true;
-                        }
-                }
-                return false;
-            case self::ENGINE_MCRYPT:
-                return $this->cipher_name_mcrypt &&
-                       extension_loaded('mcrypt') &&
-                       in_array($this->cipher_name_mcrypt, mcrypt_list_algorithms());
-            case self::ENGINE_INTERNAL:
-                return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Sets the preferred crypt engine
-     *
-     * Currently, $engine could be:
-     *
-     * - \phpseclib\Crypt\Base::ENGINE_OPENSSL  [very fast]
-     *
-     * - \phpseclib\Crypt\Base::ENGINE_MCRYPT   [fast]
-     *
-     * - \phpseclib\Crypt\Base::ENGINE_INTERNAL [slow]
-     *
-     * If the preferred crypt engine is not available the fastest available one will be used
-     *
-     * @see self::__construct()
-     * @param int $engine
-     * @access public
-     */
-    function setPreferredEngine($engine)
-    {
-        switch ($engine) {
-            //case self::ENGINE_OPENSSL;
-            case self::ENGINE_MCRYPT:
-            case self::ENGINE_INTERNAL:
-                $this->preferredEngine = $engine;
-                break;
-            default:
-                $this->preferredEngine = self::ENGINE_OPENSSL;
-        }
-
-        $this->_setEngine();
-    }
-
-    /**
-     * Returns the engine currently being utilized
-     *
-     * @see self::_setEngine()
-     * @access public
-     */
-    function getEngine()
-    {
-        return $this->engine;
-    }
-
-    /**
-     * Sets the engine as appropriate
-     *
-     * @see self::__construct()
-     * @access private
-     */
-    function _setEngine()
-    {
-        $this->engine = null;
-
-        $candidateEngines = array(
-            $this->preferredEngine,
-            self::ENGINE_OPENSSL,
-            self::ENGINE_MCRYPT
-        );
-        foreach ($candidateEngines as $engine) {
-            if ($this->isValidEngine($engine)) {
-                $this->engine = $engine;
-                break;
-            }
-        }
-        if (!$this->engine) {
-            $this->engine = self::ENGINE_INTERNAL;
-        }
-
-        if ($this->engine != self::ENGINE_MCRYPT && $this->enmcrypt) {
-            // Closing the current mcrypt resource(s). _mcryptSetup() will, if needed,
-            // (re)open them with the module named in $this->cipher_name_mcrypt
-            mcrypt_module_close($this->enmcrypt);
-            mcrypt_module_close($this->demcrypt);
-            $this->enmcrypt = null;
-            $this->demcrypt = null;
-
-            if ($this->ecb) {
-                mcrypt_module_close($this->ecb);
-                $this->ecb = null;
-            }
-        }
-
-        $this->changed = true;
-    }
-
-    /**
-     * Encrypts a block
-     *
-     * Note: Must be extended by the child \phpseclib\Crypt\* class
-     *
-     * @access private
-     * @param string $in
-     * @return string
-     */
-    abstract function _encryptBlock($in);
-
-    /**
-     * Decrypts a block
-     *
-     * Note: Must be extended by the child \phpseclib\Crypt\* class
-     *
-     * @access private
-     * @param string $in
-     * @return string
-     */
-    abstract function _decryptBlock($in);
-
-    /**
-     * Setup the key (expansion)
-     *
-     * Only used if $engine == self::ENGINE_INTERNAL
-     *
-     * Note: Must extend by the child \phpseclib\Crypt\* class
-     *
-     * @see self::_setup()
-     * @access private
-     */
-    abstract function _setupKey();
-
-    /**
-     * Setup the self::ENGINE_INTERNAL $engine
-     *
-     * (re)init, if necessary, the internal cipher $engine and flush all $buffers
-     * Used (only) if $engine == self::ENGINE_INTERNAL
-     *
-     * _setup() will be called each time if $changed === true
-     * typically this happens when using one or more of following public methods:
-     *
-     * - setKey()
-     *
-     * - setIV()
-     *
-     * - disableContinuousBuffer()
-     *
-     * - First run of encrypt() / decrypt() with no init-settings
-     *
-     * @see self::setKey()
-     * @see self::setIV()
-     * @see self::disableContinuousBuffer()
-     * @access private
-     * @internal _setup() is always called before en/decryption.
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function _setup()
-    {
-        $this->_clearBuffers();
-        $this->_setupKey();
-
-        if ($this->use_inline_crypt) {
-            $this->_setupInlineCrypt();
-        }
-    }
-
-    /**
-     * Setup the self::ENGINE_MCRYPT $engine
-     *
-     * (re)init, if necessary, the (ext)mcrypt resources and flush all $buffers
-     * Used (only) if $engine = self::ENGINE_MCRYPT
-     *
-     * _setupMcrypt() will be called each time if $changed === true
-     * typically this happens when using one or more of following public methods:
-     *
-     * - setKey()
-     *
-     * - setIV()
-     *
-     * - disableContinuousBuffer()
-     *
-     * - First run of encrypt() / decrypt()
-     *
-     * @see self::setKey()
-     * @see self::setIV()
-     * @see self::disableContinuousBuffer()
-     * @access private
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function _setupMcrypt()
-    {
-        $this->_clearBuffers();
-        $this->enchanged = $this->dechanged = true;
-
-        if (!isset($this->enmcrypt)) {
-            static $mcrypt_modes = array(
-                self::MODE_CTR    => 'ctr',
-                self::MODE_ECB    => MCRYPT_MODE_ECB,
-                self::MODE_CBC    => MCRYPT_MODE_CBC,
-                self::MODE_CFB    => 'ncfb',
-                self::MODE_OFB    => MCRYPT_MODE_NOFB,
-                self::MODE_STREAM => MCRYPT_MODE_STREAM,
-            );
-
-            $this->demcrypt = mcrypt_module_open($this->cipher_name_mcrypt, '', $mcrypt_modes[$this->mode], '');
-            $this->enmcrypt = mcrypt_module_open($this->cipher_name_mcrypt, '', $mcrypt_modes[$this->mode], '');
-
-            // we need the $ecb mcrypt resource (only) in MODE_CFB with enableContinuousBuffer()
-            // to workaround mcrypt's broken ncfb implementation in buffered mode
-            // see: {@link http://phpseclib.sourceforge.net/cfb-demo.phps}
-            if ($this->mode == self::MODE_CFB) {
-                $this->ecb = mcrypt_module_open($this->cipher_name_mcrypt, '', MCRYPT_MODE_ECB, '');
-            }
-        } // else should mcrypt_generic_deinit be called?
-
-        if ($this->mode == self::MODE_CFB) {
-            mcrypt_generic_init($this->ecb, $this->key, str_repeat("\0", $this->block_size));
-        }
-    }
-
-    /**
-     * Pads a string
-     *
-     * Pads a string using the RSA PKCS padding standards so that its length is a multiple of the blocksize.
-     * $this->block_size - (strlen($text) % $this->block_size) bytes are added, each of which is equal to
-     * chr($this->block_size - (strlen($text) % $this->block_size)
-     *
-     * If padding is disabled and $text is not a multiple of the blocksize, the string will be padded regardless
-     * and padding will, hence forth, be enabled.
-     *
-     * @see self::_unpad()
-     * @param string $text
-     * @throws \LengthException if padding is disabled and the plaintext's length is not a multiple of the block size
-     * @access private
-     * @return string
-     */
-    function _pad($text)
-    {
-        $length = strlen($text);
-
-        if (!$this->padding) {
-            if ($length % $this->block_size == 0) {
-                return $text;
-            } else {
-                throw new \LengthException("The plaintext's length ($length) is not a multiple of the block size ({$this->block_size}). Try enabling padding.");
-            }
-        }
-
-        $pad = $this->block_size - ($length % $this->block_size);
-
-        return str_pad($text, $length + $pad, chr($pad));
-    }
-
-    /**
-     * Unpads a string.
-     *
-     * If padding is enabled and the reported padding length is invalid the encryption key will be assumed to be wrong
-     * and false will be returned.
-     *
-     * @see self::_pad()
-     * @param string $text
-     * @throws \LengthException if the ciphertext's length is not a multiple of the block size
-     * @access private
-     * @return string
-     */
-    function _unpad($text)
-    {
-        if (!$this->padding) {
-            return $text;
-        }
-
-        $length = ord($text[strlen($text) - 1]);
-
-        if (!$length || $length > $this->block_size) {
-            throw new \LengthException("The ciphertext has an invalid padding length ($length) compared to the block size ({$this->block_size})");
-        }
-
-        return substr($text, 0, -$length);
-    }
-
-    /**
-     * Clears internal buffers
-     *
-     * Clearing/resetting the internal buffers is done everytime
-     * after disableContinuousBuffer() or on cipher $engine (re)init
-     * ie after setKey() or setIV()
-     *
-     * @access public
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function _clearBuffers()
-    {
-        $this->enbuffer = $this->debuffer = array('ciphertext' => '', 'xor' => '', 'pos' => 0, 'enmcrypt_init' => true);
-
-        // mcrypt's handling of invalid's $iv:
-        // $this->encryptIV = $this->decryptIV = strlen($this->iv) == $this->block_size ? $this->iv : str_repeat("\0", $this->block_size);
-        $this->encryptIV = $this->decryptIV = str_pad(substr($this->iv, 0, $this->block_size), $this->block_size, "\0");
-
-        if (!$this->skip_key_adjustment) {
-            $this->key = str_pad(substr($this->key, 0, $this->key_length), $this->key_length, "\0");
-        }
-    }
-
-    /**
-     * String Shift
-     *
-     * Inspired by array_shift
-     *
-     * @param string $string
-     * @param int $index
-     * @access private
-     * @return string
-     */
-    function _string_shift(&$string, $index = 1)
-    {
-        $substr = substr($string, 0, $index);
-        $string = substr($string, $index);
-        return $substr;
-    }
-
-    /**
-     * String Pop
-     *
-     * Inspired by array_pop
-     *
-     * @param string $string
-     * @param int $index
-     * @access private
-     * @return string
-     */
-    function _string_pop(&$string, $index = 1)
-    {
-        $substr = substr($string, -$index);
-        $string = substr($string, 0, -$index);
-        return $substr;
-    }
-
-    /**
-     * Increment the current string
-     *
-     * @see self::decrypt()
-     * @see self::encrypt()
-     * @param string $var
-     * @access private
-     */
-    function _increment_str(&$var)
-    {
-        for ($i = 4; $i <= strlen($var); $i+= 4) {
-            $temp = substr($var, -$i, 4);
-            switch ($temp) {
-                case "\xFF\xFF\xFF\xFF":
-                    $var = substr_replace($var, "\x00\x00\x00\x00", -$i, 4);
-                    break;
-                case "\x7F\xFF\xFF\xFF":
-                    $var = substr_replace($var, "\x80\x00\x00\x00", -$i, 4);
-                    return;
-                default:
-                    $temp = unpack('Nnum', $temp);
-                    $var = substr_replace($var, pack('N', $temp['num'] + 1), -$i, 4);
-                    return;
-            }
-        }
-
-        $remainder = strlen($var) % 4;
-
-        if ($remainder == 0) {
-            return;
-        }
-
-        $temp = unpack('Nnum', str_pad(substr($var, 0, $remainder), 4, "\0", STR_PAD_LEFT));
-        $temp = substr(pack('N', $temp['num'] + 1), -$remainder);
-        $var = substr_replace($var, $temp, 0, $remainder);
-    }
-
-    /**
-     * Setup the performance-optimized function for de/encrypt()
-     *
-     * Stores the created (or existing) callback function-name
-     * in $this->inline_crypt
-     *
-     * Internally for phpseclib developers:
-     *
-     *     _setupInlineCrypt() would be called only if:
-     *
-     *     - $engine == self::ENGINE_INTERNAL and
-     *
-     *     - $use_inline_crypt === true
-     *
-     *     - each time on _setup(), after(!) _setupKey()
-     *
-     *
-     *     This ensures that _setupInlineCrypt() has always a
-     *     full ready2go initializated internal cipher $engine state
-     *     where, for example, the keys allready expanded,
-     *     keys/block_size calculated and such.
-     *
-     *     It is, each time if called, the responsibility of _setupInlineCrypt():
-     *
-     *     - to set $this->inline_crypt to a valid and fully working callback function
-     *       as a (faster) replacement for encrypt() / decrypt()
-     *
-     *     - NOT to create unlimited callback functions (for memory reasons!)
-     *       no matter how often _setupInlineCrypt() would be called. At some
-     *       point of amount they must be generic re-useable.
-     *
-     *     - the code of _setupInlineCrypt() it self,
-     *       and the generated callback code,
-     *       must be, in following order:
-     *       - 100% safe
-     *       - 100% compatible to encrypt()/decrypt()
-     *       - using only php5+ features/lang-constructs/php-extensions if
-     *         compatibility (down to php4) or fallback is provided
-     *       - readable/maintainable/understandable/commented and... not-cryptic-styled-code :-)
-     *       - >= 10% faster than encrypt()/decrypt() [which is, by the way,
-     *         the reason for the existence of _setupInlineCrypt() :-)]
-     *       - memory-nice
-     *       - short (as good as possible)
-     *
-     * Note: - _setupInlineCrypt() is using _createInlineCryptFunction() to create the full callback function code.
-     *       - In case of using inline crypting, _setupInlineCrypt() must extend by the child \phpseclib\Crypt\* class.
-     *       - The following variable names are reserved:
-     *         - $_*  (all variable names prefixed with an underscore)
-     *         - $self (object reference to it self. Do not use $this, but $self instead)
-     *         - $in (the content of $in has to en/decrypt by the generated code)
-     *       - The callback function should not use the 'return' statement, but en/decrypt'ing the content of $in only
-     *
-     *
-     * @see self::_setup()
-     * @see self::_createInlineCryptFunction()
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @access private
-     * @internal If a Crypt_* class providing inline crypting it must extend _setupInlineCrypt()
-     */
-    function _setupInlineCrypt()
-    {
-        // If, for any reason, an extending \phpseclib\Crypt\Base() \phpseclib\Crypt\* class
-        // not using inline crypting then it must be ensured that: $this->use_inline_crypt = false
-        // ie in the class var declaration of $use_inline_crypt in general for the \phpseclib\Crypt\* class,
-        // in the constructor at object instance-time
-        // or, if it's runtime-specific, at runtime
-
-        $this->use_inline_crypt = false;
-    }
-
-    /**
-     * Creates the performance-optimized function for en/decrypt()
-     *
-     * Internally for phpseclib developers:
-     *
-     *    _createInlineCryptFunction():
-     *
-     *    - merge the $cipher_code [setup'ed by _setupInlineCrypt()]
-     *      with the current [$this->]mode of operation code
-     *
-     *    - create the $inline function, which called by encrypt() / decrypt()
-     *      as its replacement to speed up the en/decryption operations.
-     *
-     *    - return the name of the created $inline callback function
-     *
-     *    - used to speed up en/decryption
-     *
-     *
-     *
-     *    The main reason why can speed up things [up to 50%] this way are:
-     *
-     *    - using variables more effective then regular.
-     *      (ie no use of expensive arrays but integers $k_0, $k_1 ...
-     *      or even, for example, the pure $key[] values hardcoded)
-     *
-     *    - avoiding 1000's of function calls of ie _encryptBlock()
-     *      but inlining the crypt operations.
-     *      in the mode of operation for() loop.
-     *
-     *    - full loop unroll the (sometimes key-dependent) rounds
-     *      avoiding this way ++$i counters and runtime-if's etc...
-     *
-     *    The basic code architectur of the generated $inline en/decrypt()
-     *    lambda function, in pseudo php, is:
-     *
-     *    <code>
-     *    +----------------------------------------------------------------------------------------------+
-     *    | callback $inline = create_function:                                                          |
-     *    | lambda_function_0001_crypt_ECB($action, $text)                                               |
-     *    | {                                                                                            |
-     *    |     INSERT PHP CODE OF:                                                                      |
-     *    |     $cipher_code['init_crypt'];                  // general init code.                       |
-     *    |                                                  // ie: $sbox'es declarations used for       |
-     *    |                                                  //     encrypt and decrypt'ing.             |
-     *    |                                                                                              |
-     *    |     switch ($action) {                                                                       |
-     *    |         case 'encrypt':                                                                      |
-     *    |             INSERT PHP CODE OF:                                                              |
-     *    |             $cipher_code['init_encrypt'];       // encrypt sepcific init code.               |
-     *    |                                                    ie: specified $key or $box                |
-     *    |                                                        declarations for encrypt'ing.         |
-     *    |                                                                                              |
-     *    |             foreach ($ciphertext) {                                                          |
-     *    |                 $in = $block_size of $ciphertext;                                            |
-     *    |                                                                                              |
-     *    |                 INSERT PHP CODE OF:                                                          |
-     *    |                 $cipher_code['encrypt_block'];  // encrypt's (string) $in, which is always:  |
-     *    |                                                 // strlen($in) == $this->block_size          |
-     *    |                                                 // here comes the cipher algorithm in action |
-     *    |                                                 // for encryption.                           |
-     *    |                                                 // $cipher_code['encrypt_block'] has to      |
-     *    |                                                 // encrypt the content of the $in variable   |
-     *    |                                                                                              |
-     *    |                 $plaintext .= $in;                                                           |
-     *    |             }                                                                                |
-     *    |             return $plaintext;                                                               |
-     *    |                                                                                              |
-     *    |         case 'decrypt':                                                                      |
-     *    |             INSERT PHP CODE OF:                                                              |
-     *    |             $cipher_code['init_decrypt'];       // decrypt sepcific init code                |
-     *    |                                                    ie: specified $key or $box                |
-     *    |                                                        declarations for decrypt'ing.         |
-     *    |             foreach ($plaintext) {                                                           |
-     *    |                 $in = $block_size of $plaintext;                                             |
-     *    |                                                                                              |
-     *    |                 INSERT PHP CODE OF:                                                          |
-     *    |                 $cipher_code['decrypt_block'];  // decrypt's (string) $in, which is always   |
-     *    |                                                 // strlen($in) == $this->block_size          |
-     *    |                                                 // here comes the cipher algorithm in action |
-     *    |                                                 // for decryption.                           |
-     *    |                                                 // $cipher_code['decrypt_block'] has to      |
-     *    |                                                 // decrypt the content of the $in variable   |
-     *    |                 $ciphertext .= $in;                                                          |
-     *    |             }                                                                                |
-     *    |             return $ciphertext;                                                              |
-     *    |     }                                                                                        |
-     *    | }                                                                                            |
-     *    +----------------------------------------------------------------------------------------------+
-     *    </code>
-     *
-     *    See also the \phpseclib\Crypt\*::_setupInlineCrypt()'s for
-     *    productive inline $cipher_code's how they works.
-     *
-     *    Structure of:
-     *    <code>
-     *    $cipher_code = array(
-     *        'init_crypt'    => (string) '', // optional
-     *        'init_encrypt'  => (string) '', // optional
-     *        'init_decrypt'  => (string) '', // optional
-     *        'encrypt_block' => (string) '', // required
-     *        'decrypt_block' => (string) ''  // required
-     *    );
-     *    </code>
-     *
-     * @see self::_setupInlineCrypt()
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @param array $cipher_code
-     * @access private
-     * @return string (the name of the created callback function)
-     */
-    function _createInlineCryptFunction($cipher_code)
-    {
-        $block_size = $this->block_size;
-
-        // optional
-        $init_crypt    = isset($cipher_code['init_crypt'])    ? $cipher_code['init_crypt']    : '';
-        $init_encrypt  = isset($cipher_code['init_encrypt'])  ? $cipher_code['init_encrypt']  : '';
-        $init_decrypt  = isset($cipher_code['init_decrypt'])  ? $cipher_code['init_decrypt']  : '';
-        // required
-        $encrypt_block = $cipher_code['encrypt_block'];
-        $decrypt_block = $cipher_code['decrypt_block'];
-
-        // Generating mode of operation inline code,
-        // merged with the $cipher_code algorithm
-        // for encrypt- and decryption.
-        switch ($this->mode) {
-            case self::MODE_ECB:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    $_plaintext_len = strlen($_text);
-
-                    for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
-                        $in = substr($_text, $_i, '.$block_size.');
-                        '.$encrypt_block.'
-                        $_ciphertext.= $in;
-                    }
-
-                    return $_ciphertext;
-                    ';
-
-                $decrypt = $init_decrypt . '
-                    $_plaintext = "";
-                    $_text = str_pad($_text, strlen($_text) + ('.$block_size.' - strlen($_text) % '.$block_size.') % '.$block_size.', chr(0));
-                    $_ciphertext_len = strlen($_text);
-
-                    for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
-                        $in = substr($_text, $_i, '.$block_size.');
-                        '.$decrypt_block.'
-                        $_plaintext.= $in;
-                    }
-
-                    return $self->_unpad($_plaintext);
-                    ';
-                break;
-            case self::MODE_CTR:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    $_plaintext_len = strlen($_text);
-                    $_xor = $self->encryptIV;
-                    $_buffer = &$self->enbuffer;
-                    if (strlen($_buffer["ciphertext"])) {
-                        for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
-                            $_block = substr($_text, $_i, '.$block_size.');
-                            if (strlen($_block) > strlen($_buffer["ciphertext"])) {
-                                $in = $_xor;
-                                '.$encrypt_block.'
-                                $self->_increment_str($_xor);
-                                $_buffer["ciphertext"].= $in;
-                            }
-                            $_key = $self->_string_shift($_buffer["ciphertext"], '.$block_size.');
-                            $_ciphertext.= $_block ^ $_key;
-                        }
-                    } else {
-                        for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
-                            $_block = substr($_text, $_i, '.$block_size.');
-                            $in = $_xor;
-                            '.$encrypt_block.'
-                            $self->_increment_str($_xor);
-                            $_key = $in;
-                            $_ciphertext.= $_block ^ $_key;
-                        }
-                    }
-                    if ($self->continuousBuffer) {
-                        $self->encryptIV = $_xor;
-                        if ($_start = $_plaintext_len % '.$block_size.') {
-                            $_buffer["ciphertext"] = substr($_key, $_start) . $_buffer["ciphertext"];
-                        }
-                    }
-
-                    return $_ciphertext;
-                ';
-
-                $decrypt = $init_encrypt . '
-                    $_plaintext = "";
-                    $_ciphertext_len = strlen($_text);
-                    $_xor = $self->decryptIV;
-                    $_buffer = &$self->debuffer;
-
-                    if (strlen($_buffer["ciphertext"])) {
-                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
-                            $_block = substr($_text, $_i, '.$block_size.');
-                            if (strlen($_block) > strlen($_buffer["ciphertext"])) {
-                                $in = $_xor;
-                                '.$encrypt_block.'
-                                $self->_increment_str($_xor);
-                                $_buffer["ciphertext"].= $in;
-                            }
-                            $_key = $self->_string_shift($_buffer["ciphertext"], '.$block_size.');
-                            $_plaintext.= $_block ^ $_key;
-                        }
-                    } else {
-                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
-                            $_block = substr($_text, $_i, '.$block_size.');
-                            $in = $_xor;
-                            '.$encrypt_block.'
-                            $self->_increment_str($_xor);
-                            $_key = $in;
-                            $_plaintext.= $_block ^ $_key;
-                        }
-                    }
-                    if ($self->continuousBuffer) {
-                        $self->decryptIV = $_xor;
-                        if ($_start = $_ciphertext_len % '.$block_size.') {
-                            $_buffer["ciphertext"] = substr($_key, $_start) . $_buffer["ciphertext"];
-                        }
-                    }
-
-                    return $_plaintext;
-                    ';
-                break;
-            case self::MODE_CFB:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    $_buffer = &$self->enbuffer;
-
-                    if ($self->continuousBuffer) {
-                        $_iv = &$self->encryptIV;
-                        $_pos = &$_buffer["pos"];
-                    } else {
-                        $_iv = $self->encryptIV;
-                        $_pos = 0;
-                    }
-                    $_len = strlen($_text);
-                    $_i = 0;
-                    if ($_pos) {
-                        $_orig_pos = $_pos;
-                        $_max = '.$block_size.' - $_pos;
-                        if ($_len >= $_max) {
-                            $_i = $_max;
-                            $_len-= $_max;
-                            $_pos = 0;
-                        } else {
-                            $_i = $_len;
-                            $_pos+= $_len;
-                            $_len = 0;
-                        }
-                        $_ciphertext = substr($_iv, $_orig_pos) ^ $_text;
-                        $_iv = substr_replace($_iv, $_ciphertext, $_orig_pos, $_i);
-                    }
-                    while ($_len >= '.$block_size.') {
-                        $in = $_iv;
-                        '.$encrypt_block.';
-                        $_iv = $in ^ substr($_text, $_i, '.$block_size.');
-                        $_ciphertext.= $_iv;
-                        $_len-= '.$block_size.';
-                        $_i+= '.$block_size.';
-                    }
-                    if ($_len) {
-                        $in = $_iv;
-                        '.$encrypt_block.'
-                        $_iv = $in;
-                        $_block = $_iv ^ substr($_text, $_i);
-                        $_iv = substr_replace($_iv, $_block, 0, $_len);
-                        $_ciphertext.= $_block;
-                        $_pos = $_len;
-                    }
-                    return $_ciphertext;
-                ';
-
-                $decrypt = $init_encrypt . '
-                    $_plaintext = "";
-                    $_buffer = &$self->debuffer;
-
-                    if ($self->continuousBuffer) {
-                        $_iv = &$self->decryptIV;
-                        $_pos = &$_buffer["pos"];
-                    } else {
-                        $_iv = $self->decryptIV;
-                        $_pos = 0;
-                    }
-                    $_len = strlen($_text);
-                    $_i = 0;
-                    if ($_pos) {
-                        $_orig_pos = $_pos;
-                        $_max = '.$block_size.' - $_pos;
-                        if ($_len >= $_max) {
-                            $_i = $_max;
-                            $_len-= $_max;
-                            $_pos = 0;
-                        } else {
-                            $_i = $_len;
-                            $_pos+= $_len;
-                            $_len = 0;
-                        }
-                        $_plaintext = substr($_iv, $_orig_pos) ^ $_text;
-                        $_iv = substr_replace($_iv, substr($_text, 0, $_i), $_orig_pos, $_i);
-                    }
-                    while ($_len >= '.$block_size.') {
-                        $in = $_iv;
-                        '.$encrypt_block.'
-                        $_iv = $in;
-                        $cb = substr($_text, $_i, '.$block_size.');
-                        $_plaintext.= $_iv ^ $cb;
-                        $_iv = $cb;
-                        $_len-= '.$block_size.';
-                        $_i+= '.$block_size.';
-                    }
-                    if ($_len) {
-                        $in = $_iv;
-                        '.$encrypt_block.'
-                        $_iv = $in;
-                        $_plaintext.= $_iv ^ substr($_text, $_i);
-                        $_iv = substr_replace($_iv, substr($_text, $_i), 0, $_len);
-                        $_pos = $_len;
-                    }
-
-                    return $_plaintext;
-                    ';
-                break;
-            case self::MODE_OFB:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    $_plaintext_len = strlen($_text);
-                    $_xor = $self->encryptIV;
-                    $_buffer = &$self->enbuffer;
-
-                    if (strlen($_buffer["xor"])) {
-                        for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
-                            $_block = substr($_text, $_i, '.$block_size.');
-                            if (strlen($_block) > strlen($_buffer["xor"])) {
-                                $in = $_xor;
-                                '.$encrypt_block.'
-                                $_xor = $in;
-                                $_buffer["xor"].= $_xor;
-                            }
-                            $_key = $self->_string_shift($_buffer["xor"], '.$block_size.');
-                            $_ciphertext.= $_block ^ $_key;
-                        }
-                    } else {
-                        for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
-                            $in = $_xor;
-                            '.$encrypt_block.'
-                            $_xor = $in;
-                            $_ciphertext.= substr($_text, $_i, '.$block_size.') ^ $_xor;
-                        }
-                        $_key = $_xor;
-                    }
-                    if ($self->continuousBuffer) {
-                        $self->encryptIV = $_xor;
-                        if ($_start = $_plaintext_len % '.$block_size.') {
-                             $_buffer["xor"] = substr($_key, $_start) . $_buffer["xor"];
-                        }
-                    }
-                    return $_ciphertext;
-                    ';
-
-                $decrypt = $init_encrypt . '
-                    $_plaintext = "";
-                    $_ciphertext_len = strlen($_text);
-                    $_xor = $self->decryptIV;
-                    $_buffer = &$self->debuffer;
-
-                    if (strlen($_buffer["xor"])) {
-                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
-                            $_block = substr($_text, $_i, '.$block_size.');
-                            if (strlen($_block) > strlen($_buffer["xor"])) {
-                                $in = $_xor;
-                                '.$encrypt_block.'
-                                $_xor = $in;
-                                $_buffer["xor"].= $_xor;
-                            }
-                            $_key = $self->_string_shift($_buffer["xor"], '.$block_size.');
-                            $_plaintext.= $_block ^ $_key;
-                        }
-                    } else {
-                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
-                            $in = $_xor;
-                            '.$encrypt_block.'
-                            $_xor = $in;
-                            $_plaintext.= substr($_text, $_i, '.$block_size.') ^ $_xor;
-                        }
-                        $_key = $_xor;
-                    }
-                    if ($self->continuousBuffer) {
-                        $self->decryptIV = $_xor;
-                        if ($_start = $_ciphertext_len % '.$block_size.') {
-                             $_buffer["xor"] = substr($_key, $_start) . $_buffer["xor"];
-                        }
-                    }
-                    return $_plaintext;
-                    ';
-                break;
-            case self::MODE_STREAM:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    '.$encrypt_block.'
-                    return $_ciphertext;
-                    ';
-                $decrypt = $init_decrypt . '
-                    $_plaintext = "";
-                    '.$decrypt_block.'
-                    return $_plaintext;
-                    ';
-                break;
-            // case self::MODE_CBC:
-            default:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    $_plaintext_len = strlen($_text);
-
-                    $in = $self->encryptIV;
-
-                    for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
-                        $in = substr($_text, $_i, '.$block_size.') ^ $in;
-                        '.$encrypt_block.'
-                        $_ciphertext.= $in;
-                    }
-
-                    if ($self->continuousBuffer) {
-                        $self->encryptIV = $in;
-                    }
-
-                    return $_ciphertext;
-                    ';
-
-                $decrypt = $init_decrypt . '
-                    $_plaintext = "";
-                    $_text = str_pad($_text, strlen($_text) + ('.$block_size.' - strlen($_text) % '.$block_size.') % '.$block_size.', chr(0));
-                    $_ciphertext_len = strlen($_text);
-
-                    $_iv = $self->decryptIV;
-
-                    for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
-                        $in = $_block = substr($_text, $_i, '.$block_size.');
-                        '.$decrypt_block.'
-                        $_plaintext.= $in ^ $_iv;
-                        $_iv = $_block;
-                    }
-
-                    if ($self->continuousBuffer) {
-                        $self->decryptIV = $_iv;
-                    }
-
-                    return $self->_unpad($_plaintext);
-                    ';
-                break;
-        }
-
-        // Create the $inline function and return its name as string. Ready to run!
-        return create_function('$_action, &$self, $_text', $init_crypt . 'if ($_action == "encrypt") { ' . $encrypt . ' } else { ' . $decrypt . ' }');
-    }
-
-    /**
-     * Holds the lambda_functions table (classwide)
-     *
-     * Each name of the lambda function, created from
-     * _setupInlineCrypt() && _createInlineCryptFunction()
-     * is stored, classwide (!), here for reusing.
-     *
-     * The string-based index of $function is a classwide
-     * uniqe value representing, at least, the $mode of
-     * operation (or more... depends of the optimizing level)
-     * for which $mode the lambda function was created.
-     *
-     * @access private
-     * @return array &$functions
-     */
-    function &_getLambdaFunctions()
-    {
-        static $functions = array();
-        return $functions;
-    }
-
-    /**
-     * Generates a digest from $bytes
-     *
-     * @see self::_setupInlineCrypt()
-     * @access private
-     * @param $bytes
-     * @return string
-     */
-    function _hashInlineCryptFunction($bytes)
-    {
-        if (!isset(self::$WHIRLPOOL_AVAILABLE)) {
-            self::$WHIRLPOOL_AVAILABLE = extension_loaded('hash') && in_array('whirlpool', hash_algos());
-        }
-
-        $result = '';
-        $hash = $bytes;
-
-        switch (true) {
-            case self::$WHIRLPOOL_AVAILABLE:
-                foreach (str_split($bytes, 64) as $t) {
-                    $hash = hash('whirlpool', $hash, true);
-                    $result .= $t ^ $hash;
-                }
-                return $result . hash('whirlpool', $hash, true);
-            default:
-                $len = strlen($bytes);
-                for ($i = 0; $i < $len; $i+=20) {
-                    $t = substr($bytes, $i, 20);
-                    $hash = pack('H*', sha1($hash));
-                    $result .= $t ^ $hash;
-                }
-                return $result . pack('H*', sha1($hash));
-        }
-    }
-}
diff --git a/phpseclib/Crypt/Blowfish.php b/phpseclib/Crypt/Blowfish.php
index 138afe530..513593d88 100644
--- a/phpseclib/Crypt/Blowfish.php
+++ b/phpseclib/Crypt/Blowfish.php
@@ -3,7 +3,7 @@
 /**
  * Pure-PHP implementation of Blowfish.
  *
- * Uses mcrypt, if available, and an internal implementation, otherwise.
+ * Uses an internal implementation.
  *
  * PHP version 5
  *
@@ -11,12 +11,89 @@
  *
  *  - {@link http://en.wikipedia.org/wiki/Blowfish_(cipher) Wikipedia description of Blowfish}
  *
+ * # An overview of bcrypt vs Blowfish
+ *
+ * OpenSSH private keys use a customized version of bcrypt. Specifically, instead of
+ * encrypting OrpheanBeholderScryDoubt 64 times OpenSSH's bcrypt variant encrypts
+ * OxychromaticBlowfishSwatDynamite 64 times. so we can't use crypt().
+ *
+ * bcrypt is basically Blowfish but instead of performing the key expansion once it performs
+ * the expansion 129 times for each round, with the first key expansion interleaving the salt
+ * and password. This renders OpenSSL unusable and forces us to use a pure-PHP implementation
+ * of blowfish.
+ *
+ * # phpseclib's three different _encryptBlock() implementations
+ *
+ * When using Blowfish as an encryption algorithm, _encryptBlock() is called 9 + 512 +
+ * (the number of blocks in the plaintext) times.
+ *
+ * Each of the first 9 calls to _encryptBlock() modify the P-array. Each of the next 512
+ * calls modify the S-boxes. The remaining _encryptBlock() calls operate on the plaintext to
+ * produce the ciphertext. In the pure-PHP implementation of Blowfish these remaining
+ * _encryptBlock() calls are highly optimized through the use of eval(). Among other things,
+ * P-array lookups are eliminated by hard-coding the key-dependent P-array values, and thus we
+ * have explained 2 of the 4 different _encryptBlock() implementations.
+ *
+ * With bcrypt things are a bit different. _encryptBlock() is called 1,079,296 times,
+ * assuming 16 rounds (which is what OpenSSH's bcrypt defaults to). The eval()-optimized
+ * _encryptBlock() isn't as beneficial because the P-array values are not constant. Well, they
+ * are constant, but only for, at most, 777 _encryptBlock() calls, which is equivalent to ~6KB
+ * of data. The average length of back to back _encryptBlock() calls with a fixed P-array is
+ * 514.12, which is ~4KB of data. Creating an eval()-optimized _encryptBlock() has an upfront
+ * cost, which is CPU dependent and is probably not going to be worth it for just ~4KB of
+ * data. Conseqeuently, bcrypt does not benefit from the eval()-optimized _encryptBlock().
+ *
+ * The regular _encryptBlock() does unpack() and pack() on every call, as well, and that can
+ * begin to add up after one million function calls.
+ *
+ * In theory, one might think that it might be beneficial to rewrite all block ciphers so
+ * that, instead of passing strings to _encryptBlock(), you convert the string to an array of
+ * integers and then pass successive subarrays of that array to _encryptBlock. This, however,
+ * kills PHP's memory use. Like let's say you have a 1MB long string. After doing
+ * $in = str_repeat('a', 1024 * 1024); PHP's memory utilization jumps up by ~1MB. After doing
+ * $blocks = str_split($in, 4); it jumps up by an additional ~16MB. After
+ * $blocks = array_map(fn($x) => unpack('N*', $x), $blocks); it jumps up by an additional
+ * ~90MB, yielding a 106x increase in memory usage. Consequently, it bcrypt calls a different
+ * _encryptBlock() then the regular Blowfish does. That said, the Blowfish _encryptBlock() is
+ * basically just a thin wrapper around the bcrypt _encryptBlock(), so there's that.
+ *
+ * # phpseclib's three different _setupKey() implementations
+ *
+ * Every bcrypt round is the equivalent of encrypting 512KB of data. Since OpenSSH uses 16
+ * rounds by default that's ~8MB of data that's essentially being encrypted whenever
+ * you use bcrypt. That's a lot of data, however, bcrypt operates within tighter constraints
+ * than regular Blowfish, so we can use that to our advantage. In particular, whereas Blowfish
+ * supports variable length keys, in bcrypt, the initial "key" is the sha512 hash of the
+ * password. sha512 hashes are 512 bits or 64 bytes long and thus the bcrypt keys are of a
+ * fixed length whereas Blowfish keys are not of a fixed length.
+ *
+ * bcrypt actually has two different key expansion steps. The first one (expandstate) is
+ * constantly XOR'ing every _encryptBlock() parameter against the salt prior _encryptBlock()'s
+ * being called. The second one (expand0state) is more similar to Blowfish's _setupKey()
+ * but it can still use the fixed length key optimization discussed above and can do away with
+ * the pack() / unpack() calls.
+ *
+ * I suppose _setupKey() could be made to be a thin wrapper around expandstate() but idk it's
+ * just a lot of work for very marginal benefits as _setupKey() is only called once for
+ * regular Blowfish vs the 128 times it's called --per round-- with bcrypt.
+ *
+ * # blowfish + bcrypt in the same class
+ *
+ * Altho there's a lot of Blowfish code that bcrypt doesn't re-use, bcrypt does re-use the
+ * initial S-boxes, the initial P-array and the int-only _encryptBlock() implementation.
+ *
+ * # Credit
+ *
+ * phpseclib's bcrypt implementation is based losely off of OpenSSH's implementation:
+ *
+ * https://github.com/openssh/openssh-portable/blob/master/openbsd-compat/bcrypt_pbkdf.c
+ *
  * Here's a short example of how to use this library:
  * <code>
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $blowfish = new \phpseclib\Crypt\Blowfish();
+ *    $blowfish = new \phpseclib3\Crypt\Blowfish('ctr');
  *
  *    $blowfish->setKey('12345678901234567890123456789012');
  *
@@ -26,8 +103,6 @@
  * ?>
  * </code>
  *
- * @category  Crypt
- * @package   Blowfish
  * @author    Jim Wigginton <terrafrost@php.net>
  * @author    Hans-Juergen Petrich <petrich@tronic-media.com>
  * @copyright 2007 Jim Wigginton
@@ -35,56 +110,38 @@
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\Crypt;
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt;
 
-use phpseclib\Crypt\Base;
+use phpseclib3\Crypt\Common\BlockCipher;
+use phpseclib3\Exception\InvalidArgumentException;
+use phpseclib3\Exception\LengthException;
 
 /**
  * Pure-PHP implementation of Blowfish.
  *
- * @package Blowfish
  * @author  Jim Wigginton <terrafrost@php.net>
  * @author  Hans-Juergen Petrich <petrich@tronic-media.com>
- * @access  public
  */
-class Blowfish extends Base
+class Blowfish extends BlockCipher
 {
     /**
      * Block Length of the cipher
      *
-     * @see \phpseclib\Crypt\Base::block_size
+     * @see Common\SymmetricKey::block_size
      * @var int
-     * @access private
-     */
-    var $block_size = 8;
-
-    /**
-     * The mcrypt specific name of the cipher
-     *
-     * @see \phpseclib\Crypt\Base::cipher_name_mcrypt
-     * @var string
-     * @access private
-     */
-    var $cipher_name_mcrypt = 'blowfish';
-
-    /**
-     * Optimizing value while CFB-encrypting
-     *
-     * @see \phpseclib\Crypt\Base::cfb_init_len
-     * @var int
-     * @access private
      */
-    var $cfb_init_len = 500;
+    protected $block_size = 8;
 
     /**
      * The fixed subkeys boxes ($sbox0 - $sbox3) with 256 entries each
      *
-     * S-Box 0
+     * S-Box
      *
-     * @access private
      * @var    array
      */
-    var $sbox0 = array(
+    private static $sbox = [
         0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
         0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16, 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
         0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
@@ -116,16 +173,8 @@ class Blowfish extends Base
         0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa, 0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
         0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
         0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400, 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
-        0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664, 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
-    );
+        0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664, 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a,
 
-    /**
-     * S-Box 1
-     *
-     * @access private
-     * @var    array
-     */
-    var $sbox1 = array(
         0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
         0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1, 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
         0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6, 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
@@ -157,16 +206,8 @@ class Blowfish extends Base
         0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb, 0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
         0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
         0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
-        0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20, 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
-    );
+        0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20, 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7,
 
-    /**
-     * S-Box 2
-     *
-     * @access private
-     * @var    array
-     */
-    var $sbox2 = array(
         0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
         0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af, 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
         0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45, 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
@@ -198,16 +239,8 @@ class Blowfish extends Base
         0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634, 0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
         0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24, 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
         0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
-        0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
-    );
+        0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0,
 
-    /**
-     * S-Box 3
-     *
-     * @access private
-     * @var    array
-     */
-    var $sbox3 = array(
         0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
         0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b, 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
         0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8, 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
@@ -239,20 +272,19 @@ class Blowfish extends Base
         0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6, 0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
         0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
         0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e, 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
-        0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f, 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
-    );
+        0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f, 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6,
+    ];
 
     /**
      * P-Array consists of 18 32-bit subkeys
      *
      * @var array
-     * @access private
      */
-    var $parray = array(
+    private static $parray = [
         0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822, 0x299f31d0,
         0x082efa98, 0xec4e6c89, 0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
-        0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917, 0x9216d5d9, 0x8979fb1b
-    );
+        0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917, 0x9216d5d9, 0x8979fb1b,
+    ];
 
     /**
      * The BCTX-working Array
@@ -260,103 +292,107 @@ class Blowfish extends Base
      * Holds the expanded key [p] and the key-depended s-boxes [sb]
      *
      * @var array
-     * @access private
      */
-    var $bctx;
+    private $bctx;
 
     /**
      * Holds the last used key
      *
      * @var array
-     * @access private
      */
-    var $kl;
+    private $kl;
 
     /**
      * The Key Length (in bytes)
-     *
-     * @see \phpseclib\Crypt\Base::setKeyLength()
-     * @var int
-     * @access private
-     * @internal The max value is 256 / 8 = 32, the min value is 128 / 8 = 16.  Exists in conjunction with $Nk
+     * {@internal The max value is 256 / 8 = 32, the min value is 128 / 8 = 16.  Exists in conjunction with $Nk
      *    because the encryption / decryption / key schedule creation requires this number and not $key_length.  We could
      *    derive this from $key_length or vice versa, but that'd mean we'd have to do multiple shift operations, so in lieu
-     *    of that, we'll just precompute it once.
+     *    of that, we'll just precompute it once.}
+     *
+     * @see Common\SymmetricKey::setKeyLength()
+     * @var int
      */
-    var $key_length = 16;
+    protected $key_length = 16;
+
+    /**
+     * Default Constructor.
+     *
+     * @throws InvalidArgumentException if an invalid / unsupported mode is provided
+     */
+    public function __construct(string $mode)
+    {
+        parent::__construct($mode);
+
+        if ($this->mode == self::MODE_STREAM) {
+            throw new InvalidArgumentException('Block ciphers cannot be ran in stream mode');
+        }
+    }
 
     /**
      * Sets the key length.
      *
      * Key lengths can be between 32 and 448 bits.
-     *
-     * @access public
-     * @param int $length
      */
-    function setKeyLength($length)
+    public function setKeyLength(int $length): void
     {
-        if ($length < 32) {
-            $this->key_length = 7;
-        } elseif ($length > 448) {
-            $this->key_length = 56;
-        } else {
-            $this->key_length = $length >> 3;
+        if ($length < 32 || $length > 448) {
+                throw new LengthException('Key size of ' . $length . ' bits is not supported by this algorithm. Only keys of sizes between 32 and 448 bits are supported');
         }
 
+        $this->key_length = $length >> 3;
+
         parent::setKeyLength($length);
     }
 
     /**
      * Test for engine validity
      *
-     * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
+     * This is mainly just a wrapper to set things up for \phpseclib3\Crypt\Common\SymmetricKey::isValidEngine()
      *
-     * @see \phpseclib\Crypt\Base::isValidEngine()
-     * @param int $engine
-     * @access public
-     * @return bool
+     * @see Common\SymmetricKey::isValidEngine()
      */
-    function isValidEngine($engine)
+    protected function isValidEngineHelper(int $engine): bool
     {
         if ($engine == self::ENGINE_OPENSSL) {
-            if ($this->key_length != 16) {
+            if ($this->key_length < 16) {
+                return false;
+            }
+            // quoting https://www.openssl.org/news/openssl-3.0-notes.html, OpenSSL 3.0.1
+            // "Moved all variations of the EVP ciphers CAST5, BF, IDEA, SEED, RC2, RC4, RC5, and DES to the legacy provider"
+            // in theory openssl_get_cipher_methods() should catch this but, on GitHub Actions, at least, it does not
+            if (defined('OPENSSL_VERSION_TEXT') && version_compare(preg_replace('#OpenSSL (\d+\.\d+\.\d+) .*#', '$1', OPENSSL_VERSION_TEXT), '3.0.1', '>=')) {
                 return false;
             }
             $this->cipher_name_openssl_ecb = 'bf-ecb';
-            $this->cipher_name_openssl = 'bf-' . $this->_openssl_translate_mode();
+            $this->cipher_name_openssl = 'bf-' . $this->openssl_translate_mode();
         }
 
-        return parent::isValidEngine($engine);
+        return parent::isValidEngineHelper($engine);
     }
 
     /**
      * Setup the key (expansion)
      *
-     * @see \phpseclib\Crypt\Base::_setupKey()
-     * @access private
+     * @see Common\SymmetricKey::_setupKey()
      */
-    function _setupKey()
+    protected function setupKey(): void
     {
         if (isset($this->kl['key']) && $this->key === $this->kl['key']) {
             // already expanded
             return;
         }
-        $this->kl = array('key' => $this->key);
+        $this->kl = ['key' => $this->key];
 
         /* key-expanding p[] and S-Box building sb[] */
-        $this->bctx = array(
-            'p'  => array(),
-            'sb' => array(
-                $this->sbox0,
-                $this->sbox1,
-                $this->sbox2,
-                $this->sbox3
-            )
-        );
+        $this->bctx = [
+            'p'  => [],
+            'sb' => self::$sbox,
+        ];
 
         // unpack binary string in unsigned chars
         $key  = array_values(unpack('C*', $this->key));
         $keyl = count($key);
+        // with bcrypt $keyl will always be 16 (because the key is the sha512 of the key you provide)
         for ($j = 0, $i = 0; $i < 18; ++$i) {
             // xor P1 with the first 32-bits of the key, xor P2 with the second 32-bits ...
             for ($data = 0, $k = 0; $k < 4; ++$k) {
@@ -365,212 +401,390 @@ function _setupKey()
                     $j = 0;
                 }
             }
-            $this->bctx['p'][] = $this->parray[$i] ^ $data;
+            $this->bctx['p'][] = self::$parray[$i] ^ intval($data);
         }
 
         // encrypt the zero-string, replace P1 and P2 with the encrypted data,
         // encrypt P3 and P4 with the new P1 and P2, do it with all P-array and subkeys
         $data = "\0\0\0\0\0\0\0\0";
         for ($i = 0; $i < 18; $i += 2) {
-            list($l, $r) = array_values(unpack('N*', $data = $this->_encryptBlock($data)));
+            [$l, $r] = array_values(unpack('N*', $data = $this->encryptBlock($data)));
             $this->bctx['p'][$i    ] = $l;
             $this->bctx['p'][$i + 1] = $r;
         }
-        for ($i = 0; $i < 4; ++$i) {
+        for ($i = 0; $i < 0x400; $i += 0x100) {
             for ($j = 0; $j < 256; $j += 2) {
-                list($l, $r) = array_values(unpack('N*', $data = $this->_encryptBlock($data)));
-                $this->bctx['sb'][$i][$j    ] = $l;
-                $this->bctx['sb'][$i][$j + 1] = $r;
+                [$l, $r] = array_values(unpack('N*', $data = $this->encryptBlock($data)));
+                $this->bctx['sb'][$i | $j] = $l;
+                $this->bctx['sb'][$i | ($j + 1)] = $r;
             }
         }
     }
 
     /**
-     * Encrypts a block
+     * Initialize Static Variables
+     */
+    protected static function initialize_static_variables(): void
+    {
+        if (is_float(self::$sbox[0x200])) {
+            self::$sbox = array_map('intval', self::$sbox);
+            self::$parray = array_map('intval', self::$parray);
+        }
+
+        parent::initialize_static_variables();
+    }
+
+    /**
+     * bcrypt
+     */
+    private static function bcrypt_hash(string $sha2pass, string $sha2salt): string
+    {
+        $p = self::$parray;
+        $sbox = self::$sbox;
+
+        $cdata = array_values(unpack('N*', 'OxychromaticBlowfishSwatDynamite'));
+        $sha2pass = array_values(unpack('N*', $sha2pass));
+        $sha2salt = array_values(unpack('N*', $sha2salt));
+
+        self::expandstate($sha2salt, $sha2pass, $sbox, $p);
+        for ($i = 0; $i < 64; $i++) {
+            self::expand0state($sha2salt, $sbox, $p);
+            self::expand0state($sha2pass, $sbox, $p);
+        }
+
+        for ($i = 0; $i < 64; $i++) {
+            for ($j = 0; $j < 8; $j += 2) { // count($cdata) == 8
+                [$cdata[$j], $cdata[$j + 1]] = self::encryptBlockHelperFast($cdata[$j], $cdata[$j + 1], $sbox, $p);
+            }
+        }
+
+        return pack('V*', ...$cdata);
+    }
+
+    /**
+     * Performs OpenSSH-style bcrypt
+     */
+    public static function bcrypt_pbkdf(string $pass, string $salt, int $keylen, int $rounds): string
+    {
+        self::initialize_static_variables();
+
+        if (PHP_INT_SIZE == 4) {
+            throw new \RuntimeException('bcrypt is far too slow to be practical on 32-bit versions of PHP');
+        }
+
+        $sha2pass = hash('sha512', $pass, true);
+        $results = [];
+        $count = 1;
+        while (32 * count($results) < $keylen) {
+            $countsalt = $salt . pack('N', $count++);
+            $sha2salt = hash('sha512', $countsalt, true);
+            $out = $tmpout = self::bcrypt_hash($sha2pass, $sha2salt);
+            for ($i = 1; $i < $rounds; $i++) {
+                $sha2salt = hash('sha512', $tmpout, true);
+                $tmpout = self::bcrypt_hash($sha2pass, $sha2salt);
+                $out ^= $tmpout;
+            }
+            $results[] = $out;
+        }
+        $output = '';
+        for ($i = 0; $i < 32; $i++) {
+            foreach ($results as $result) {
+                $output .= $result[$i];
+            }
+        }
+        return substr($output, 0, $keylen);
+    }
+
+    /**
+     * Key expansion without salt
      *
      * @access private
-     * @param string $in
-     * @return string
+     * @param int[] $key
+     * @param int[] $sbox
+     * @param int[] $p
+     * @see self::_bcrypt_hash()
      */
-    function _encryptBlock($in)
+    private static function expand0state(array $key, array &$sbox, array &$p): void
     {
-        $p = $this->bctx["p"];
-        // extract($this->bctx["sb"], EXTR_PREFIX_ALL, "sb"); // slower
-        $sb_0 = $this->bctx["sb"][0];
-        $sb_1 = $this->bctx["sb"][1];
-        $sb_2 = $this->bctx["sb"][2];
-        $sb_3 = $this->bctx["sb"][3];
-
-        $in = unpack("N*", $in);
-        $l = $in[1];
-        $r = $in[2];
-
-        for ($i = 0; $i < 16; $i+= 2) {
-            $l^= $p[$i];
-            $r^= ($sb_0[$l >> 24 & 0xff]  +
-                  $sb_1[$l >> 16 & 0xff]  ^
-                  $sb_2[$l >>  8 & 0xff]) +
-                  $sb_3[$l       & 0xff];
-
-            $r^= $p[$i + 1];
-            $l^= ($sb_0[$r >> 24 & 0xff]  +
-                  $sb_1[$r >> 16 & 0xff]  ^
-                  $sb_2[$r >>  8 & 0xff]) +
-                  $sb_3[$r       & 0xff];
+        // expand0state is basically the same thing as this:
+        //return self::expandstate(array_fill(0, 16, 0), $key);
+        // but this separate function eliminates a bunch of XORs and array lookups
+
+        $p = [
+            $p[0] ^ $key[0],
+            $p[1] ^ $key[1],
+            $p[2] ^ $key[2],
+            $p[3] ^ $key[3],
+            $p[4] ^ $key[4],
+            $p[5] ^ $key[5],
+            $p[6] ^ $key[6],
+            $p[7] ^ $key[7],
+            $p[8] ^ $key[8],
+            $p[9] ^ $key[9],
+            $p[10] ^ $key[10],
+            $p[11] ^ $key[11],
+            $p[12] ^ $key[12],
+            $p[13] ^ $key[13],
+            $p[14] ^ $key[14],
+            $p[15] ^ $key[15],
+            $p[16] ^ $key[0],
+            $p[17] ^ $key[1],
+        ];
+
+        // @codingStandardsIgnoreStart
+        [ $p[0],  $p[1]] = self::encryptBlockHelperFast(     0,      0, $sbox, $p);
+        [ $p[2],  $p[3]] = self::encryptBlockHelperFast($p[ 0], $p[ 1], $sbox, $p);
+        [ $p[4],  $p[5]] = self::encryptBlockHelperFast($p[ 2], $p[ 3], $sbox, $p);
+        [ $p[6],  $p[7]] = self::encryptBlockHelperFast($p[ 4], $p[ 5], $sbox, $p);
+        [ $p[8],  $p[9]] = self::encryptBlockHelperFast($p[ 6], $p[ 7], $sbox, $p);
+        [$p[10], $p[11]] = self::encryptBlockHelperFast($p[ 8], $p[ 9], $sbox, $p);
+        [$p[12], $p[13]] = self::encryptBlockHelperFast($p[10], $p[11], $sbox, $p);
+        [$p[14], $p[15]] = self::encryptBlockHelperFast($p[12], $p[13], $sbox, $p);
+        [$p[16], $p[17]] = self::encryptBlockHelperFast($p[14], $p[15], $sbox, $p);
+        // @codingStandardsIgnoreEnd
+
+        [$sbox[0], $sbox[1]] = self::encryptBlockHelperFast($p[16], $p[17], $sbox, $p);
+        for ($i = 2; $i < 1024; $i += 2) {
+            [$sbox[$i], $sbox[$i + 1]] = self::encryptBlockHelperFast($sbox[$i - 2], $sbox[$i - 1], $sbox, $p);
         }
-        return pack("N*", $r ^ $p[17], $l ^ $p[16]);
     }
 
     /**
-     * Decrypts a block
+     * Key expansion with salt
      *
      * @access private
-     * @param string $in
-     * @return string
+     * @param int[] $data
+     * @param int[] $key
+     * @param int[] $sbox
+     * @param int[] $p
+     * @see self::_bcrypt_hash()
      */
-    function _decryptBlock($in)
+    private static function expandstate(array $data, array $key, array &$sbox, array &$p): void
     {
-        $p = $this->bctx["p"];
-        $sb_0 = $this->bctx["sb"][0];
-        $sb_1 = $this->bctx["sb"][1];
-        $sb_2 = $this->bctx["sb"][2];
-        $sb_3 = $this->bctx["sb"][3];
+        $p = [
+            $p[0] ^ $key[0],
+            $p[1] ^ $key[1],
+            $p[2] ^ $key[2],
+            $p[3] ^ $key[3],
+            $p[4] ^ $key[4],
+            $p[5] ^ $key[5],
+            $p[6] ^ $key[6],
+            $p[7] ^ $key[7],
+            $p[8] ^ $key[8],
+            $p[9] ^ $key[9],
+            $p[10] ^ $key[10],
+            $p[11] ^ $key[11],
+            $p[12] ^ $key[12],
+            $p[13] ^ $key[13],
+            $p[14] ^ $key[14],
+            $p[15] ^ $key[15],
+            $p[16] ^ $key[0],
+            $p[17] ^ $key[1],
+        ];
+
+        // @codingStandardsIgnoreStart
+        [ $p[0],  $p[1]] = self::encryptBlockHelperFast($data[ 0]         , $data[ 1]         , $sbox, $p);
+        [ $p[2],  $p[3]] = self::encryptBlockHelperFast($data[ 2] ^ $p[ 0], $data[ 3] ^ $p[ 1], $sbox, $p);
+        [ $p[4],  $p[5]] = self::encryptBlockHelperFast($data[ 4] ^ $p[ 2], $data[ 5] ^ $p[ 3], $sbox, $p);
+        [ $p[6],  $p[7]] = self::encryptBlockHelperFast($data[ 6] ^ $p[ 4], $data[ 7] ^ $p[ 5], $sbox, $p);
+        [ $p[8],  $p[9]] = self::encryptBlockHelperFast($data[ 8] ^ $p[ 6], $data[ 9] ^ $p[ 7], $sbox, $p);
+        [$p[10], $p[11]] = self::encryptBlockHelperFast($data[10] ^ $p[ 8], $data[11] ^ $p[ 9], $sbox, $p);
+        [$p[12], $p[13]] = self::encryptBlockHelperFast($data[12] ^ $p[10], $data[13] ^ $p[11], $sbox, $p);
+        [$p[14], $p[15]] = self::encryptBlockHelperFast($data[14] ^ $p[12], $data[15] ^ $p[13], $sbox, $p);
+        [$p[16], $p[17]] = self::encryptBlockHelperFast($data[ 0] ^ $p[14], $data[ 1] ^ $p[15], $sbox, $p);
+        // @codingStandardsIgnoreEnd
+
+        [$sbox[0], $sbox[1]] = self::encryptBlockHelperFast($data[2] ^ $p[16], $data[3] ^ $p[17], $sbox, $p);
+        for ($i = 2, $j = 4; $i < 1024; $i += 2, $j = ($j + 2) % 16) { // instead of 16 maybe count($data) would be better?
+            [$sbox[$i], $sbox[$i + 1]] = self::encryptBlockHelperFast($data[$j] ^ $sbox[$i - 2], $data[$j + 1] ^ $sbox[$i - 1], $sbox, $p);
+        }
+    }
 
-        $in = unpack("N*", $in);
+    /**
+     * Encrypts a block
+     */
+    protected function encryptBlock(string $in): string
+    {
+        $p = $this->bctx['p'];
+        // extract($this->bctx['sb'], EXTR_PREFIX_ALL, 'sb'); // slower
+        $sb = $this->bctx['sb'];
+
+        $in = unpack('N*', $in);
         $l = $in[1];
         $r = $in[2];
 
-        for ($i = 17; $i > 2; $i-= 2) {
-            $l^= $p[$i];
-            $r^= ($sb_0[$l >> 24 & 0xff]  +
-                  $sb_1[$l >> 16 & 0xff]  ^
-                  $sb_2[$l >>  8 & 0xff]) +
-                  $sb_3[$l       & 0xff];
-
-            $r^= $p[$i - 1];
-            $l^= ($sb_0[$r >> 24 & 0xff]  +
-                  $sb_1[$r >> 16 & 0xff]  ^
-                  $sb_2[$r >>  8 & 0xff]) +
-                  $sb_3[$r       & 0xff];
-        }
-        return pack("N*", $r ^ $p[0], $l ^ $p[1]);
+        [$r, $l] = PHP_INT_SIZE == 4 ?
+            self::encryptBlockHelperSlow($l, $r, $sb, $p) :
+            self::encryptBlockHelperFast($l, $r, $sb, $p);
+
+        return pack("N*", $r, $l);
     }
 
     /**
-     * Setup the performance-optimized function for de/encrypt()
+     * Fast helper function for block encryption
      *
-     * @see \phpseclib\Crypt\Base::_setupInlineCrypt()
      * @access private
+     * @param int[] $sbox
+     * @param int[] $p
+     * @return int[]
      */
-    function _setupInlineCrypt()
+    private static function encryptBlockHelperFast(int $x0, int $x1, array $sbox, array $p): array
     {
-        $lambda_functions =& self::_getLambdaFunctions();
+        $x0 ^= $p[0];
+        $x1 ^= ((($sbox[($x0 & 0xFF000000) >> 24] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[1];
+        $x0 ^= ((($sbox[($x1 & 0xFF000000) >> 24] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[2];
+        $x1 ^= ((($sbox[($x0 & 0xFF000000) >> 24] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[3];
+        $x0 ^= ((($sbox[($x1 & 0xFF000000) >> 24] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[4];
+        $x1 ^= ((($sbox[($x0 & 0xFF000000) >> 24] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[5];
+        $x0 ^= ((($sbox[($x1 & 0xFF000000) >> 24] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[6];
+        $x1 ^= ((($sbox[($x0 & 0xFF000000) >> 24] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[7];
+        $x0 ^= ((($sbox[($x1 & 0xFF000000) >> 24] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[8];
+        $x1 ^= ((($sbox[($x0 & 0xFF000000) >> 24] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[9];
+        $x0 ^= ((($sbox[($x1 & 0xFF000000) >> 24] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[10];
+        $x1 ^= ((($sbox[($x0 & 0xFF000000) >> 24] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[11];
+        $x0 ^= ((($sbox[($x1 & 0xFF000000) >> 24] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[12];
+        $x1 ^= ((($sbox[($x0 & 0xFF000000) >> 24] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[13];
+        $x0 ^= ((($sbox[($x1 & 0xFF000000) >> 24] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[14];
+        $x1 ^= ((($sbox[($x0 & 0xFF000000) >> 24] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[15];
+        $x0 ^= ((($sbox[($x1 & 0xFF000000) >> 24] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[16];
+
+        return [$x1 & 0xFFFFFFFF ^ $p[17], $x0 & 0xFFFFFFFF];
+    }
 
-        // We create max. 10 hi-optimized code for memory reason. Means: For each $key one ultra fast inline-crypt function.
-        // (Currently, for Blowfish, one generated $lambda_function cost on php5.5@32bit ~100kb unfreeable mem and ~180kb on php5.5@64bit)
-        // After that, we'll still create very fast optimized code but not the hi-ultimative code, for each $mode one.
-        $gen_hi_opt_code = (bool)(count($lambda_functions) < 10);
+    /**
+     * Slow helper function for block encryption
+     *
+     * @param int[] $sbox
+     * @param int[] $p
+     * @return int[]
+     */
+    private static function encryptBlockHelperSlow(int $x0, int $x1, array $sbox0, array $sbox, array $p): array
+    {
+        // -16777216 == intval(0xFF000000) on 32-bit PHP installs
+        $x0 ^= $p[0];
+        $x1 ^= self::safe_intval((self::safe_intval($sbox[(($x0 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[1];
+        $x0 ^= self::safe_intval((self::safe_intval($sbox[(($x1 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[2];
+        $x1 ^= self::safe_intval((self::safe_intval($sbox[(($x0 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[3];
+        $x0 ^= self::safe_intval((self::safe_intval($sbox[(($x1 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[4];
+        $x1 ^= self::safe_intval((self::safe_intval($sbox[(($x0 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[5];
+        $x0 ^= self::safe_intval((self::safe_intval($sbox[(($x1 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[6];
+        $x1 ^= self::safe_intval((self::safe_intval($sbox[(($x0 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[7];
+        $x0 ^= self::safe_intval((self::safe_intval($sbox[(($x1 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[8];
+        $x1 ^= self::safe_intval((self::safe_intval($sbox[(($x0 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[9];
+        $x0 ^= self::safe_intval((self::safe_intval($sbox[(($x1 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[10];
+        $x1 ^= self::safe_intval((self::safe_intval($sbox[(($x0 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[11];
+        $x0 ^= self::safe_intval((self::safe_intval($sbox[(($x1 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[12];
+        $x1 ^= self::safe_intval((self::safe_intval($sbox[(($x0 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[13];
+        $x0 ^= self::safe_intval((self::safe_intval($sbox[(($x1 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[14];
+        $x1 ^= self::safe_intval((self::safe_intval($sbox[(($x0 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[15];
+        $x0 ^= self::safe_intval((self::safe_intval($sbox[(($x1 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[16];
+
+        return [$x1 ^ $p[17], $x0];
+    }
 
-        // Generation of a unique hash for our generated code
-        $code_hash = "Crypt_Blowfish, {$this->mode}";
-        if ($gen_hi_opt_code) {
-            $code_hash = str_pad($code_hash, 32) . $this->_hashInlineCryptFunction($this->key);
-        }
+    /**
+     * Decrypts a block
+     */
+    protected function decryptBlock(string $in): string
+    {
+        $p = $this->bctx['p'];
+        $sb = $this->bctx['sb'];
 
-        if (!isset($lambda_functions[$code_hash])) {
-            switch (true) {
-                case $gen_hi_opt_code:
-                    $p = $this->bctx['p'];
-                    $init_crypt = '
-                        static $sb_0, $sb_1, $sb_2, $sb_3;
-                        if (!$sb_0) {
-                            $sb_0 = $self->bctx["sb"][0];
-                            $sb_1 = $self->bctx["sb"][1];
-                            $sb_2 = $self->bctx["sb"][2];
-                            $sb_3 = $self->bctx["sb"][3];
-                        }
-                    ';
-                    break;
-                default:
-                    $p   = array();
-                    for ($i = 0; $i < 18; ++$i) {
-                        $p[] = '$p_' . $i;
-                    }
-                    $init_crypt = '
-                        list($sb_0, $sb_1, $sb_2, $sb_3) = $self->bctx["sb"];
-                        list(' . implode(',', $p) . ') = $self->bctx["p"];
-
-                    ';
-            }
+        $in = unpack('N*', $in);
+        $l = $in[1];
+        $r = $in[2];
 
-            // Generating encrypt code:
-            $encrypt_block = '
-                $in = unpack("N*", $in);
-                $l = $in[1];
-                $r = $in[2];
-            ';
-            for ($i = 0; $i < 16; $i+= 2) {
-                $encrypt_block.= '
-                    $l^= ' . $p[$i] . ';
-                    $r^= ($sb_0[$l >> 24 & 0xff]  +
-                          $sb_1[$l >> 16 & 0xff]  ^
-                          $sb_2[$l >>  8 & 0xff]) +
-                          $sb_3[$l       & 0xff];
-
-                    $r^= ' . $p[$i + 1] . ';
-                    $l^= ($sb_0[$r >> 24 & 0xff]  +
-                          $sb_1[$r >> 16 & 0xff]  ^
-                          $sb_2[$r >>  8 & 0xff]) +
-                          $sb_3[$r       & 0xff];
-                ';
-            }
-            $encrypt_block.= '
-                $in = pack("N*",
-                    $r ^ ' . $p[17] . ',
-                    $l ^ ' . $p[16] . '
-                );
-            ';
+        for ($i = 17; $i > 2; $i -= 2) {
+            $l ^= $p[$i];
+            $r ^= intval((intval($sb[$l >> 24 & 0xff] + $sb[0x100 + ($l >> 16 & 0xff)]) ^
+                  $sb[0x200 + ($l >>  8 & 0xff)]) +
+                  $sb[0x300 + ($l       & 0xff)]);
 
-            // Generating decrypt code:
-            $decrypt_block = '
-                $in = unpack("N*", $in);
-                $l = $in[1];
-                $r = $in[2];
-            ';
+            $r ^= $p[$i - 1];
+            $l ^= intval((intval($sb[$r >> 24 & 0xff] + $sb[0x100 + ($r >> 16 & 0xff)]) ^
+                  $sb[0x200 + ($r >>  8 & 0xff)]) +
+                  $sb[0x300 + ($r       & 0xff)]);
+        }
+        return pack('N*', $r ^ $p[0], $l ^ $p[1]);
+    }
 
-            for ($i = 17; $i > 2; $i-= 2) {
-                $decrypt_block.= '
-                    $l^= ' . $p[$i] . ';
-                    $r^= ($sb_0[$l >> 24 & 0xff]  +
-                          $sb_1[$l >> 16 & 0xff]  ^
-                          $sb_2[$l >>  8 & 0xff]) +
-                          $sb_3[$l       & 0xff];
-
-                    $r^= ' . $p[$i - 1] . ';
-                    $l^= ($sb_0[$r >> 24 & 0xff]  +
-                          $sb_1[$r >> 16 & 0xff]  ^
-                          $sb_2[$r >>  8 & 0xff]) +
-                          $sb_3[$r       & 0xff];
-                ';
+    /**
+     * Setup the performance-optimized function for de/encrypt()
+     *
+     * @see Common\SymmetricKey::_setupInlineCrypt()
+     */
+    protected function setupInlineCrypt(): void
+    {
+        $p = $this->bctx['p'];
+        $init_crypt = '
+            static $sb;
+            if (!$sb) {
+                $sb = $this->bctx["sb"];
             }
-
-            $decrypt_block.= '
-                $in = pack("N*",
-                    $r ^ ' . $p[0] . ',
-                    $l ^ ' . $p[1] . '
-                );
+        ';
+
+        // Generating encrypt code:
+        $encrypt_block = '
+            $in = unpack("N*", $in);
+            $l = $in[1];
+            $r = $in[2];
+        ';
+        for ($i = 0; $i < 16; $i += 2) {
+            $encrypt_block .= '
+                $l^= ' . $p[$i] . ';
+                $r^= intval((intval($sb[$l >> 24 & 0xff] + $sb[0x100 + ($l >> 16 & 0xff)]) ^
+                      $sb[0x200 + ($l >>  8 & 0xff)]) +
+                      $sb[0x300 + ($l       & 0xff)]);
+
+                $r^= ' . $p[$i + 1] . ';
+                $l^= intval((intval($sb[$r >> 24 & 0xff] + $sb[0x100 + ($r >> 16 & 0xff)])  ^
+                      $sb[0x200 + ($r >>  8 & 0xff)]) +
+                      $sb[0x300 + ($r       & 0xff)]);
             ';
-
-            $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
-                array(
-                   'init_crypt'    => $init_crypt,
-                   'init_encrypt'  => '',
-                   'init_decrypt'  => '',
-                   'encrypt_block' => $encrypt_block,
-                   'decrypt_block' => $decrypt_block
-                )
+        }
+        $encrypt_block .= '
+            $in = pack("N*",
+                $r ^ ' . $p[17] . ',
+                $l ^ ' . $p[16] . '
             );
+        ';
+
+         // Generating decrypt code:
+        $decrypt_block = '
+            $in = unpack("N*", $in);
+            $l = $in[1];
+            $r = $in[2];
+        ';
+
+        for ($i = 17; $i > 2; $i -= 2) {
+            $decrypt_block .= '
+                $l^= ' . $p[$i] . ';
+                $r^= intval((intval($sb[$l >> 24 & 0xff] + $sb[$l >> 16 & 0xff]) ^
+                      $sb[0x200 + ($l >>  8 & 0xff)]) +
+                      $sb[0x300 + ($l       & 0xff)]);
+
+                $r^= ' . $p[$i - 1] . ';
+                $l^= intval((intval($sb[$r >> 24 & 0xff] + $sb[$r >> 16 & 0xff]) ^
+                      $sb[0x200 + ($r >>  8 & 0xff)]) +
+                      $sb[0x300 + ($r       & 0xff)]);
+            ';
         }
-        $this->inline_crypt = $lambda_functions[$code_hash];
+
+        $decrypt_block .= '
+            $in = pack("N*",
+                $r ^ ' . $p[0] . ',
+                $l ^ ' . $p[1] . '
+            );
+        ';
+
+        $this->inline_crypt = $this->createInlineCryptFunction(
+            [
+               'init_crypt'    => $init_crypt,
+               'init_encrypt'  => '',
+               'init_decrypt'  => '',
+               'encrypt_block' => $encrypt_block,
+               'decrypt_block' => $decrypt_block,
+            ]
+        );
     }
 }
diff --git a/phpseclib/Crypt/ChaCha20.php b/phpseclib/Crypt/ChaCha20.php
new file mode 100644
index 000000000..c19eda42f
--- /dev/null
+++ b/phpseclib/Crypt/ChaCha20.php
@@ -0,0 +1,788 @@
+<?php
+
+/**
+ * Pure-PHP implementation of ChaCha20.
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2019 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt;
+
+use phpseclib3\Exception\BadDecryptionException;
+use phpseclib3\Exception\InsufficientSetupException;
+use phpseclib3\Exception\LengthException;
+use phpseclib3\Exception\UnexpectedValueException;
+
+/**
+ * Pure-PHP implementation of ChaCha20.
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class ChaCha20 extends Salsa20
+{
+    /**
+     * The OpenSSL specific name of the cipher
+     *
+     * @var string
+     */
+    protected $cipher_name_openssl = 'chacha20';
+
+    /**
+     * Test for engine validity
+     *
+     * This is mainly just a wrapper to set things up for \phpseclib3\Crypt\Common\SymmetricKey::isValidEngine()
+     *
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
+     */
+    protected function isValidEngineHelper(int $engine): bool
+    {
+        switch ($engine) {
+            case self::ENGINE_LIBSODIUM:
+                // PHP 7.2.0 (30 Nov 2017) added support for libsodium
+
+                // we could probably make it so that if $this->counter == 0 then the first block would be done with either OpenSSL
+                // or PHP and then subsequent blocks would then be done with libsodium but idk - it's not a high priority atm
+
+                // we could also make it so that if $this->counter == 0 and $this->continuousBuffer then do the first string
+                // with libsodium and subsequent strings with openssl or pure-PHP but again not a high priority
+                return function_exists('sodium_crypto_aead_chacha20poly1305_ietf_encrypt') &&
+                       $this->key_length == 32 &&
+                       (($this->usePoly1305 && !isset($this->poly1305Key) && $this->counter == 0) || $this->counter == 1) &&
+                       !$this->continuousBuffer;
+            case self::ENGINE_OPENSSL:
+                // OpenSSL 1.1.0 (released 25 Aug 2016) added support for chacha20.
+                // PHP didn't support OpenSSL 1.1.0 until 7.0.19 (11 May 2017)
+
+                // if you attempt to provide openssl with a 128 bit key (as opposed to a 256 bit key) openssl will null
+                // pad the key to 256 bits and still use the expansion constant for 256-bit keys. the fact that
+                // openssl treats the IV as both the counter and nonce, however, let's us use openssl in continuous mode
+                // whereas libsodium does not
+                if ($this->key_length != 32) {
+                    return false;
+                }
+        }
+
+        return parent::isValidEngineHelper($engine);
+    }
+
+    /**
+     * Encrypts a message.
+     *
+     * @return string $ciphertext
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
+     * @see self::crypt()
+     */
+    public function encrypt(string $plaintext): string
+    {
+        $this->setup();
+
+        if ($this->engine == self::ENGINE_LIBSODIUM) {
+            return $this->encrypt_with_libsodium($plaintext);
+        }
+
+        return parent::encrypt($plaintext);
+    }
+
+    /**
+     * Decrypts a message.
+     *
+     * $this->decrypt($this->encrypt($plaintext)) == $this->encrypt($this->encrypt($plaintext)).
+     * At least if the continuous buffer is disabled.
+     *
+     * @return string $plaintext
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
+     * @see self::crypt()
+     */
+    public function decrypt(string $ciphertext): string
+    {
+        $this->setup();
+
+        if ($this->engine == self::ENGINE_LIBSODIUM) {
+            return $this->decrypt_with_libsodium($ciphertext);
+        }
+
+        return parent::decrypt($ciphertext);
+    }
+
+    /**
+     * Encrypts a message with libsodium
+     *
+     * @return string $text
+     * @see self::encrypt()
+     */
+    private function encrypt_with_libsodium(string $plaintext): string
+    {
+        $params = [$plaintext, $this->aad, $this->nonce, $this->key];
+        $ciphertext = strlen($this->nonce) == 8 ?
+            sodium_crypto_aead_chacha20poly1305_encrypt(...$params) :
+            sodium_crypto_aead_chacha20poly1305_ietf_encrypt(...$params);
+        if (!$this->usePoly1305) {
+            return substr($ciphertext, 0, strlen($plaintext));
+        }
+
+        $newciphertext = substr($ciphertext, 0, strlen($plaintext));
+
+        $this->newtag = $this->usingGeneratedPoly1305Key && strlen($this->nonce) == 12 ?
+            substr($ciphertext, strlen($plaintext)) :
+            $this->poly1305($newciphertext);
+
+        return $newciphertext;
+    }
+
+    /**
+     * Decrypts a message with libsodium
+     *
+     * @return string $text
+     * @see self::decrypt()
+     */
+    private function decrypt_with_libsodium(string $ciphertext): string
+    {
+        $params = [$ciphertext, $this->aad, $this->nonce, $this->key];
+
+        if (isset($this->poly1305Key)) {
+            if ($this->oldtag === false) {
+                throw new InsufficientSetupException('Authentication Tag has not been set');
+            }
+            if ($this->usingGeneratedPoly1305Key && strlen($this->nonce) == 12) {
+                $plaintext = sodium_crypto_aead_chacha20poly1305_ietf_decrypt(...$params);
+                $this->oldtag = false;
+                if ($plaintext === false) {
+                    throw new BadDecryptionException('Derived authentication tag and supplied authentication tag do not match');
+                }
+                return $plaintext;
+            }
+            $newtag = $this->poly1305($ciphertext);
+            if ($this->oldtag != substr($newtag, 0, strlen($this->oldtag))) {
+                $this->oldtag = false;
+                throw new BadDecryptionException('Derived authentication tag and supplied authentication tag do not match');
+            }
+            $this->oldtag = false;
+        }
+
+        $plaintext = strlen($this->nonce) == 8 ?
+            sodium_crypto_aead_chacha20poly1305_encrypt(...$params) :
+            sodium_crypto_aead_chacha20poly1305_ietf_encrypt(...$params);
+
+        return substr($plaintext, 0, strlen($ciphertext));
+    }
+
+    /**
+     * Sets the nonce.
+     */
+    public function setNonce(string $nonce): void
+    {
+        if (!is_string($nonce)) {
+            throw new UnexpectedValueException('The nonce should be a string');
+        }
+
+        /*
+          from https://tools.ietf.org/html/rfc7539#page-7
+
+          "Note also that the original ChaCha had a 64-bit nonce and 64-bit
+           block count.  We have modified this here to be more consistent with
+           recommendations in Section 3.2 of [RFC5116]."
+         */
+        switch (strlen($nonce)) {
+            case 8:  // 64 bits
+            case 12: // 96 bits
+                break;
+            default:
+                throw new LengthException('Nonce of size ' . strlen($nonce) . ' not supported by this algorithm. Only 64-bit nonces or 96-bit nonces are supported');
+        }
+
+        $this->nonce = $nonce;
+        $this->changed = true;
+        $this->setEngine();
+    }
+
+    /**
+     * Setup the self::ENGINE_INTERNAL $engine
+     *
+     * (re)init, if necessary, the internal cipher $engine
+     *
+     * _setup() will be called each time if $changed === true
+     * typically this happens when using one or more of following public methods:
+     *
+     * - setKey()
+     *
+     * - setNonce()
+     *
+     * - First run of encrypt() / decrypt() with no init-settings
+     *
+     * @see self::setKey()
+     * @see self::setNonce()
+     * @see self::disableContinuousBuffer()
+     */
+    protected function setup(): void
+    {
+        if (!$this->changed) {
+            return;
+        }
+
+        $this->enbuffer = $this->debuffer = ['ciphertext' => '', 'counter' => $this->counter];
+
+        $this->changed = $this->nonIVChanged = false;
+
+        if ($this->nonce === false) {
+            throw new InsufficientSetupException('No nonce has been defined');
+        }
+
+        if ($this->key === false) {
+            throw new InsufficientSetupException('No key has been defined');
+        }
+
+        if ($this->usePoly1305 && !isset($this->poly1305Key)) {
+            $this->usingGeneratedPoly1305Key = true;
+            if ($this->engine == self::ENGINE_LIBSODIUM) {
+                return;
+            }
+            $this->createPoly1305Key();
+        }
+
+        $key = $this->key;
+        if (strlen($key) == 16) {
+            $constant = 'expand 16-byte k';
+            $key .= $key;
+        } else {
+            $constant = 'expand 32-byte k';
+        }
+
+        $this->p1 = $constant . $key;
+        $this->p2 = $this->nonce;
+        if (strlen($this->nonce) == 8) {
+            $this->p2 = "\0\0\0\0" . $this->p2;
+        }
+    }
+
+    /**
+     * The quarterround function
+     */
+    protected static function quarterRound(int &$a, int &$b, int &$c, int &$d): void
+    {
+        // in https://datatracker.ietf.org/doc/html/rfc7539#section-2.1 the addition,
+        // xor'ing and rotation are all on the same line so i'm keeping it on the same
+        // line here as well
+        // @codingStandardsIgnoreStart
+        $a+= $b; $d = self::leftRotate(intval($d) ^ intval($a), 16);
+        $c+= $d; $b = self::leftRotate(intval($b) ^ intval($c), 12);
+        $a+= $b; $d = self::leftRotate(intval($d) ^ intval($a), 8);
+        $c+= $d; $b = self::leftRotate(intval($b) ^ intval($c), 7);
+        // @codingStandardsIgnoreEnd
+    }
+
+    /**
+     * The doubleround function
+     *
+     * @param int $x0 (by reference)
+     * @param int $x1 (by reference)
+     * @param int $x2 (by reference)
+     * @param int $x3 (by reference)
+     * @param int $x4 (by reference)
+     * @param int $x5 (by reference)
+     * @param int $x6 (by reference)
+     * @param int $x7 (by reference)
+     * @param int $x8 (by reference)
+     * @param int $x9 (by reference)
+     * @param int $x10 (by reference)
+     * @param int $x11 (by reference)
+     * @param int $x12 (by reference)
+     * @param int $x13 (by reference)
+     * @param int $x14 (by reference)
+     * @param int $x15 (by reference)
+     */
+    protected static function doubleRound(int &$x0, int &$x1, int &$x2, int &$x3, int &$x4, int &$x5, int &$x6, int &$x7, int &$x8, int &$x9, int &$x10, int &$x11, int &$x12, int &$x13, int &$x14, int &$x15): void
+    {
+        // columnRound
+        static::quarterRound($x0, $x4, $x8, $x12);
+        static::quarterRound($x1, $x5, $x9, $x13);
+        static::quarterRound($x2, $x6, $x10, $x14);
+        static::quarterRound($x3, $x7, $x11, $x15);
+        // rowRound
+        static::quarterRound($x0, $x5, $x10, $x15);
+        static::quarterRound($x1, $x6, $x11, $x12);
+        static::quarterRound($x2, $x7, $x8, $x13);
+        static::quarterRound($x3, $x4, $x9, $x14);
+    }
+
+    /**
+     * The Salsa20 hash function function
+     *
+     * On my laptop this loop unrolled / function dereferenced version of parent::salsa20 encrypts 1mb of text in
+     * 0.65s vs the 0.85s that it takes with the parent method.
+     *
+     * If we were free to assume that the host OS would always be 64-bits then the if condition in leftRotate could
+     * be eliminated and we could knock this done to 0.60s.
+     *
+     * For comparison purposes, RC4 takes 0.16s and AES in CTR mode with the Eval engine takes 0.48s.
+     * AES in CTR mode with the PHP engine takes 1.19s. Salsa20 / ChaCha20 do not benefit as much from the Eval
+     * approach due to the fact that there are a lot less variables to de-reference, fewer loops to unroll, etc
+     */
+    protected static function salsa20(string $x)
+    {
+        [, $x0, $x1, $x2, $x3, $x4, $x5, $x6, $x7, $x8, $x9, $x10, $x11, $x12, $x13, $x14, $x15] = unpack('V*', $x);
+        $z0 = $x0;
+        $z1 = $x1;
+        $z2 = $x2;
+        $z3 = $x3;
+        $z4 = $x4;
+        $z5 = $x5;
+        $z6 = $x6;
+        $z7 = $x7;
+        $z8 = $x8;
+        $z9 = $x9;
+        $z10 = $x10;
+        $z11 = $x11;
+        $z12 = $x12;
+        $z13 = $x13;
+        $z14 = $x14;
+        $z15 = $x15;
+
+        // @codingStandardsIgnoreStart
+        // columnRound
+        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 16);
+        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 12);
+        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 8);
+        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 7);
+
+        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 16);
+        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 12);
+        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 8);
+        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 7);
+
+        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 16);
+        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 12);
+        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 8);
+        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 7);
+
+        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 16);
+        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 12);
+        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 8);
+        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 7);
+
+        // rowRound
+        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 16);
+        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 12);
+        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 8);
+        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 7);
+
+        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 16);
+        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 12);
+        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 8);
+        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 7);
+
+        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 16);
+        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 12);
+        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 8);
+        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 7);
+
+        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 16);
+        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 12);
+        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 8);
+        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 7);
+
+        // columnRound
+        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 16);
+        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 12);
+        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 8);
+        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 7);
+
+        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 16);
+        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 12);
+        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 8);
+        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 7);
+
+        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 16);
+        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 12);
+        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 8);
+        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 7);
+
+        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 16);
+        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 12);
+        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 8);
+        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 7);
+
+        // rowRound
+        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 16);
+        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 12);
+        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 8);
+        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 7);
+
+        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 16);
+        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 12);
+        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 8);
+        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 7);
+
+        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 16);
+        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 12);
+        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 8);
+        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 7);
+
+        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 16);
+        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 12);
+        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 8);
+        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 7);
+
+        // columnRound
+        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 16);
+        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 12);
+        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 8);
+        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 7);
+
+        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 16);
+        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 12);
+        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 8);
+        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 7);
+
+        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 16);
+        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 12);
+        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 8);
+        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 7);
+
+        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 16);
+        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 12);
+        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 8);
+        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 7);
+
+        // rowRound
+        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 16);
+        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 12);
+        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 8);
+        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 7);
+
+        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 16);
+        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 12);
+        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 8);
+        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 7);
+
+        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 16);
+        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 12);
+        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 8);
+        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 7);
+
+        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 16);
+        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 12);
+        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 8);
+        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 7);
+
+        // columnRound
+        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 16);
+        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 12);
+        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 8);
+        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 7);
+
+        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 16);
+        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 12);
+        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 8);
+        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 7);
+
+        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 16);
+        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 12);
+        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 8);
+        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 7);
+
+        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 16);
+        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 12);
+        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 8);
+        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 7);
+
+        // rowRound
+        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 16);
+        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 12);
+        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 8);
+        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 7);
+
+        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 16);
+        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 12);
+        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 8);
+        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 7);
+
+        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 16);
+        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 12);
+        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 8);
+        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 7);
+
+        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 16);
+        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 12);
+        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 8);
+        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 7);
+
+        // columnRound
+        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 16);
+        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 12);
+        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 8);
+        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 7);
+
+        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 16);
+        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 12);
+        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 8);
+        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 7);
+
+        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 16);
+        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 12);
+        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 8);
+        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 7);
+
+        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 16);
+        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 12);
+        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 8);
+        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 7);
+
+        // rowRound
+        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 16);
+        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 12);
+        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 8);
+        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 7);
+
+        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 16);
+        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 12);
+        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 8);
+        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 7);
+
+        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 16);
+        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 12);
+        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 8);
+        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 7);
+
+        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 16);
+        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 12);
+        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 8);
+        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 7);
+
+        // columnRound
+        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 16);
+        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 12);
+        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 8);
+        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 7);
+
+        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 16);
+        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 12);
+        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 8);
+        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 7);
+
+        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 16);
+        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 12);
+        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 8);
+        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 7);
+
+        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 16);
+        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 12);
+        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 8);
+        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 7);
+
+        // rowRound
+        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 16);
+        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 12);
+        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 8);
+        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 7);
+
+        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 16);
+        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 12);
+        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 8);
+        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 7);
+
+        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 16);
+        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 12);
+        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 8);
+        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 7);
+
+        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 16);
+        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 12);
+        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 8);
+        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 7);
+
+        // columnRound
+        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 16);
+        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 12);
+        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 8);
+        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 7);
+
+        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 16);
+        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 12);
+        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 8);
+        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 7);
+
+        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 16);
+        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 12);
+        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 8);
+        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 7);
+
+        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 16);
+        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 12);
+        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 8);
+        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 7);
+
+        // rowRound
+        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 16);
+        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 12);
+        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 8);
+        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 7);
+
+        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 16);
+        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 12);
+        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 8);
+        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 7);
+
+        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 16);
+        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 12);
+        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 8);
+        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 7);
+
+        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 16);
+        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 12);
+        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 8);
+        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 7);
+
+        // columnRound
+        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 16);
+        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 12);
+        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 8);
+        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 7);
+
+        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 16);
+        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 12);
+        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 8);
+        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 7);
+
+        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 16);
+        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 12);
+        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 8);
+        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 7);
+
+        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 16);
+        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 12);
+        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 8);
+        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 7);
+
+        // rowRound
+        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 16);
+        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 12);
+        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 8);
+        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 7);
+
+        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 16);
+        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 12);
+        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 8);
+        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 7);
+
+        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 16);
+        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 12);
+        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 8);
+        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 7);
+
+        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 16);
+        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 12);
+        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 8);
+        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 7);
+
+        // columnRound
+        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 16);
+        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 12);
+        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 8);
+        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 7);
+
+        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 16);
+        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 12);
+        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 8);
+        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 7);
+
+        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 16);
+        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 12);
+        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 8);
+        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 7);
+
+        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 16);
+        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 12);
+        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 8);
+        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 7);
+
+        // rowRound
+        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 16);
+        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 12);
+        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 8);
+        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 7);
+
+        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 16);
+        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 12);
+        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 8);
+        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 7);
+
+        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 16);
+        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 12);
+        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 8);
+        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 7);
+
+        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 16);
+        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 12);
+        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 8);
+        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 7);
+
+        // columnRound
+        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 16);
+        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 12);
+        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 8);
+        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 7);
+
+        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 16);
+        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 12);
+        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 8);
+        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 7);
+
+        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 16);
+        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 12);
+        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 8);
+        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 7);
+
+        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 16);
+        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 12);
+        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 8);
+        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 7);
+
+        // rowRound
+        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 16);
+        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 12);
+        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 8);
+        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 7);
+
+        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 16);
+        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 12);
+        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 8);
+        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 7);
+
+        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 16);
+        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 12);
+        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 8);
+        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 7);
+
+        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 16);
+        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 12);
+        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 8);
+        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 7);
+        // @codingStandardsIgnoreEnd
+
+        $x0 += $z0;
+        $x1 += $z1;
+        $x2 += $z2;
+        $x3 += $z3;
+        $x4 += $z4;
+        $x5 += $z5;
+        $x6 += $z6;
+        $x7 += $z7;
+        $x8 += $z8;
+        $x9 += $z9;
+        $x10 += $z10;
+        $x11 += $z11;
+        $x12 += $z12;
+        $x13 += $z13;
+        $x14 += $z14;
+        $x15 += $z15;
+
+        return pack('V*', $x0, $x1, $x2, $x3, $x4, $x5, $x6, $x7, $x8, $x9, $x10, $x11, $x12, $x13, $x14, $x15);
+    }
+}
diff --git a/phpseclib/Crypt/Common/AsymmetricKey.php b/phpseclib/Crypt/Common/AsymmetricKey.php
new file mode 100644
index 000000000..b2bfec28e
--- /dev/null
+++ b/phpseclib/Crypt/Common/AsymmetricKey.php
@@ -0,0 +1,532 @@
+<?php
+
+/**
+ * Base Class for all asymmetric key ciphers
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\Common;
+
+use phpseclib3\Crypt\Hash;
+use phpseclib3\Exception\NoKeyLoadedException;
+use phpseclib3\Exception\UnsupportedFormatException;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * Base Class for all asymmetric cipher classes
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class AsymmetricKey
+{
+    /**
+     * Precomputed Zero
+     *
+     * @var BigInteger
+     */
+    protected static $zero;
+
+    /**
+     * Precomputed One
+     *
+     * @var BigInteger
+     */
+    protected static $one;
+
+    /**
+     * Format of the loaded key
+     *
+     * @var string
+     */
+    protected $format;
+
+    /**
+     * Hash function
+     *
+     * @var Hash
+     */
+    protected $hash;
+
+    /**
+     * HMAC function
+     *
+     * @var Hash
+     */
+    private $hmac;
+
+    /**
+     * Supported plugins (lower case)
+     *
+     * @see self::initialize_static_variables()
+     * @var array
+     */
+    private static $plugins = [];
+
+    /**
+     * Invisible plugins
+     *
+     * @see self::initialize_static_variables()
+     * @var array
+     */
+    private static $invisiblePlugins = [];
+
+    /**
+     * Available Engines
+     *
+     * @var boolean[]
+     */
+    protected static $engines = [];
+
+    /**
+     * Key Comment
+     *
+     * @var null|string
+     */
+    private $comment;
+
+    abstract public function toString(string $type, array $options = []): array|string;
+
+    /**
+     * The constructor
+     */
+    protected function __construct()
+    {
+        self::initialize_static_variables();
+
+        $this->hash = new Hash('sha256');
+        $this->hmac = new Hash('sha256');
+    }
+
+    /**
+     * Initialize static variables
+     */
+    protected static function initialize_static_variables(): void
+    {
+        if (!isset(self::$zero)) {
+            self::$zero = new BigInteger(0);
+            self::$one = new BigInteger(1);
+        }
+
+        self::loadPlugins('Keys');
+        if (static::ALGORITHM != 'RSA' && static::ALGORITHM != 'DH') {
+            self::loadPlugins('Signature');
+        }
+    }
+
+    /**
+     * Load the key
+     *
+     * @param string|array $key
+     * @return PublicKey|PrivateKey
+     */
+    public static function load($key, ?string $password = null): AsymmetricKey
+    {
+        self::initialize_static_variables();
+
+        $class = new \ReflectionClass(static::class);
+        if ($class->isFinal()) {
+            throw new \RuntimeException('load() should not be called from final classes (' . static::class . ')');
+        }
+
+        $components = false;
+        foreach (self::$plugins[static::ALGORITHM]['Keys'] as $format) {
+            if (isset(self::$invisiblePlugins[static::ALGORITHM]) && in_array($format, self::$invisiblePlugins[static::ALGORITHM])) {
+                continue;
+            }
+            try {
+                $components = $format::load($key, $password);
+            } catch (\Exception $e) {
+                $components = false;
+            }
+            if ($components !== false) {
+                break;
+            }
+        }
+
+        if ($components === false) {
+            throw new NoKeyLoadedException('Unable to read key');
+        }
+
+        $components['format'] = $format;
+        $components['secret'] ??= '';
+        $comment = $components['comment'] ?? null;
+        $new = static::onLoad($components);
+        $new->format = $format;
+        $new->comment = $comment;
+        return $new instanceof PrivateKey ?
+            $new->withPassword($password) :
+            $new;
+    }
+
+    /**
+     * Loads a private key
+     *
+     * @param string|array $key
+     * @param string $password optional
+     */
+    public static function loadPrivateKey($key, string $password = ''): PrivateKey
+    {
+        $key = self::load($key, $password);
+        if (!$key instanceof PrivateKey) {
+            throw new NoKeyLoadedException('The key that was loaded was not a private key');
+        }
+        return $key;
+    }
+
+    /**
+     * Loads a public key
+     *
+     * @param string|array $key
+     */
+    public static function loadPublicKey($key): PublicKey
+    {
+        $key = self::load($key);
+        if (!$key instanceof PublicKey) {
+            throw new NoKeyLoadedException('The key that was loaded was not a public key');
+        }
+        return $key;
+    }
+
+    /**
+     * Loads parameters
+     *
+     * @param string|array $key
+     */
+    public static function loadParameters($key): AsymmetricKey
+    {
+        $key = self::load($key);
+        if (!$key instanceof PrivateKey && !$key instanceof PublicKey) {
+            throw new NoKeyLoadedException('The key that was loaded was not a parameter');
+        }
+        return $key;
+    }
+
+    /**
+     * Load the key, assuming a specific format
+     *
+     * @return static
+     */
+    public static function loadFormat(string $type, string $key, ?string $password = null): AsymmetricKey
+    {
+        self::initialize_static_variables();
+
+        $components = false;
+        $format = strtolower($type);
+        if (isset(self::$plugins[static::ALGORITHM]['Keys'][$format])) {
+            $format = self::$plugins[static::ALGORITHM]['Keys'][$format];
+            $components = $format::load($key, $password);
+        }
+
+        if ($components === false) {
+            throw new NoKeyLoadedException('Unable to read key');
+        }
+
+        $components['format'] = $format;
+        $components['secret'] ??= '';
+
+        $new = static::onLoad($components);
+        $new->format = $format;
+        return $new instanceof PrivateKey ?
+            $new->withPassword($password) :
+            $new;
+    }
+
+    /**
+     * Loads a private key
+     */
+    public static function loadPrivateKeyFormat(string $type, string $key, ?string $password = null): PrivateKey
+    {
+        $key = self::loadFormat($type, $key, $password);
+        if (!$key instanceof PrivateKey) {
+            throw new NoKeyLoadedException('The key that was loaded was not a private key');
+        }
+        return $key;
+    }
+
+    /**
+     * Loads a public key
+     */
+    public static function loadPublicKeyFormat(string $type, string $key): PublicKey
+    {
+        $key = self::loadFormat($type, $key);
+        if (!$key instanceof PublicKey) {
+            throw new NoKeyLoadedException('The key that was loaded was not a public key');
+        }
+        return $key;
+    }
+
+    /**
+     * Loads parameters
+     *
+     * @param string|array $key
+     */
+    public static function loadParametersFormat(string $type, $key): AsymmetricKey
+    {
+        $key = self::loadFormat($type, $key);
+        if (!$key instanceof PrivateKey && !$key instanceof PublicKey) {
+            throw new NoKeyLoadedException('The key that was loaded was not a parameter');
+        }
+        return $key;
+    }
+
+    /**
+     * Validate Plugin
+     *
+     * @param string|null $method optional
+     */
+    protected static function validatePlugin(string $format, string $type, ?string $method = null)
+    {
+        $type = strtolower($type);
+        if (!isset(self::$plugins[static::ALGORITHM][$format][$type])) {
+            throw new UnsupportedFormatException("$type is not a supported format");
+        }
+        $type = self::$plugins[static::ALGORITHM][$format][$type];
+        if (isset($method) && !method_exists($type, $method)) {
+            throw new UnsupportedFormatException("$type does not implement $method");
+        }
+
+        return $type;
+    }
+
+    /**
+     * Load Plugins
+     */
+    private static function loadPlugins(string $format): void
+    {
+        if (!isset(self::$plugins[static::ALGORITHM][$format])) {
+            self::$plugins[static::ALGORITHM][$format] = [];
+            foreach (new \DirectoryIterator(__DIR__ . '/../' . static::ALGORITHM . '/Formats/' . $format . '/') as $file) {
+                if ($file->getExtension() != 'php') {
+                    continue;
+                }
+                $name = $file->getBasename('.php');
+                if ($name[0] == '.') {
+                    continue;
+                }
+                $type = 'phpseclib3\Crypt\\' . static::ALGORITHM . '\\Formats\\' . $format . '\\' . $name;
+                $reflect = new \ReflectionClass($type);
+                if ($reflect->isTrait()) {
+                    continue;
+                }
+                self::$plugins[static::ALGORITHM][$format][strtolower($name)] = $type;
+                if ($reflect->hasConstant('IS_INVISIBLE')) {
+                    self::$invisiblePlugins[static::ALGORITHM][] = $type;
+                }
+            }
+        }
+    }
+
+    /**
+     * Returns a list of supported formats.
+     */
+    public static function getSupportedKeyFormats(): array
+    {
+        self::initialize_static_variables();
+
+        return self::$plugins[static::ALGORITHM]['Keys'];
+    }
+
+    /**
+     * Add a fileformat plugin
+     *
+     * The plugin needs to either already be loaded or be auto-loadable.
+     * Loading a plugin whose shortname overwrite an existing shortname will overwrite the old plugin.
+     *
+     * @see self::load()
+     */
+    public static function addFileFormat(string $fullname): void
+    {
+        self::initialize_static_variables();
+
+        if (class_exists($fullname)) {
+            $meta = new \ReflectionClass($fullname);
+            $shortname = $meta->getShortName();
+            self::$plugins[static::ALGORITHM]['Keys'][strtolower($shortname)] = $fullname;
+            if ($meta->hasConstant('IS_INVISIBLE')) {
+                self::$invisiblePlugins[static::ALGORITHM][] = strtolower($shortname);
+            }
+        }
+    }
+
+    /**
+     * Returns the format of the loaded key.
+     *
+     * If the key that was loaded wasn't in a valid or if the key was auto-generated
+     * with RSA::createKey() then this will throw an exception.
+     *
+     * @see self::load()
+     */
+    public function getLoadedFormat(): string
+    {
+        if (empty($this->format)) {
+            throw new NoKeyLoadedException('This key was created with createKey - it was not loaded with load. Therefore there is no "loaded format"');
+        }
+
+        $meta = new \ReflectionClass($this->format);
+        return $meta->getShortName();
+    }
+
+    /**
+     * Returns the key's comment
+     *
+     * Not all key formats support comments. If you want to set a comment use toString()
+     */
+    public function getComment(): ?string
+    {
+        return $this->comment;
+    }
+
+    /**
+     * Tests engine validity
+     */
+    public static function useBestEngine(): array
+    {
+        static::$engines = [
+            'PHP' => true,
+            'OpenSSL' => extension_loaded('openssl'),
+            // this test can be satisfied by either of the following:
+            // http://php.net/manual/en/book.sodium.php
+            // https://github.com/paragonie/sodium_compat
+            'libsodium' => function_exists('sodium_crypto_sign_keypair'),
+        ];
+
+        return static::$engines;
+    }
+
+    /**
+     * Flag to use internal engine only (useful for unit testing)
+     */
+    public static function useInternalEngine(): void
+    {
+        static::$engines = [
+            'PHP' => true,
+            'OpenSSL' => false,
+            'libsodium' => false,
+        ];
+    }
+
+    /**
+     * __toString() magic method
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->toString('PKCS8');
+    }
+
+    /**
+     * Determines which hashing function should be used
+     */
+    public function withHash(string $hash): AsymmetricKey
+    {
+        $new = clone $this;
+
+        $new->hash = new Hash($hash);
+        $new->hmac = new Hash($hash);
+
+        return $new;
+    }
+
+    /**
+     * Returns the hash algorithm currently being used
+     */
+    public function getHash(): Hash
+    {
+        return clone $this->hash;
+    }
+
+    /**
+     * Compute the pseudorandom k for signature generation,
+     * using the process specified for deterministic DSA.
+     *
+     * @return string
+     */
+    protected function computek(string $h1)
+    {
+        $v = str_repeat("\1", strlen($h1));
+
+        $k = str_repeat("\0", strlen($h1));
+
+        $x = $this->int2octets($this->x);
+        $h1 = $this->bits2octets($h1);
+
+        $this->hmac->setKey($k);
+        $k = $this->hmac->hash($v . "\0" . $x . $h1);
+        $this->hmac->setKey($k);
+        $v = $this->hmac->hash($v);
+        $k = $this->hmac->hash($v . "\1" . $x . $h1);
+        $this->hmac->setKey($k);
+        $v = $this->hmac->hash($v);
+
+        $qlen = $this->q->getLengthInBytes();
+
+        while (true) {
+            $t = '';
+            while (strlen($t) < $qlen) {
+                $v = $this->hmac->hash($v);
+                $t = $t . $v;
+            }
+            $k = $this->bits2int($t);
+
+            if (!$k->equals(self::$zero) && $k->compare($this->q) < 0) {
+                break;
+            }
+            $k = $this->hmac->hash($v . "\0");
+            $this->hmac->setKey($k);
+            $v = $this->hmac->hash($v);
+        }
+
+        return $k;
+    }
+
+    /**
+     * Integer to Octet String
+     */
+    private function int2octets(BigInteger $v): string
+    {
+        $out = $v->toBytes();
+        $rolen = $this->q->getLengthInBytes();
+        if (strlen($out) < $rolen) {
+            return str_pad($out, $rolen, "\0", STR_PAD_LEFT);
+        } elseif (strlen($out) > $rolen) {
+            return substr($out, -$rolen);
+        } else {
+            return $out;
+        }
+    }
+
+    /**
+     * Bit String to Integer
+     */
+    protected function bits2int(string $in): BigInteger
+    {
+        $v = new BigInteger($in, 256);
+        $vlen = strlen($in) << 3;
+        $qlen = $this->q->getLength();
+        if ($vlen > $qlen) {
+            return $v->bitwise_rightShift($vlen - $qlen);
+        }
+        return $v;
+    }
+
+    /**
+     * Bit String to Octet String
+     */
+    private function bits2octets(string $in): string
+    {
+        $z1 = $this->bits2int($in);
+        $z2 = $z1->subtract($this->q);
+        return $z2->compare(self::$zero) < 0 ?
+            $this->int2octets($z1) :
+            $this->int2octets($z2);
+    }
+}
diff --git a/phpseclib/Crypt/Common/BlockCipher.php b/phpseclib/Crypt/Common/BlockCipher.php
new file mode 100644
index 000000000..2c6858615
--- /dev/null
+++ b/phpseclib/Crypt/Common/BlockCipher.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Base Class for all block ciphers
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @author    Hans-Juergen Petrich <petrich@tronic-media.com>
+ * @copyright 2007 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\Common;
+
+/**
+ * Base Class for all block cipher classes
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class BlockCipher extends SymmetricKey
+{
+}
diff --git a/phpseclib/Crypt/Common/Formats/Keys/JWK.php b/phpseclib/Crypt/Common/Formats/Keys/JWK.php
new file mode 100644
index 000000000..4aa7d5bee
--- /dev/null
+++ b/phpseclib/Crypt/Common/Formats/Keys/JWK.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * JSON Web Key (RFC7517) Handler
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\Common\Formats\Keys;
+
+use phpseclib3\Common\Functions\Strings;
+
+/**
+ * JSON Web Key Formatted Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class JWK
+{
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param string|array $key
+     */
+    protected static function loadHelper($key): \stdClass
+    {
+        if (!Strings::is_stringable($key)) {
+            throw new \UnexpectedValueException('Key should be a string - not a ' . gettype($key));
+        }
+
+        $key = preg_replace('#\s#', '', $key); // remove whitespace
+
+        $key = json_decode($key, null, 512, JSON_THROW_ON_ERROR);
+
+        if (isset($key->kty)) {
+            return $key;
+        }
+
+        if (count($key->keys) != 1) {
+            throw new \RuntimeException('Although the JWK key format supports multiple keys phpseclib does not');
+        }
+
+        return $key->keys[0];
+    }
+
+    /**
+     * Wrap a key appropriately
+     */
+    protected static function wrapKey(array $key, array $options): string
+    {
+        return json_encode(['keys' => [$key + $options]]);
+    }
+}
diff --git a/phpseclib/Crypt/Common/Formats/Keys/OpenSSH.php b/phpseclib/Crypt/Common/Formats/Keys/OpenSSH.php
new file mode 100644
index 000000000..4bbeffe11
--- /dev/null
+++ b/phpseclib/Crypt/Common/Formats/Keys/OpenSSH.php
@@ -0,0 +1,217 @@
+<?php
+
+/**
+ * OpenSSH Key Handler
+ *
+ * PHP version 5
+ *
+ * Place in $HOME/.ssh/authorized_keys
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\Common\Formats\Keys;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\AES;
+use phpseclib3\Crypt\Random;
+use phpseclib3\Exception\BadDecryptionException;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Exception\UnexpectedValueException;
+
+/**
+ * OpenSSH Formatted RSA Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class OpenSSH
+{
+    /**
+     * Default comment
+     *
+     * @var string
+     */
+    protected static $comment = 'phpseclib-generated-key';
+
+    /**
+     * Binary key flag
+     *
+     * @var bool
+     */
+    protected static $binary = false;
+
+    /**
+     * Sets the default comment
+     */
+    public static function setComment(string $comment): void
+    {
+        self::$comment = str_replace(["\r", "\n"], '', $comment);
+    }
+
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * $type can be either ssh-dss or ssh-rsa
+     *
+     * @param string|array $key
+     */
+    public static function load($key, ?string $password = null): array
+    {
+        if (!Strings::is_stringable($key)) {
+            throw new UnexpectedValueException('Key should be a string - not a ' . gettype($key));
+        }
+
+        // key format is described here:
+        // https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL.key?annotate=HEAD
+
+        if (str_contains($key, 'BEGIN OPENSSH PRIVATE KEY')) {
+            $key = preg_replace('#(?:^-.*?-[\r\n]*$)|\s#ms', '', $key);
+            $key = Strings::base64_decode($key);
+            $magic = Strings::shift($key, 15);
+            if ($magic != "openssh-key-v1\0") {
+                throw new RuntimeException('Expected openssh-key-v1');
+            }
+            [$ciphername, $kdfname, $kdfoptions, $numKeys] = Strings::unpackSSH2('sssN', $key);
+            if ($numKeys != 1) {
+                // if we wanted to support multiple keys we could update PublicKeyLoader to preview what the # of keys
+                // would be; it'd then call Common\Keys\OpenSSH.php::load() and get the paddedKey. it'd then pass
+                // that to the appropriate key loading parser $numKey times or something
+                throw new RuntimeException('Although the OpenSSH private key format supports multiple keys phpseclib does not');
+            }
+
+            switch ($ciphername) {
+                case 'none':
+                    break;
+                case 'aes256-ctr':
+                    if ($kdfname != 'bcrypt') {
+                        throw new RuntimeException('Only the bcrypt kdf is supported (' . $kdfname . ' encountered)');
+                    }
+                    [$salt, $rounds] = Strings::unpackSSH2('sN', $kdfoptions);
+                    $crypto = new AES('ctr');
+                    //$crypto->setKeyLength(256);
+                    //$crypto->disablePadding();
+                    $crypto->setPassword($password, 'bcrypt', $salt, $rounds, 32);
+                    break;
+                default:
+                    throw new RuntimeException('The only supported ciphers are: none, aes256-ctr (' . $ciphername . ' is being used)');
+            }
+
+            [$publicKey, $paddedKey] = Strings::unpackSSH2('ss', $key);
+            [$type] = Strings::unpackSSH2('s', $publicKey);
+            if (isset($crypto)) {
+                $paddedKey = $crypto->decrypt($paddedKey);
+            }
+            [$checkint1, $checkint2] = Strings::unpackSSH2('NN', $paddedKey);
+            // any leftover bytes in $paddedKey are for padding? but they should be sequential bytes. eg. 1, 2, 3, etc.
+            if ($checkint1 != $checkint2) {
+                if (isset($crypto)) {
+                    throw new BadDecryptionException('Unable to decrypt key - please verify the password you are using');
+                }
+                throw new RuntimeException("The two checkints do not match ($checkint1 vs. $checkint2)");
+            }
+            self::checkType($type);
+
+            return compact('type', 'publicKey', 'paddedKey');
+        }
+
+        $parts = explode(' ', $key, 3);
+
+        if (!isset($parts[1])) {
+            $key = base64_decode($parts[0]);
+            $comment = false;
+        } else {
+            $asciiType = $parts[0];
+            self::checkType($parts[0]);
+            $key = base64_decode($parts[1]);
+            $comment = $parts[2] ?? false;
+        }
+        if ($key === false) {
+            throw new UnexpectedValueException('Key should be a string - not a ' . gettype($key));
+        }
+
+        [$type] = Strings::unpackSSH2('s', $key);
+        self::checkType($type);
+        if (isset($asciiType) && $asciiType != $type) {
+            throw new RuntimeException('Two different types of keys are claimed: ' . $asciiType . ' and ' . $type);
+        }
+        if (strlen($key) <= 4) {
+            throw new UnexpectedValueException('Key appears to be malformed');
+        }
+
+        $publicKey = $key;
+
+        return compact('type', 'publicKey', 'comment');
+    }
+
+    /**
+     * Toggle between binary and printable keys
+     *
+     * Printable keys are what are generated by default. These are the ones that go in
+     * $HOME/.ssh/authorized_key.
+     */
+    public static function setBinaryOutput(bool $enabled): void
+    {
+        self::$binary = $enabled;
+    }
+
+    /**
+     * Checks to see if the type is valid
+     */
+    private static function checkType(string $candidate): void
+    {
+        if (!in_array($candidate, static::$types)) {
+            throw new RuntimeException("The key type ($candidate) is not equal to: " . implode(',', static::$types));
+        }
+    }
+
+    /**
+     * Wrap a private key appropriately
+     *
+     * @param string|false $password
+     */
+    protected static function wrapPrivateKey(string $publicKey, string $privateKey, $password, array $options): string
+    {
+        [, $checkint] = unpack('N', Random::string(4));
+
+        $comment = $options['comment'] ?? self::$comment;
+        $paddedKey = Strings::packSSH2('NN', $checkint, $checkint) .
+                     $privateKey .
+                     Strings::packSSH2('s', $comment);
+
+        $usesEncryption = !empty($password) && is_string($password);
+
+        /*
+           from http://tools.ietf.org/html/rfc4253#section-6 :
+
+           Note that the length of the concatenation of 'packet_length',
+           'padding_length', 'payload', and 'random padding' MUST be a multiple
+           of the cipher block size or 8, whichever is larger.
+         */
+        $blockSize = $usesEncryption ? 16 : 8;
+        $paddingLength = (($blockSize - 1) * strlen($paddedKey)) % $blockSize;
+        for ($i = 1; $i <= $paddingLength; $i++) {
+            $paddedKey .= chr($i);
+        }
+        if (!$usesEncryption) {
+            $key = Strings::packSSH2('sssNss', 'none', 'none', '', 1, $publicKey, $paddedKey);
+        } else {
+            $rounds = $options['rounds'] ?? 16;
+            $salt = Random::string(16);
+            $kdfoptions = Strings::packSSH2('sN', $salt, $rounds);
+            $crypto = new AES('ctr');
+            $crypto->setPassword($password, 'bcrypt', $salt, $rounds, 32);
+            $paddedKey = $crypto->encrypt($paddedKey);
+            $key = Strings::packSSH2('sssNss', 'aes256-ctr', 'bcrypt', $kdfoptions, 1, $publicKey, $paddedKey);
+        }
+        $key = "openssh-key-v1\0$key";
+
+        return "-----BEGIN OPENSSH PRIVATE KEY-----\n" .
+               chunk_split(Strings::base64_encode($key), 70, "\n") .
+               "-----END OPENSSH PRIVATE KEY-----\n";
+    }
+}
diff --git a/phpseclib/Crypt/Common/Formats/Keys/PKCS.php b/phpseclib/Crypt/Common/Formats/Keys/PKCS.php
new file mode 100644
index 000000000..170779344
--- /dev/null
+++ b/phpseclib/Crypt/Common/Formats/Keys/PKCS.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * PKCS Formatted Key Handler
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\Common\Formats\Keys;
+
+/**
+ * PKCS1 Formatted Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PKCS
+{
+    /**
+     * Auto-detect the format
+     */
+    public const MODE_ANY = 0;
+    /**
+     * Require base64-encoded PEM's be supplied
+     */
+    public const MODE_PEM = 1;
+    /**
+     * Require raw DER's be supplied
+     */
+    public const MODE_DER = 2;
+    /**#@-*/
+
+    /**
+     * Is the key a base-64 encoded PEM, DER or should it be auto-detected?
+     *
+     * @var int
+     */
+    protected static $format = self::MODE_ANY;
+
+    /**
+     * Require base64-encoded PEM's be supplied
+     */
+    public static function requirePEM(): void
+    {
+        self::$format = self::MODE_PEM;
+    }
+
+    /**
+     * Require raw DER's be supplied
+     */
+    public static function requireDER(): void
+    {
+        self::$format = self::MODE_DER;
+    }
+
+    /**
+     * Accept any format and auto detect the format
+     *
+     * This is the default setting
+     */
+    public static function requireAny(): void
+    {
+        self::$format = self::MODE_ANY;
+    }
+}
diff --git a/phpseclib/Crypt/Common/Formats/Keys/PKCS1.php b/phpseclib/Crypt/Common/Formats/Keys/PKCS1.php
new file mode 100644
index 000000000..7fedf6c04
--- /dev/null
+++ b/phpseclib/Crypt/Common/Formats/Keys/PKCS1.php
@@ -0,0 +1,195 @@
+<?php
+
+/**
+ * PKCS1 Formatted Key Handler
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\Common\Formats\Keys;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\AES;
+use phpseclib3\Crypt\DES;
+use phpseclib3\Crypt\Random;
+use phpseclib3\Crypt\TripleDES;
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\Exception\UnsupportedAlgorithmException;
+use phpseclib3\File\ASN1;
+
+/**
+ * PKCS1 Formatted Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PKCS1 extends PKCS
+{
+    /**
+     * Default encryption algorithm
+     *
+     * @var string
+     */
+    private static $defaultEncryptionAlgorithm = 'AES-128-CBC';
+
+    /**
+     * Sets the default encryption algorithm
+     */
+    public static function setEncryptionAlgorithm(string $algo): void
+    {
+        self::$defaultEncryptionAlgorithm = $algo;
+    }
+
+    /**
+     * Returns the mode constant corresponding to the mode string
+     *
+     * @return int
+     * @throws UnexpectedValueException if the block cipher mode is unsupported
+     */
+    private static function getEncryptionMode(string $mode)
+    {
+        switch ($mode) {
+            case 'CBC':
+            case 'ECB':
+            case 'CFB':
+            case 'OFB':
+            case 'CTR':
+                return $mode;
+        }
+        throw new UnexpectedValueException('Unsupported block cipher mode of operation');
+    }
+
+    /**
+     * Returns a cipher object corresponding to a string
+     *
+     * @return AES|DES|TripleDES
+     * @throws UnexpectedValueException if the encryption algorithm is unsupported
+     */
+    private static function getEncryptionObject(string $algo)
+    {
+        $modes = '(CBC|ECB|CFB|OFB|CTR)';
+        switch (true) {
+            case preg_match("#^AES-(128|192|256)-$modes$#", $algo, $matches):
+                $cipher = new AES(self::getEncryptionMode($matches[2]));
+                $cipher->setKeyLength((int) $matches[1]);
+                return $cipher;
+            case preg_match("#^DES-EDE3-$modes$#", $algo, $matches):
+                return new TripleDES(self::getEncryptionMode($matches[1]));
+            case preg_match("#^DES-$modes$#", $algo, $matches):
+                return new DES(self::getEncryptionMode($matches[1]));
+            default:
+                throw new UnsupportedAlgorithmException($algo . ' is not a supported algorithm');
+        }
+    }
+
+    /**
+     * Generate a symmetric key for PKCS#1 keys
+     */
+    private static function generateSymmetricKey(string $password, string $iv, int $length): string
+    {
+        $symkey = '';
+        $iv = substr($iv, 0, 8);
+        while (strlen($symkey) < $length) {
+            $symkey .= md5($symkey . $password . $iv, true);
+        }
+        return substr($symkey, 0, $length);
+    }
+
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param string|array $key
+     * @return array|string
+     */
+    protected static function load($key, ?string $password = null)
+    {
+        if (!Strings::is_stringable($key)) {
+            throw new UnexpectedValueException('Key should be a string - not a ' . gettype($key));
+        }
+
+        /* Although PKCS#1 proposes a format that public and private keys can use, encrypting them is
+           "outside the scope" of PKCS#1.  PKCS#1 then refers you to PKCS#12 and PKCS#15 if you're wanting to
+           protect private keys, however, that's not what OpenSSL* does.  OpenSSL protects private keys by adding
+           two new "fields" to the key - DEK-Info and Proc-Type.  These fields are discussed here:
+
+           http://tools.ietf.org/html/rfc1421#section-4.6.1.1
+           http://tools.ietf.org/html/rfc1421#section-4.6.1.3
+
+           DES-EDE3-CBC as an algorithm, however, is not discussed anywhere, near as I can tell.
+           DES-CBC and DES-EDE are discussed in RFC1423, however, DES-EDE3-CBC isn't, nor is its key derivation
+           function.  As is, the definitive authority on this encoding scheme isn't the IETF but rather OpenSSL's
+           own implementation.  ie. the implementation *is* the standard and any bugs that may exist in that
+           implementation are part of the standard, as well.
+
+           * OpenSSL is the de facto standard.  It's utilized by OpenSSH and other projects */
+        if (preg_match('#DEK-Info: (.+),(.+)#', $key, $matches)) {
+            $iv = Strings::hex2bin(trim($matches[2]));
+            // remove the Proc-Type / DEK-Info sections as they're no longer needed
+            $key = preg_replace('#^(?:Proc-Type|DEK-Info): .*#m', '', $key);
+            $ciphertext = ASN1::extractBER($key);
+            if ($ciphertext === false) {
+                $ciphertext = $key;
+            }
+            $crypto = self::getEncryptionObject($matches[1]);
+            $crypto->setKey(self::generateSymmetricKey($password, $iv, $crypto->getKeyLength() >> 3));
+            $crypto->setIV($iv);
+            $key = $crypto->decrypt($ciphertext);
+        } else {
+            if (self::$format != self::MODE_DER) {
+                $decoded = ASN1::extractBER($key);
+                if ($decoded !== false) {
+                    $key = $decoded;
+                } elseif (self::$format == self::MODE_PEM) {
+                    throw new UnexpectedValueException('Expected base64-encoded PEM format but was unable to decode base64 text');
+                }
+            }
+        }
+
+        return $key;
+    }
+
+    /**
+     * Wrap a private key appropriately
+     *
+     * @param string|false $password
+     * @param array $options optional
+     */
+    protected static function wrapPrivateKey(string $key, string $type, $password, array $options = []): string
+    {
+        if (empty($password) || !is_string($password)) {
+            return "-----BEGIN $type PRIVATE KEY-----\r\n" .
+                   chunk_split(Strings::base64_encode($key), 64) .
+                   "-----END $type PRIVATE KEY-----";
+        }
+
+        $encryptionAlgorithm = $options['encryptionAlgorithm'] ?? self::$defaultEncryptionAlgorithm;
+
+        $cipher = self::getEncryptionObject($encryptionAlgorithm);
+        $iv = Random::string($cipher->getBlockLength() >> 3);
+        $cipher->setKey(self::generateSymmetricKey($password, $iv, $cipher->getKeyLength() >> 3));
+        $cipher->setIV($iv);
+        $iv = strtoupper(Strings::bin2hex($iv));
+        return "-----BEGIN $type PRIVATE KEY-----\r\n" .
+               "Proc-Type: 4,ENCRYPTED\r\n" .
+               "DEK-Info: " . $encryptionAlgorithm . ",$iv\r\n" .
+               "\r\n" .
+               chunk_split(Strings::base64_encode($cipher->encrypt($key)), 64) .
+               "-----END $type PRIVATE KEY-----";
+    }
+
+    /**
+     * Wrap a public key appropriately
+     */
+    protected static function wrapPublicKey(string $key, string $type): string
+    {
+        return "-----BEGIN $type PUBLIC KEY-----\r\n" .
+               chunk_split(Strings::base64_encode($key), 64) .
+               "-----END $type PUBLIC KEY-----";
+    }
+}
diff --git a/phpseclib/Crypt/Common/Formats/Keys/PKCS8.php b/phpseclib/Crypt/Common/Formats/Keys/PKCS8.php
new file mode 100644
index 000000000..b7481b516
--- /dev/null
+++ b/phpseclib/Crypt/Common/Formats/Keys/PKCS8.php
@@ -0,0 +1,744 @@
+<?php
+
+/**
+ * PKCS#8 Formatted Key Handler
+ *
+ * PHP version 5
+ *
+ * Used by PHP's openssl_public_encrypt() and openssl's rsautl (when -pubin is set)
+ *
+ * Processes keys with the following headers:
+ *
+ * -----BEGIN ENCRYPTED PRIVATE KEY-----
+ * -----BEGIN PRIVATE KEY-----
+ * -----BEGIN PUBLIC KEY-----
+ *
+ * Analogous to ssh-keygen's pkcs8 format (as specified by -m). Although PKCS8
+ * is specific to private keys it's basically creating a DER-encoded wrapper
+ * for keys. This just extends that same concept to public keys (much like ssh-keygen)
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\Common\Formats\Keys;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\AES;
+use phpseclib3\Crypt\Common\SymmetricKey;
+use phpseclib3\Crypt\DES;
+use phpseclib3\Crypt\Random;
+use phpseclib3\Crypt\RC2;
+use phpseclib3\Crypt\RC4;
+use phpseclib3\Crypt\TripleDES;
+use phpseclib3\Exception\InsufficientSetupException;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\Exception\UnsupportedAlgorithmException;
+use phpseclib3\File\ASN1;
+use phpseclib3\File\ASN1\Maps;
+
+/**
+ * PKCS#8 Formatted Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PKCS8 extends PKCS
+{
+    /**
+     * Default encryption algorithm
+     *
+     * @var string
+     */
+    private static $defaultEncryptionAlgorithm = 'id-PBES2';
+
+    /**
+     * Default encryption scheme
+     *
+     * Only used when defaultEncryptionAlgorithm is id-PBES2
+     *
+     * @var string
+     */
+    private static $defaultEncryptionScheme = 'aes128-CBC-PAD';
+
+    /**
+     * Default PRF
+     *
+     * Only used when defaultEncryptionAlgorithm is id-PBES2
+     *
+     * @var string
+     */
+    private static $defaultPRF = 'id-hmacWithSHA256';
+
+    /**
+     * Default Iteration Count
+     *
+     * @var int
+     */
+    private static $defaultIterationCount = 2048;
+
+    /**
+     * OIDs loaded
+     *
+     * @var bool
+     */
+    private static $oidsLoaded = false;
+
+    /**
+     * Binary key flag
+     *
+     * @var bool
+     */
+    private static $binary = false;
+
+    /**
+     * Sets the default encryption algorithm
+     */
+    public static function setEncryptionAlgorithm(string $algo): void
+    {
+        self::$defaultEncryptionAlgorithm = $algo;
+    }
+
+    /**
+     * Sets the default encryption algorithm for PBES2
+     */
+    public static function setEncryptionScheme(string $algo): void
+    {
+        self::$defaultEncryptionScheme = $algo;
+    }
+
+    /**
+     * Sets the iteration count
+     */
+    public static function setIterationCount(int $count): void
+    {
+        self::$defaultIterationCount = $count;
+    }
+
+    /**
+     * Sets the PRF for PBES2
+     */
+    public static function setPRF(string $algo): void
+    {
+        self::$defaultPRF = $algo;
+    }
+
+    /**
+     * Returns a SymmetricKey object based on a PBES1 $algo
+     */
+    private static function getPBES1EncryptionObject(string $algo): SymmetricKey
+    {
+        $algo = preg_match('#^pbeWith(?:MD2|MD5|SHA1|SHA)And(.*?)-CBC$#', $algo, $matches) ?
+            $matches[1] :
+            substr($algo, 13); // strlen('pbeWithSHAAnd') == 13
+
+        switch ($algo) {
+            case 'DES':
+                $cipher = new DES('cbc');
+                break;
+            case 'RC2':
+                $cipher = new RC2('cbc');
+                $cipher->setKeyLength(64);
+                break;
+            case '3-KeyTripleDES':
+                $cipher = new TripleDES('cbc');
+                break;
+            case '2-KeyTripleDES':
+                $cipher = new TripleDES('cbc');
+                $cipher->setKeyLength(128);
+                break;
+            case '128BitRC2':
+                $cipher = new RC2('cbc');
+                $cipher->setKeyLength(128);
+                break;
+            case '40BitRC2':
+                $cipher = new RC2('cbc');
+                $cipher->setKeyLength(40);
+                break;
+            case '128BitRC4':
+                $cipher = new RC4();
+                $cipher->setKeyLength(128);
+                break;
+            case '40BitRC4':
+                $cipher = new RC4();
+                $cipher->setKeyLength(40);
+                break;
+            default:
+                throw new UnsupportedAlgorithmException("$algo is not a supported algorithm");
+        }
+
+        return $cipher;
+    }
+
+    /**
+     * Returns a hash based on a PBES1 $algo
+     */
+    private static function getPBES1Hash(string $algo): string
+    {
+        if (preg_match('#^pbeWith(MD2|MD5|SHA1|SHA)And.*?-CBC$#', $algo, $matches)) {
+            return $matches[1] == 'SHA' ? 'sha1' : $matches[1];
+        }
+
+        return 'sha1';
+    }
+
+    /**
+     * Returns a KDF baesd on a PBES1 $algo
+     */
+    private static function getPBES1KDF(string $algo): string
+    {
+        switch ($algo) {
+            case 'pbeWithMD2AndDES-CBC':
+            case 'pbeWithMD2AndRC2-CBC':
+            case 'pbeWithMD5AndDES-CBC':
+            case 'pbeWithMD5AndRC2-CBC':
+            case 'pbeWithSHA1AndDES-CBC':
+            case 'pbeWithSHA1AndRC2-CBC':
+                return 'pbkdf1';
+        }
+
+        return 'pkcs12';
+    }
+
+    /**
+     * Returns a SymmetricKey object baesd on a PBES2 $algo
+     */
+    private static function getPBES2EncryptionObject(string $algo): SymmetricKey
+    {
+        switch ($algo) {
+            case 'desCBC':
+                $cipher = new DES('cbc');
+                break;
+            case 'des-EDE3-CBC':
+                $cipher = new TripleDES('cbc');
+                break;
+            case 'rc2CBC':
+                $cipher = new RC2('cbc');
+                // in theory this can be changed
+                $cipher->setKeyLength(128);
+                break;
+            case 'rc5-CBC-PAD':
+                throw new UnsupportedAlgorithmException('rc5-CBC-PAD is not supported for PBES2 PKCS#8 keys');
+            case 'aes128-CBC-PAD':
+            case 'aes192-CBC-PAD':
+            case 'aes256-CBC-PAD':
+                $cipher = new AES('cbc');
+                $cipher->setKeyLength((int) substr($algo, 3, 3));
+                break;
+            default:
+                throw new UnsupportedAlgorithmException("$algo is not supported");
+        }
+
+        return $cipher;
+    }
+
+    /**
+     * Initialize static variables
+     */
+    private static function initialize_static_variables(): void
+    {
+        if (!isset(static::$childOIDsLoaded)) {
+            throw new InsufficientSetupException('This class should not be called directly');
+        }
+
+        if (!static::$childOIDsLoaded) {
+            ASN1::loadOIDs(is_array(static::OID_NAME) ?
+                array_combine(static::OID_NAME, static::OID_VALUE) :
+                [static::OID_NAME => static::OID_VALUE]);
+            static::$childOIDsLoaded = true;
+        }
+        if (!self::$oidsLoaded) {
+            // from https://tools.ietf.org/html/rfc2898
+            ASN1::loadOIDs([
+               // PBES1 encryption schemes
+               'pbeWithMD2AndDES-CBC' => '1.2.840.113549.1.5.1',
+               'pbeWithMD2AndRC2-CBC' => '1.2.840.113549.1.5.4',
+               'pbeWithMD5AndDES-CBC' => '1.2.840.113549.1.5.3',
+               'pbeWithMD5AndRC2-CBC' => '1.2.840.113549.1.5.6',
+               'pbeWithSHA1AndDES-CBC' => '1.2.840.113549.1.5.10',
+               'pbeWithSHA1AndRC2-CBC' => '1.2.840.113549.1.5.11',
+
+               // from PKCS#12:
+               // https://tools.ietf.org/html/rfc7292
+               'pbeWithSHAAnd128BitRC4' => '1.2.840.113549.1.12.1.1',
+               'pbeWithSHAAnd40BitRC4' => '1.2.840.113549.1.12.1.2',
+               'pbeWithSHAAnd3-KeyTripleDES-CBC' => '1.2.840.113549.1.12.1.3',
+               'pbeWithSHAAnd2-KeyTripleDES-CBC' => '1.2.840.113549.1.12.1.4',
+               'pbeWithSHAAnd128BitRC2-CBC' => '1.2.840.113549.1.12.1.5',
+               'pbeWithSHAAnd40BitRC2-CBC' => '1.2.840.113549.1.12.1.6',
+
+               'id-PBKDF2' => '1.2.840.113549.1.5.12',
+               'id-PBES2' => '1.2.840.113549.1.5.13',
+               'id-PBMAC1' => '1.2.840.113549.1.5.14',
+
+               // from PKCS#5 v2.1:
+               // http://www.rsa.com/rsalabs/pkcs/files/h11302-wp-pkcs5v2-1-password-based-cryptography-standard.pdf
+               'id-hmacWithSHA1' => '1.2.840.113549.2.7',
+               'id-hmacWithSHA224' => '1.2.840.113549.2.8',
+               'id-hmacWithSHA256' => '1.2.840.113549.2.9',
+               'id-hmacWithSHA384' => '1.2.840.113549.2.10',
+               'id-hmacWithSHA512' => '1.2.840.113549.2.11',
+               'id-hmacWithSHA512-224' => '1.2.840.113549.2.12',
+               'id-hmacWithSHA512-256' => '1.2.840.113549.2.13',
+
+               'desCBC'       => '1.3.14.3.2.7',
+               'des-EDE3-CBC' => '1.2.840.113549.3.7',
+               'rc2CBC' => '1.2.840.113549.3.2',
+               'rc5-CBC-PAD' => '1.2.840.113549.3.9',
+
+               'aes128-CBC-PAD' => '2.16.840.1.101.3.4.1.2',
+               'aes192-CBC-PAD' => '2.16.840.1.101.3.4.1.22',
+               'aes256-CBC-PAD' => '2.16.840.1.101.3.4.1.42',
+            ]);
+            self::$oidsLoaded = true;
+        }
+    }
+
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param string|array $key
+     */
+    protected static function load($key, ?string $password = null): array
+    {
+        if (!Strings::is_stringable($key)) {
+            throw new UnexpectedValueException('Key should be a string - not a ' . gettype($key));
+        }
+
+        $isPublic = str_contains($key, 'PUBLIC');
+        $isPrivate = str_contains($key, 'PRIVATE');
+
+        $decoded = self::preParse($key);
+
+        $meta = [];
+
+        $decrypted = ASN1::asn1map($decoded[0], Maps\EncryptedPrivateKeyInfo::MAP);
+        if ($password !== null && strlen($password) && is_array($decrypted)) {
+            $algorithm = $decrypted['encryptionAlgorithm']['algorithm'];
+            switch ($algorithm) {
+                // PBES1
+                case 'pbeWithMD2AndDES-CBC':
+                case 'pbeWithMD2AndRC2-CBC':
+                case 'pbeWithMD5AndDES-CBC':
+                case 'pbeWithMD5AndRC2-CBC':
+                case 'pbeWithSHA1AndDES-CBC':
+                case 'pbeWithSHA1AndRC2-CBC':
+                case 'pbeWithSHAAnd3-KeyTripleDES-CBC':
+                case 'pbeWithSHAAnd2-KeyTripleDES-CBC':
+                case 'pbeWithSHAAnd128BitRC2-CBC':
+                case 'pbeWithSHAAnd40BitRC2-CBC':
+                case 'pbeWithSHAAnd128BitRC4':
+                case 'pbeWithSHAAnd40BitRC4':
+                    $cipher = self::getPBES1EncryptionObject($algorithm);
+                    $hash = self::getPBES1Hash($algorithm);
+                    $kdf = self::getPBES1KDF($algorithm);
+
+                    $meta['meta']['algorithm'] = $algorithm;
+
+                    $temp = ASN1::decodeBER($decrypted['encryptionAlgorithm']['parameters']);
+                    if (!$temp) {
+                        throw new RuntimeException('Unable to decode BER');
+                    }
+                    [
+                        'salt' => $salt,
+                        'iterationCount' => $iterationCount
+                    ] = ASN1::asn1map($temp[0], Maps\PBEParameter::MAP);
+                    $iterationCount = (int) $iterationCount->toString();
+                    $cipher->setPassword($password, $kdf, $hash, $salt, $iterationCount);
+                    $key = $cipher->decrypt($decrypted['encryptedData']);
+                    $decoded = ASN1::decodeBER($key);
+                    if (!$decoded) {
+                        throw new RuntimeException('Unable to decode BER 2');
+                    }
+
+                    break;
+                case 'id-PBES2':
+                    $meta['meta']['algorithm'] = $algorithm;
+
+                    $temp = ASN1::decodeBER($decrypted['encryptionAlgorithm']['parameters']);
+                    if (!$temp) {
+                        throw new RuntimeException('Unable to decode BER');
+                    }
+                    $temp = ASN1::asn1map($temp[0], Maps\PBES2params::MAP);
+                    [
+                        'keyDerivationFunc' => $keyDerivationFunc,
+                        'encryptionScheme' => $encryptionScheme
+                    ] = $temp;
+
+                    $cipher = self::getPBES2EncryptionObject($encryptionScheme['algorithm']);
+                    $meta['meta']['cipher'] = $encryptionScheme['algorithm'];
+
+                    $temp = ASN1::decodeBER($decrypted['encryptionAlgorithm']['parameters']);
+                    if (!$temp) {
+                        throw new RuntimeException('Unable to decode BER');
+                    }
+                    $temp = ASN1::asn1map($temp[0], Maps\PBES2params::MAP);
+                    [
+                        'keyDerivationFunc' => $keyDerivationFunc,
+                        'encryptionScheme' => $encryptionScheme
+                    ] = $temp;
+
+                    if (!$cipher instanceof RC2) {
+                        $cipher->setIV($encryptionScheme['parameters']['octetString']);
+                    } else {
+                        $temp = ASN1::decodeBER($encryptionScheme['parameters']);
+                        if (!$temp) {
+                            throw new RuntimeException('Unable to decode BER');
+                        }
+                        [
+                            'rc2ParametersVersion' => $rc2ParametersVersion,
+                            'iv' => $iv
+                        ] = ASN1::asn1map($temp[0], Maps\RC2CBCParameter::MAP);
+                        $effectiveKeyLength = (int) $rc2ParametersVersion->toString();
+                        switch ($effectiveKeyLength) {
+                            case 160:
+                                $effectiveKeyLength = 40;
+                                break;
+                            case 120:
+                                $effectiveKeyLength = 64;
+                                break;
+                            case 58:
+                                $effectiveKeyLength = 128;
+                                break;
+                            //default: // should be >= 256
+                        }
+                        $cipher->setIV($iv);
+                        $cipher->setKeyLength($effectiveKeyLength);
+                    }
+
+                    $meta['meta']['keyDerivationFunc'] = $keyDerivationFunc['algorithm'];
+                    switch ($keyDerivationFunc['algorithm']) {
+                        case 'id-PBKDF2':
+                            $temp = ASN1::decodeBER($keyDerivationFunc['parameters']);
+                            if (!$temp) {
+                                throw new RuntimeException('Unable to decode BER');
+                            }
+                            $params = ASN1::asn1map($temp[0], Maps\PBKDF2params::MAP);
+                            if (empty($params['prf'])) {
+                                $params['prf'] = ['algorithm' => 'id-hmacWithSHA1'];
+                            }
+                            [
+                                'salt' => $salt,
+                                'iterationCount' => $iterationCount,
+                                'prf' => $prf
+                            ] = $params;
+                            $meta['meta']['prf'] = $prf['algorithm'];
+                            $hash = str_replace('-', '/', substr($prf['algorithm'], 11));
+                            $params = [
+                                $password,
+                                'pbkdf2',
+                                $hash,
+                                $salt,
+                                (int) $iterationCount->toString(),
+                            ];
+                            if (isset($keyLength)) {
+                                $params[] = (int) $keyLength->toString();
+                            }
+                            $cipher->setPassword(...$params);
+                            $key = $cipher->decrypt($decrypted['encryptedData']);
+                            $decoded = ASN1::decodeBER($key);
+                            if (!$decoded) {
+                                throw new RuntimeException('Unable to decode BER 3');
+                            }
+                            break;
+                        default:
+                            throw new UnsupportedAlgorithmException('Only PBKDF2 is supported for PBES2 PKCS#8 keys');
+                    }
+                    break;
+                case 'id-PBMAC1':
+                    //$temp = ASN1::decodeBER($decrypted['encryptionAlgorithm']['parameters']);
+                    //$value = ASN1::asn1map($temp[0], Maps\PBMAC1params::MAP);
+                    // since i can't find any implementation that does PBMAC1 it is unsupported
+                    throw new UnsupportedAlgorithmException('Only PBES1 and PBES2 PKCS#8 keys are supported.');
+                // at this point we'll assume that the key conforms to PublicKeyInfo
+            }
+        }
+
+        $private = ASN1::asn1map($decoded[0], Maps\OneAsymmetricKey::MAP);
+        if (is_array($private)) {
+            if ($isPublic) {
+                throw new UnexpectedValueException('Human readable string claims public key but DER encoded string claims private key');
+            }
+
+            if (isset($private['privateKeyAlgorithm']['parameters']) && !$private['privateKeyAlgorithm']['parameters'] instanceof ASN1\Element && isset($decoded[0]['content'][1]['content'][1])) {
+                $temp = $decoded[0]['content'][1]['content'][1];
+                $private['privateKeyAlgorithm']['parameters'] = new ASN1\Element(substr($key, $temp['start'], $temp['length']));
+            }
+            if (is_array(static::OID_NAME)) {
+                if (!in_array($private['privateKeyAlgorithm']['algorithm'], static::OID_NAME)) {
+                    throw new UnsupportedAlgorithmException($private['privateKeyAlgorithm']['algorithm'] . ' is not a supported key type');
+                }
+            } else {
+                if ($private['privateKeyAlgorithm']['algorithm'] != static::OID_NAME) {
+                    throw new UnsupportedAlgorithmException('Only ' . static::OID_NAME . ' keys are supported; this is a ' . $private['privateKeyAlgorithm']['algorithm'] . ' key');
+                }
+            }
+            if (isset($private['publicKey'])) {
+                if ($private['publicKey'][0] != "\0") {
+                    throw new UnexpectedValueException('The first byte of the public key should be null - not ' . bin2hex($private['publicKey'][0]));
+                }
+                $private['publicKey'] = substr($private['publicKey'], 1);
+            }
+            return $private + $meta;
+        }
+
+        // EncryptedPrivateKeyInfo and PublicKeyInfo have largely identical "signatures". the only difference
+        // is that the former has an octet string and the later has a bit string. the first byte of a bit
+        // string represents the number of bits in the last byte that are to be ignored but, currently,
+        // bit strings wanting a non-zero amount of bits trimmed are not supported
+        $public = ASN1::asn1map($decoded[0], Maps\PublicKeyInfo::MAP);
+
+        if (is_array($public)) {
+            if ($isPrivate) {
+                throw new UnexpectedValueException('Human readable string claims private key but DER encoded string claims public key');
+            }
+
+            if ($public['publicKey'][0] != "\0") {
+                throw new UnexpectedValueException('The first byte of the public key should be null - not ' . bin2hex($public['publicKey'][0]));
+            }
+            if (is_array(static::OID_NAME)) {
+                if (!in_array($public['publicKeyAlgorithm']['algorithm'], static::OID_NAME)) {
+                    throw new UnsupportedAlgorithmException($public['publicKeyAlgorithm']['algorithm'] . ' is not a supported key type');
+                }
+            } else {
+                if ($public['publicKeyAlgorithm']['algorithm'] != static::OID_NAME) {
+                    throw new UnsupportedAlgorithmException('Only ' . static::OID_NAME . ' keys are supported; this is a ' . $public['publicKeyAlgorithm']['algorithm'] . ' key');
+                }
+            }
+            if (isset($public['publicKeyAlgorithm']['parameters']) && !$public['publicKeyAlgorithm']['parameters'] instanceof ASN1\Element && isset($decoded[0]['content'][0]['content'][1])) {
+                $temp = $decoded[0]['content'][0]['content'][1];
+                $public['publicKeyAlgorithm']['parameters'] = new ASN1\Element(substr($key, $temp['start'], $temp['length']));
+            }
+            $public['publicKey'] = substr($public['publicKey'], 1);
+            return $public;
+        }
+
+        throw new RuntimeException('Unable to parse using either OneAsymmetricKey or PublicKeyInfo ASN1 maps');
+    }
+
+    /**
+     * Toggle between binary (DER) and printable (PEM) keys
+     *
+     * Printable keys are what are generated by default.
+     *
+     * @param bool $enabled
+     */
+    public static function setBinaryOutput($enabled): void
+    {
+        self::$binary = $enabled;
+    }
+
+    /**
+     * Wrap a private key appropriately
+     *
+     * @param array|string $attr
+     * @param string|false $password
+     * @param string|null $oid optional
+     * @param string $publicKey optional
+     * @param array $options optional
+     */
+    protected static function wrapPrivateKey(string $key, $attr, $params, $password, ?string $oid = null, string $publicKey = '', array $options = []): string
+    {
+        self::initialize_static_variables();
+
+        $key = [
+            'version' => 'v1',
+            'privateKeyAlgorithm' => [
+                'algorithm' => is_string(static::OID_NAME) ? static::OID_NAME : $oid,
+             ],
+            'privateKey' => $key,
+        ];
+        if ($oid != 'id-Ed25519' && $oid != 'id-Ed448') {
+            $key['privateKeyAlgorithm']['parameters'] = $params;
+        }
+        if (!empty($attr)) {
+            $key['attributes'] = $attr;
+        }
+        if (!empty($publicKey)) {
+            $key['version'] = 'v2';
+            $key['publicKey'] = $publicKey;
+        }
+        $key = ASN1::encodeDER($key, Maps\OneAsymmetricKey::MAP);
+        if (!empty($password) && is_string($password)) {
+            $salt = Random::string(8);
+
+            $iterationCount = $options['iterationCount'] ?? self::$defaultIterationCount;
+            $encryptionAlgorithm = $options['encryptionAlgorithm'] ?? self::$defaultEncryptionAlgorithm;
+            $encryptionScheme = $options['encryptionScheme'] ?? self::$defaultEncryptionScheme;
+            $prf = $options['PRF'] ?? self::$defaultPRF;
+
+            if ($encryptionAlgorithm == 'id-PBES2') {
+                $crypto = self::getPBES2EncryptionObject($encryptionScheme);
+                $hash = str_replace('-', '/', substr($prf, 11));
+                $kdf = 'pbkdf2';
+                $iv = Random::string($crypto->getBlockLength() >> 3);
+
+                $PBKDF2params = [
+                    'salt' => $salt,
+                    'iterationCount' => $iterationCount,
+                    'prf' => ['algorithm' => $prf, 'parameters' => null],
+                ];
+                $PBKDF2params = ASN1::encodeDER($PBKDF2params, Maps\PBKDF2params::MAP);
+
+                if (!$crypto instanceof RC2) {
+                    $params = ['octetString' => $iv];
+                } else {
+                    $params = [
+                        'rc2ParametersVersion' => 58,
+                        'iv' => $iv,
+                    ];
+                    $params = ASN1::encodeDER($params, Maps\RC2CBCParameter::MAP);
+                    $params = new ASN1\Element($params);
+                }
+
+                $params = [
+                    'keyDerivationFunc' => [
+                        'algorithm' => 'id-PBKDF2',
+                        'parameters' => new ASN1\Element($PBKDF2params),
+                    ],
+                    'encryptionScheme' => [
+                        'algorithm' => $encryptionScheme,
+                        'parameters' => $params,
+                    ],
+                ];
+                $params = ASN1::encodeDER($params, Maps\PBES2params::MAP);
+
+                $crypto->setIV($iv);
+            } else {
+                $crypto = self::getPBES1EncryptionObject($encryptionAlgorithm);
+                $hash = self::getPBES1Hash($encryptionAlgorithm);
+                $kdf = self::getPBES1KDF($encryptionAlgorithm);
+
+                $params = [
+                    'salt' => $salt,
+                    'iterationCount' => $iterationCount,
+                ];
+                $params = ASN1::encodeDER($params, Maps\PBEParameter::MAP);
+            }
+            $crypto->setPassword($password, $kdf, $hash, $salt, $iterationCount);
+            $key = $crypto->encrypt($key);
+
+            $key = [
+                'encryptionAlgorithm' => [
+                    'algorithm' => $encryptionAlgorithm,
+                    'parameters' => new ASN1\Element($params),
+                ],
+                'encryptedData' => $key,
+            ];
+
+            $key = ASN1::encodeDER($key, Maps\EncryptedPrivateKeyInfo::MAP);
+
+            if ($options['binary'] ?? self::$binary) {
+                return $key;
+            }
+
+            return "-----BEGIN ENCRYPTED PRIVATE KEY-----\r\n" .
+                   chunk_split(Strings::base64_encode($key), 64) .
+                   "-----END ENCRYPTED PRIVATE KEY-----";
+        }
+
+        if ($options['binary'] ?? self::$binary) {
+            return $key;
+        }
+
+        return "-----BEGIN PRIVATE KEY-----\r\n" .
+               chunk_split(Strings::base64_encode($key), 64) .
+               "-----END PRIVATE KEY-----";
+    }
+
+    /**
+     * Wrap a public key appropriately
+     */
+    protected static function wrapPublicKey(string $key, $params, ?string $oid = null, array $options = []): string
+    {
+        self::initialize_static_variables();
+
+        $key = [
+            'publicKeyAlgorithm' => [
+                'algorithm' => is_string(static::OID_NAME) ? static::OID_NAME : $oid,
+            ],
+            'publicKey' => "\0" . $key,
+        ];
+
+        if ($oid != 'id-Ed25519' && $oid != 'id-Ed448') {
+            $key['publicKeyAlgorithm']['parameters'] = $params;
+        }
+
+        $key = ASN1::encodeDER($key, Maps\PublicKeyInfo::MAP);
+
+        if ($options['binary'] ?? self::$binary) {
+            return $key;
+        }
+
+        return "-----BEGIN PUBLIC KEY-----\r\n" .
+               chunk_split(Strings::base64_encode($key), 64) .
+               "-----END PUBLIC KEY-----";
+    }
+
+    /**
+     * Perform some preliminary parsing of the key
+     *
+     * @param string|array $key
+     */
+    private static function preParse(&$key): array
+    {
+        self::initialize_static_variables();
+
+        if (self::$format != self::MODE_DER) {
+            $decoded = ASN1::extractBER($key);
+            if ($decoded !== false) {
+                $key = $decoded;
+            } elseif (self::$format == self::MODE_PEM) {
+                throw new UnexpectedValueException('Expected base64-encoded PEM format but was unable to decode base64 text');
+            }
+        }
+
+        $decoded = ASN1::decodeBER($key);
+        if (!$decoded) {
+            throw new RuntimeException('Unable to decode BER');
+        }
+
+        return $decoded;
+    }
+
+    /**
+     * Returns the encryption parameters used by the key
+     */
+    public static function extractEncryptionAlgorithm(string $key): array
+    {
+        if (!Strings::is_stringable($key)) {
+            throw new UnexpectedValueException('Key should be a string - not a ' . gettype($key));
+        }
+
+        $decoded = self::preParse($key);
+
+        $r = ASN1::asn1map($decoded[0], Maps\EncryptedPrivateKeyInfo::MAP);
+        if (!is_array($r)) {
+            throw new RuntimeException('Unable to parse using EncryptedPrivateKeyInfo map');
+        }
+
+        if ($r['encryptionAlgorithm']['algorithm'] == 'id-PBES2') {
+            $decoded = ASN1::decodeBER($r['encryptionAlgorithm']['parameters']->element);
+            if (!$decoded) {
+                throw new RuntimeException('Unable to decode BER');
+            }
+            $r['encryptionAlgorithm']['parameters'] = ASN1::asn1map($decoded[0], Maps\PBES2params::MAP);
+
+            $kdf = &$r['encryptionAlgorithm']['parameters']['keyDerivationFunc'];
+            switch ($kdf['algorithm']) {
+                case 'id-PBKDF2':
+                    $decoded = ASN1::decodeBER($kdf['parameters']->element);
+                    if (!$decoded) {
+                        throw new RuntimeException('Unable to decode BER');
+                    }
+                    $kdf['parameters'] = ASN1::asn1map($decoded[0], Maps\PBKDF2params::MAP);
+            }
+        }
+
+        return $r['encryptionAlgorithm'];
+    }
+}
diff --git a/phpseclib/Crypt/Common/Formats/Keys/PuTTY.php b/phpseclib/Crypt/Common/Formats/Keys/PuTTY.php
new file mode 100644
index 000000000..b8d62adab
--- /dev/null
+++ b/phpseclib/Crypt/Common/Formats/Keys/PuTTY.php
@@ -0,0 +1,361 @@
+<?php
+
+/**
+ * PuTTY Formatted Key Handler
+ *
+ * See PuTTY's SSHPUBK.C and https://tartarus.org/~simon/putty-snapshots/htmldoc/AppendixC.html
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\Common\Formats\Keys;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\AES;
+use phpseclib3\Crypt\Hash;
+use phpseclib3\Crypt\Random;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\Exception\UnsupportedAlgorithmException;
+
+/**
+ * PuTTY Formatted Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PuTTY
+{
+    /**
+     * Default comment
+     *
+     * @var string
+     */
+    private static $comment = 'phpseclib-generated-key';
+
+    /**
+     * Default version
+     *
+     * @var int
+     */
+    private static $version = 2;
+
+    /**
+     * Sets the default comment
+     */
+    public static function setComment(string $comment): void
+    {
+        self::$comment = str_replace(["\r", "\n"], '', $comment);
+    }
+
+    /**
+     * Sets the default version
+     */
+    public static function setVersion(int $version): void
+    {
+        if ($version != 2 && $version != 3) {
+            throw new RuntimeException('Only supported versions are 2 and 3');
+        }
+        self::$version = $version;
+    }
+
+    /**
+     * Generate a symmetric key for PuTTY v2 keys
+     */
+    private static function generateV2Key(string $password, int $length): string
+    {
+        $symkey = '';
+        $sequence = 0;
+        while (strlen($symkey) < $length) {
+            $temp = pack('Na*', $sequence++, $password);
+            $symkey .= Strings::hex2bin(sha1($temp));
+        }
+        return substr($symkey, 0, $length);
+    }
+
+    /**
+     * Generate a symmetric key for PuTTY v3 keys
+     */
+    private static function generateV3Key(string $password, string $flavour, int $memory, int $passes, string $salt): array
+    {
+        if (!function_exists('sodium_crypto_pwhash')) {
+            throw new RuntimeException('sodium_crypto_pwhash needs to exist for Argon2 password hasing');
+        }
+
+        switch ($flavour) {
+            case 'Argon2i':
+                $flavour = SODIUM_CRYPTO_PWHASH_ALG_ARGON2I13;
+                break;
+            case 'Argon2id':
+                $flavour = SODIUM_CRYPTO_PWHASH_ALG_ARGON2ID13;
+                break;
+            default:
+                throw new UnsupportedAlgorithmException('Only Argon2i and Argon2id are supported');
+        }
+
+        $length = 80; // keylen + ivlen + mac_keylen
+        $temp = sodium_crypto_pwhash($length, $password, $salt, $passes, $memory << 10, $flavour);
+
+        $symkey = substr($temp, 0, 32);
+        $symiv = substr($temp, 32, 16);
+        $hashkey = substr($temp, -32);
+
+        return compact('symkey', 'symiv', 'hashkey');
+    }
+
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param array|string $key
+     * @param string|false $password
+     * @return array|false
+     */
+    public static function load($key, $password)
+    {
+        if (!Strings::is_stringable($key)) {
+            throw new UnexpectedValueException('Key should be a string - not a ' . gettype($key));
+        }
+
+        if (str_contains($key, 'BEGIN SSH2 PUBLIC KEY')) {
+            $lines = preg_split('#[\r\n]+#', $key);
+            switch (true) {
+                case $lines[0] != '---- BEGIN SSH2 PUBLIC KEY ----':
+                    throw new UnexpectedValueException('Key doesn\'t start with ---- BEGIN SSH2 PUBLIC KEY ----');
+                case $lines[count($lines) - 1] != '---- END SSH2 PUBLIC KEY ----':
+                    throw new UnexpectedValueException('Key doesn\'t end with ---- END SSH2 PUBLIC KEY ----');
+            }
+            $lines = array_splice($lines, 1, -1);
+            $lines = array_map(fn ($line) => rtrim($line, "\r\n"), $lines);
+            $data = $current = '';
+            $values = [];
+            $in_value = false;
+            foreach ($lines as $line) {
+                switch (true) {
+                    case preg_match('#^(.*?): (.*)#', $line, $match):
+                        $in_value = $line[-1] == '\\';
+                        $current = strtolower($match[1]);
+                        $values[$current] = $in_value ? substr($match[2], 0, -1) : $match[2];
+                        break;
+                    case $in_value:
+                        $in_value = $line[-1] == '\\';
+                        $values[$current] .= $in_value ? substr($line, 0, -1) : $line;
+                        break;
+                    default:
+                        $data .= $line;
+                }
+            }
+
+            $components = call_user_func([static::PUBLIC_HANDLER, 'load'], $data);
+            if ($components === false) {
+                throw new UnexpectedValueException('Unable to decode public key');
+            }
+            $components += $values;
+            $components['comment'] = str_replace(['\\\\', '\"'], ['\\', '"'], $values['comment']);
+
+            return $components;
+        }
+
+        $components = [];
+
+        $key = preg_split('#\r\n|\r|\n#', trim($key));
+        if (Strings::shift($key[0], strlen('PuTTY-User-Key-File-')) != 'PuTTY-User-Key-File-') {
+            return false;
+        }
+        $version = (int) Strings::shift($key[0], 3); // should be either "2: " or "3: 0" prior to int casting
+        if ($version != 2 && $version != 3) {
+            throw new RuntimeException('Only v2 and v3 PuTTY private keys are supported');
+        }
+        $components['type'] = $type = rtrim($key[0]);
+        if (!in_array($type, static::$types)) {
+            $error = count(static::$types) == 1 ?
+                'Only ' . static::$types[0] . ' keys are supported. ' :
+                '';
+            throw new UnsupportedAlgorithmException($error . 'This is an unsupported ' . $type . ' key');
+        }
+        $encryption = trim(preg_replace('#Encryption: (.+)#', '$1', $key[1]));
+        $components['comment'] = trim(preg_replace('#Comment: (.+)#', '$1', $key[2]));
+
+        $publicLength = (int) trim(preg_replace('#Public-Lines: (\d+)#', '$1', $key[3]));
+        $public = Strings::base64_decode(implode('', array_map('trim', array_slice($key, 4, $publicLength))));
+
+        $source = Strings::packSSH2('ssss', $type, $encryption, $components['comment'], $public);
+
+        ['length' => $length] = unpack('Nlength', Strings::shift($public, 4));
+        $newtype = Strings::shift($public, $length);
+        if ($newtype != $type) {
+            throw new RuntimeException('The binary type does not match the human readable type field');
+        }
+
+        $components['public'] = $public;
+
+        switch ($version) {
+            case 3:
+                $hashkey = '';
+                break;
+            case 2:
+                $hashkey = 'putty-private-key-file-mac-key';
+        }
+
+        $offset = $publicLength + 4;
+        switch ($encryption) {
+            case 'aes256-cbc':
+                $crypto = new AES('cbc');
+                switch ($version) {
+                    case 3:
+                        $flavour = trim(preg_replace('#Key-Derivation: (.*)#', '$1', $key[$offset++]));
+                        $memory = trim(preg_replace('#Argon2-Memory: (\d+)#', '$1', $key[$offset++]));
+                        $passes = trim(preg_replace('#Argon2-Passes: (\d+)#', '$1', $key[$offset++]));
+                        $parallelism = trim(preg_replace('#Argon2-Parallelism: (\d+)#', '$1', $key[$offset++]));
+                        $salt = Strings::hex2bin(trim(preg_replace('#Argon2-Salt: ([0-9a-f]+)#', '$1', $key[$offset++])));
+
+                        [
+                            'symkey' => $symkey,
+                            'symiv' => $symiv,
+                            'hashkey' => $hashkey
+                        ] = self::generateV3Key($password, $flavour, (int)$memory, (int)$passes, $salt);
+
+                        break;
+                    case 2:
+                        $symkey = self::generateV2Key($password, 32);
+                        $symiv = str_repeat("\0", $crypto->getBlockLength() >> 3);
+                        $hashkey .= $password;
+                }
+        }
+
+        switch ($version) {
+            case 3:
+                $hash = new Hash('sha256');
+                $hash->setKey($hashkey);
+                break;
+            case 2:
+                $hash = new Hash('sha1');
+                $hash->setKey(sha1($hashkey, true));
+        }
+
+        $privateLength = (int) trim(preg_replace('#Private-Lines: (\d+)#', '$1', $key[$offset++]));
+        $private = Strings::base64_decode(implode('', array_map('trim', array_slice($key, $offset, $privateLength))));
+
+        if ($encryption != 'none') {
+            $crypto->setKey($symkey);
+            $crypto->setIV($symiv);
+            $crypto->disablePadding();
+            $private = $crypto->decrypt($private);
+        }
+
+        $source .= Strings::packSSH2('s', $private);
+
+        $hmac = trim(preg_replace('#Private-MAC: (.+)#', '$1', $key[$offset + $privateLength]));
+        $hmac = Strings::hex2bin($hmac);
+
+        if (!hash_equals($hash->hash($source), $hmac)) {
+            throw new UnexpectedValueException('MAC validation error');
+        }
+
+        $components['private'] = $private;
+
+        return $components;
+    }
+
+    /**
+     * Wrap a private key appropriately
+     *
+     * @param string|false $password
+     * @param array $options optional
+     */
+    protected static function wrapPrivateKey(string $public, string $private, string $type, $password, array $options = []): string
+    {
+        $encryption = (!empty($password) || is_string($password)) ? 'aes256-cbc' : 'none';
+        $comment = $options['comment'] ?? self::$comment;
+        $version = $options['version'] ?? self::$version;
+
+        $key = "PuTTY-User-Key-File-$version: $type\r\n";
+        $key .= "Encryption: $encryption\r\n";
+        $key .= "Comment: $comment\r\n";
+
+        $public = Strings::packSSH2('s', $type) . $public;
+
+        $source = Strings::packSSH2('ssss', $type, $encryption, $comment, $public);
+
+        $public = Strings::base64_encode($public);
+        $key .= "Public-Lines: " . ((strlen($public) + 63) >> 6) . "\r\n";
+        $key .= chunk_split($public, 64);
+
+        if (empty($password) && !is_string($password)) {
+            $source .= Strings::packSSH2('s', $private);
+            switch ($version) {
+                case 3:
+                    $hash = new Hash('sha256');
+                    $hash->setKey('');
+                    break;
+                case 2:
+                    $hash = new Hash('sha1');
+                    $hash->setKey(sha1('putty-private-key-file-mac-key', true));
+            }
+        } else {
+            $private .= Random::string(16 - (strlen($private) & 15));
+            $source .= Strings::packSSH2('s', $private);
+            $crypto = new AES('cbc');
+
+            switch ($version) {
+                case 3:
+                    $salt = Random::string(16);
+                    $key .= "Key-Derivation: Argon2id\r\n";
+                    $key .= "Argon2-Memory: 8192\r\n";
+                    $key .= "Argon2-Passes: 13\r\n";
+                    $key .= "Argon2-Parallelism: 1\r\n";
+                    $key .= "Argon2-Salt: " . Strings::bin2hex($salt) . "\r\n";
+                    [
+                        'symkey' => $symkey,
+                        'symiv' => $symiv,
+                        'hashkey' => $hashkey
+                    ] = self::generateV3Key($password, 'Argon2id', 8192, 13, $salt);
+
+                    $hash = new Hash('sha256');
+                    $hash->setKey($hashkey);
+
+                    break;
+                case 2:
+                    $symkey = self::generateV2Key($password, 32);
+                    $symiv = str_repeat("\0", $crypto->getBlockLength() >> 3);
+                    $hashkey = 'putty-private-key-file-mac-key' . $password;
+
+                    $hash = new Hash('sha1');
+                    $hash->setKey(sha1($hashkey, true));
+            }
+
+            $crypto->setKey($symkey);
+            $crypto->setIV($symiv);
+            $crypto->disablePadding();
+            $private = $crypto->encrypt($private);
+            $mac = $hash->hash($source);
+        }
+
+        $private = Strings::base64_encode($private);
+        $key .= 'Private-Lines: ' . ((strlen($private) + 63) >> 6) . "\r\n";
+        $key .= chunk_split($private, 64);
+        $key .= 'Private-MAC: ' . Strings::bin2hex($hash->hash($source)) . "\r\n";
+
+        return $key;
+    }
+
+    /**
+     * Wrap a public key appropriately
+     *
+     * This is basically the format described in RFC 4716 (https://tools.ietf.org/html/rfc4716)
+     */
+    protected static function wrapPublicKey(string $key, string $type): string
+    {
+        $key = pack('Na*a*', strlen($type), $type, $key);
+        $key = "---- BEGIN SSH2 PUBLIC KEY ----\r\n" .
+               'Comment: "' . str_replace(['\\', '"'], ['\\\\', '\"'], self::$comment) . "\"\r\n" .
+               chunk_split(Strings::base64_encode($key), 64) .
+               '---- END SSH2 PUBLIC KEY ----';
+        return $key;
+    }
+}
diff --git a/phpseclib/Crypt/Common/Formats/Signature/Raw.php b/phpseclib/Crypt/Common/Formats/Signature/Raw.php
new file mode 100644
index 000000000..c3db69cb0
--- /dev/null
+++ b/phpseclib/Crypt/Common/Formats/Signature/Raw.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Raw Signature Handler
+ *
+ * PHP version 5
+ *
+ * Handles signatures as arrays
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\Common\Formats\Signature;
+
+use phpseclib3\Math\BigInteger;
+
+/**
+ * Raw Signature Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Raw
+{
+    /**
+     * Loads a signature
+     *
+     * @return array|bool
+     */
+    public static function load(array $sig)
+    {
+        switch (true) {
+            case !is_array($sig):
+            case !isset($sig['r']) || !isset($sig['s']):
+            case !$sig['r'] instanceof BigInteger:
+            case !$sig['s'] instanceof BigInteger:
+                return false;
+        }
+
+        return [
+            'r' => $sig['r'],
+            's' => $sig['s'],
+        ];
+    }
+
+    /**
+     * Returns a signature in the appropriate format
+     */
+    public static function save(BigInteger $r, BigInteger $s): string
+    {
+        return compact('r', 's');
+    }
+}
diff --git a/phpseclib/Crypt/Common/PrivateKey.php b/phpseclib/Crypt/Common/PrivateKey.php
new file mode 100644
index 000000000..518f9b538
--- /dev/null
+++ b/phpseclib/Crypt/Common/PrivateKey.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * PrivateKey interface
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2009 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\Common;
+
+/**
+ * PrivateKey interface
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+interface PrivateKey
+{
+    public function sign($message);
+    //public function decrypt($ciphertext);
+    public function getPublicKey();
+    public function toString(string $type, array $options = []): string;
+
+    /**
+     * @return static
+     */
+    public function withPassword(?string $password = null): PrivateKey;
+}
diff --git a/phpseclib/Crypt/Common/PublicKey.php b/phpseclib/Crypt/Common/PublicKey.php
new file mode 100644
index 000000000..88ff2a106
--- /dev/null
+++ b/phpseclib/Crypt/Common/PublicKey.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * PublicKey interface
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2009 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\Common;
+
+/**
+ * PublicKey interface
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+interface PublicKey
+{
+    public function verify($message, $signature);
+    //public function encrypt($plaintext);
+    public function toString(string $type, array $options = []): string;
+    public function getFingerprint($algorithm);
+}
diff --git a/phpseclib/Crypt/Common/StreamCipher.php b/phpseclib/Crypt/Common/StreamCipher.php
new file mode 100644
index 000000000..d0370769c
--- /dev/null
+++ b/phpseclib/Crypt/Common/StreamCipher.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * Base Class for all stream ciphers
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @author    Hans-Juergen Petrich <petrich@tronic-media.com>
+ * @copyright 2007 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\Common;
+
+/**
+ * Base Class for all stream cipher classes
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class StreamCipher extends SymmetricKey
+{
+    /**
+     * Block Length of the cipher
+     *
+     * Stream ciphers do not have a block size
+     *
+     * @see SymmetricKey::block_size
+     * @var int
+     */
+    protected $block_size = 0;
+
+    /**
+     * Default Constructor.
+     *
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
+     * @return StreamCipher
+     */
+    public function __construct()
+    {
+        parent::__construct('stream');
+    }
+
+    /**
+     * Stream ciphers not use an IV
+     */
+    public function usesIV(): bool
+    {
+        return false;
+    }
+}
diff --git a/phpseclib/Crypt/Common/SymmetricKey.php b/phpseclib/Crypt/Common/SymmetricKey.php
new file mode 100644
index 000000000..67daca04e
--- /dev/null
+++ b/phpseclib/Crypt/Common/SymmetricKey.php
@@ -0,0 +1,2955 @@
+<?php
+
+/**
+ * Base Class for all \phpseclib3\Crypt\* cipher classes
+ *
+ * PHP version 5
+ *
+ * Internally for phpseclib developers:
+ *  If you plan to add a new cipher class, please note following rules:
+ *
+ *  - The new \phpseclib3\Crypt\* cipher class should extend \phpseclib3\Crypt\Common\SymmetricKey
+ *
+ *  - Following methods are then required to be overridden/overloaded:
+ *
+ *    - encryptBlock()
+ *
+ *    - decryptBlock()
+ *
+ *    - setupKey()
+ *
+ *  - All other methods are optional to be overridden/overloaded
+ *
+ *  - Look at the source code of the current ciphers how they extend \phpseclib3\Crypt\Common\SymmetricKey
+ *    and take one of them as a start up for the new cipher class.
+ *
+ *  - Please read all the other comments/notes/hints here also for each class var/method
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @author    Hans-Juergen Petrich <petrich@tronic-media.com>
+ * @copyright 2007 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\Common;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Blowfish;
+use phpseclib3\Crypt\Hash;
+use phpseclib3\Exception\BadDecryptionException;
+use phpseclib3\Exception\BadMethodCallException;
+use phpseclib3\Exception\BadModeException;
+use phpseclib3\Exception\InconsistentSetupException;
+use phpseclib3\Exception\InsufficientSetupException;
+use phpseclib3\Exception\LengthException;
+use phpseclib3\Exception\LogicException;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Exception\UnsupportedAlgorithmException;
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Math\BinaryField;
+use phpseclib3\Math\PrimeField;
+
+/**
+ * Base Class for all \phpseclib3\Crypt\* cipher classes
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ * @author  Hans-Juergen Petrich <petrich@tronic-media.com>
+ */
+abstract class SymmetricKey
+{
+    /**
+     * Encrypt / decrypt using the Counter mode.
+     *
+     * Set to -1 since that's what Crypt/Random.php uses to index the CTR mode.
+     *
+     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
+     */
+    public const MODE_CTR = -1;
+    /**
+     * Encrypt / decrypt using the Electronic Code Book mode.
+     *
+     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
+     */
+    public const MODE_ECB = 1;
+    /**
+     * Encrypt / decrypt using the Code Book Chaining mode.
+     *
+     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
+     */
+    public const MODE_CBC = 2;
+    /**
+     * Encrypt / decrypt using the Cipher Feedback mode.
+     *
+     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher_feedback_.28CFB.29
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
+     */
+    public const MODE_CFB = 3;
+    /**
+     * Encrypt / decrypt using the Cipher Feedback mode (8bit)
+     *
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
+     */
+    public const MODE_CFB8 = 7;
+    /**
+     * Encrypt / decrypt using the Output Feedback mode (8bit)
+     *
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
+     */
+    public const MODE_OFB8 = 8;
+    /**
+     * Encrypt / decrypt using the Output Feedback mode.
+     *
+     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Output_feedback_.28OFB.29
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
+     */
+    public const MODE_OFB = 4;
+    /**
+     * Encrypt / decrypt using Galois/Counter mode.
+     *
+     * @link https://en.wikipedia.org/wiki/Galois/Counter_Mode
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
+     */
+    public const MODE_GCM = 5;
+    /**
+     * Encrypt / decrypt using streaming mode.
+     *
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
+     */
+    public const MODE_STREAM = 6;
+
+    /**
+     * Mode Map
+     *
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
+     */
+    public const MODE_MAP = [
+        'ctr'    => self::MODE_CTR,
+        'ecb'    => self::MODE_ECB,
+        'cbc'    => self::MODE_CBC,
+        'cfb'    => self::MODE_CFB,
+        'cfb8'   => self::MODE_CFB8,
+        'ofb'    => self::MODE_OFB,
+        'ofb8'   => self::MODE_OFB8,
+        'gcm'    => self::MODE_GCM,
+        'stream' => self::MODE_STREAM,
+    ];
+
+    /**
+     * Base value for the internal implementation $engine switch
+     *
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
+     */
+    public const ENGINE_INTERNAL = 1;
+    /**
+     * Base value for the eval() implementation $engine switch
+     *
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
+     */
+    public const ENGINE_EVAL = 2;
+    /**
+     * Base value for the openssl implementation $engine switch
+     *
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
+     */
+    public const ENGINE_OPENSSL = 4;
+    /**
+     * Base value for the libsodium implementation $engine switch
+     *
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
+     */
+    public const ENGINE_LIBSODIUM = 5;
+    /**
+     * Base value for the openssl / gcm implementation $engine switch
+     *
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
+     */
+    public const ENGINE_OPENSSL_GCM = 6;
+
+    /**
+     * Engine Reverse Map
+     *
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::getEngine()
+     */
+    public const ENGINE_MAP = [
+        self::ENGINE_INTERNAL    => 'PHP',
+        self::ENGINE_EVAL        => 'Eval',
+        self::ENGINE_OPENSSL     => 'OpenSSL',
+        self::ENGINE_LIBSODIUM   => 'libsodium',
+        self::ENGINE_OPENSSL_GCM => 'OpenSSL (GCM)',
+    ];
+
+    /**
+     * The Encryption Mode
+     *
+     * @see self::__construct()
+     * @var int
+     */
+    protected $mode;
+
+    /**
+     * The Block Length of the block cipher
+     *
+     * @var int
+     */
+    protected $block_size = 16;
+
+    /**
+     * The Key
+     *
+     * @see self::setKey()
+     * @var string
+     */
+    protected $key = false;
+
+    /**
+     * HMAC Key
+     *
+     * @see self::setupGCM()
+     * @var null|string
+     */
+    private $hKey = null;
+
+    /**
+     * The Initialization Vector
+     *
+     * @see self::setIV()
+     * @var string
+     */
+    protected $iv = false;
+
+    /**
+     * A "sliding" Initialization Vector
+     *
+     * @see self::enableContinuousBuffer()
+     * @see self::clearBuffers()
+     * @var string
+     */
+    protected $encryptIV;
+
+    /**
+     * A "sliding" Initialization Vector
+     *
+     * @see self::enableContinuousBuffer()
+     * @see self::clearBuffers()
+     * @var string
+     */
+    protected $decryptIV;
+
+    /**
+     * Continuous Buffer status
+     *
+     * @see self::enableContinuousBuffer()
+     * @var bool
+     */
+    protected $continuousBuffer = false;
+
+    /**
+     * Encryption buffer for CTR, OFB and CFB modes
+     *
+     * @see self::encrypt()
+     * @see self::clearBuffers()
+     * @var array
+     */
+    protected $enbuffer;
+
+    /**
+     * Decryption buffer for CTR, OFB and CFB modes
+     *
+     * @see self::decrypt()
+     * @see self::clearBuffers()
+     * @var array
+     */
+    protected $debuffer;
+
+    /**
+     * Does internal cipher state need to be (re)initialized?
+     *
+     * @see self::setKey()
+     * @see self::setIV()
+     * @see self::disableContinuousBuffer()
+     * @var bool
+     */
+    protected $changed = true;
+
+    /**
+     * Does Eval engie need to be (re)initialized?
+     *
+     * @see self::setup()
+     * @var bool
+     */
+    protected $nonIVChanged = true;
+
+    /**
+     * Padding status
+     *
+     * @see self::enablePadding()
+     * @var bool
+     */
+    private $padding = true;
+
+    /**
+     * Is the mode one that is paddable?
+     *
+     * @see self::__construct()
+     * @var bool
+     */
+    private $paddable = false;
+
+    /**
+     * Holds which crypt engine internaly should be use,
+     * which will be determined automatically on __construct()
+     *
+     * Currently available $engines are:
+     * - self::ENGINE_LIBSODIUM   (very fast, php-extension: libsodium, extension_loaded('libsodium') required)
+     * - self::ENGINE_OPENSSL_GCM (very fast, php-extension: openssl, extension_loaded('openssl') required)
+     * - self::ENGINE_OPENSSL     (very fast, php-extension: openssl, extension_loaded('openssl') required)
+     * - self::ENGINE_EVAL        (medium, pure php-engine, no php-extension required)
+     * - self::ENGINE_INTERNAL    (slower, pure php-engine, no php-extension required)
+     *
+     * @see self::setEngine()
+     * @see self::encrypt()
+     * @see self::decrypt()
+     * @var int
+     */
+    protected $engine;
+
+    /**
+     * Holds the preferred crypt engine
+     *
+     * @see self::setEngine()
+     * @see self::setPreferredEngine()
+     * @var int
+     */
+    private $preferredEngine;
+
+    /**
+     * The openssl specific name of the cipher
+     *
+     * Only used if $engine == self::ENGINE_OPENSSL
+     *
+     * @link http://www.php.net/openssl-get-cipher-methods
+     * @var string
+     */
+    protected $cipher_name_openssl;
+
+    /**
+     * The openssl specific name of the cipher in ECB mode
+     *
+     * If OpenSSL does not support the mode we're trying to use (CTR)
+     * it can still be emulated with ECB mode.
+     *
+     * @link http://www.php.net/openssl-get-cipher-methods
+     * @var string
+     */
+    protected $cipher_name_openssl_ecb;
+
+    /**
+     * The default salt used by setPassword()
+     *
+     * @see self::setPassword()
+     * @var string
+     */
+    private $password_default_salt = 'phpseclib/salt';
+
+    /**
+     * The name of the performance-optimized callback function
+     *
+     * Used by encrypt() / decrypt()
+     * only if $engine == self::ENGINE_INTERNAL
+     *
+     * @see self::encrypt()
+     * @see self::decrypt()
+     * @see self::setupInlineCrypt()
+     * @var Callback
+     */
+    protected $inline_crypt;
+
+    /**
+     * If OpenSSL can be used in ECB but not in CTR we can emulate CTR
+     *
+     * @see self::openssl_ctr_process()
+     * @var bool
+     */
+    private $openssl_emulate_ctr = false;
+
+    /**
+     * Has the key length explicitly been set or should it be derived from the key, itself?
+     *
+     * @see self::setKeyLength()
+     * @var bool
+     */
+    protected $explicit_key_length = false;
+
+    /**
+     * Hash subkey for GHASH
+     *
+     * @see self::setupGCM()
+     * @see self::ghash()
+     * @var BinaryField\Integer
+     */
+    private $h;
+
+    /**
+     * Additional authenticated data
+     *
+     * @var string
+     */
+    protected $aad = '';
+
+    /**
+     * Authentication Tag produced after a round of encryption
+     *
+     * @var string
+     */
+    protected $newtag = false;
+
+    /**
+     * Authentication Tag to be verified during decryption
+     *
+     * @var string
+     */
+    protected $oldtag = false;
+
+    /**
+     * GCM Binary Field
+     *
+     * @see self::__construct()
+     * @see self::ghash()
+     * @var BinaryField
+     */
+    private static $gcmField;
+
+    /**
+     * Poly1305 Prime Field
+     *
+     * @see self::enablePoly1305()
+     * @see self::poly1305()
+     * @var PrimeField
+     */
+    private static $poly1305Field;
+
+    /**
+     * Poly1305 Key
+     *
+     * @see self::setPoly1305Key()
+     * @see self::poly1305()
+     * @var string
+     */
+    protected $poly1305Key;
+
+    /**
+     * Poly1305 Flag
+     *
+     * @see self::setPoly1305Key()
+     * @see self::enablePoly1305()
+     * @var boolean
+     */
+    protected $usePoly1305 = false;
+
+    /**
+     * The Original Initialization Vector
+     *
+     * GCM uses the nonce to build the IV but we want to be able to distinguish between nonce-derived
+     * IV's and user-set IV's
+     *
+     * @see self::setIV()
+     * @var string
+     */
+    private $origIV = false;
+
+    /**
+     * Nonce
+     *
+     * Only used with GCM. We could re-use setIV() but nonce's can be of a different length and
+     * toggling between GCM and other modes could be more complicated if we re-used setIV()
+     *
+     * @see self::setNonce()
+     * @var string
+     */
+    protected $nonce = false;
+
+    /**
+     * Default Constructor.
+     *
+     * $mode could be:
+     *
+     * - ecb
+     *
+     * - cbc
+     *
+     * - ctr
+     *
+     * - cfb
+     *
+     * - cfb8
+     *
+     * - ofb
+     *
+     * - ofb8
+     *
+     * - gcm
+     *
+     * @throws BadModeException if an invalid / unsupported mode is provided
+     */
+    public function __construct(string $mode)
+    {
+        $mode = strtolower($mode);
+        // necessary because of 5.6 compatibility; we can't do isset(self::MODE_MAP[$mode]) in 5.6
+        $map = self::MODE_MAP;
+        if (!isset($map[$mode])) {
+            throw new BadModeException('No valid mode has been specified');
+        }
+
+        $mode = self::MODE_MAP[$mode];
+
+        // $mode dependent settings
+        switch ($mode) {
+            case self::MODE_ECB:
+            case self::MODE_CBC:
+                $this->paddable = true;
+                break;
+            case self::MODE_CTR:
+            case self::MODE_CFB:
+            case self::MODE_CFB8:
+            case self::MODE_OFB:
+            case self::MODE_OFB8:
+            case self::MODE_STREAM:
+                $this->paddable = false;
+                break;
+            case self::MODE_GCM:
+                if ($this->block_size != 16) {
+                    throw new BadModeException('GCM is only valid for block ciphers with a block size of 128 bits');
+                }
+                if (!isset(self::$gcmField)) {
+                    self::$gcmField = new BinaryField(128, 7, 2, 1, 0);
+                }
+                $this->paddable = false;
+                break;
+            default:
+                throw new BadModeException('No valid mode has been specified');
+        }
+
+        $this->mode = $mode;
+
+        static::initialize_static_variables();
+    }
+
+    /**
+     * Initialize static variables
+     */
+    protected static function initialize_static_variables(): void
+    {
+    }
+
+    /**
+     * Sets the initialization vector.
+     *
+     * setIV() is not required when ecb or gcm modes are being used.
+     *
+     * {@internal Can be overwritten by a sub class, but does not have to be}
+     *
+     * @throws LengthException if the IV length isn't equal to the block size
+     * @throws BadMethodCallException if an IV is provided when one shouldn't be
+     */
+    public function setIV(string $iv): void
+    {
+        if ($this->mode == self::MODE_ECB) {
+            throw new BadMethodCallException('This mode does not require an IV.');
+        }
+
+        if ($this->mode == self::MODE_GCM) {
+            throw new BadMethodCallException('Use setNonce instead');
+        }
+
+        if (!$this->usesIV()) {
+            throw new BadMethodCallException('This algorithm does not use an IV.');
+        }
+
+        if (strlen($iv) != $this->block_size) {
+            throw new LengthException('Received initialization vector of size ' . strlen($iv) . ', but size ' . $this->block_size . ' is required');
+        }
+
+        $this->iv = $this->origIV = $iv;
+        $this->changed = true;
+    }
+
+    /**
+     * Enables Poly1305 mode.
+     *
+     * Once enabled Poly1305 cannot be disabled.
+     *
+     * @throws BadMethodCallException if Poly1305 is enabled whilst in GCM mode
+     */
+    public function enablePoly1305(): void
+    {
+        if ($this->mode == self::MODE_GCM) {
+            throw new BadMethodCallException('Poly1305 cannot be used in GCM mode');
+        }
+
+        $this->usePoly1305 = true;
+    }
+
+    /**
+     * Enables Poly1305 mode.
+     *
+     * Once enabled Poly1305 cannot be disabled. If $key is not passed then an attempt to call createPoly1305Key
+     * will be made.
+     *
+     * @param string|null $key optional
+     * @throws LengthException if the key isn't long enough
+     * @throws BadMethodCallException if Poly1305 is enabled whilst in GCM mode
+     */
+    public function setPoly1305Key(?string $key = null): void
+    {
+        if ($this->mode == self::MODE_GCM) {
+            throw new BadMethodCallException('Poly1305 cannot be used in GCM mode');
+        }
+
+        if (!is_string($key) || strlen($key) != 32) {
+            throw new LengthException('The Poly1305 key must be 32 bytes long (256 bits)');
+        }
+
+        if (!isset(self::$poly1305Field)) {
+            // 2^130-5
+            self::$poly1305Field = new PrimeField(new BigInteger('3fffffffffffffffffffffffffffffffb', 16));
+        }
+
+        $this->poly1305Key = $key;
+        $this->usePoly1305 = true;
+    }
+
+    /**
+     * Sets the nonce.
+     *
+     * setNonce() is only required when gcm is used
+     *
+     * @throws BadMethodCallException if an nonce is provided when one shouldn't be
+     */
+    public function setNonce(string $nonce): void
+    {
+        if ($this->mode != self::MODE_GCM) {
+            throw new BadMethodCallException('Nonces are only used in GCM mode.');
+        }
+
+        $this->nonce = $nonce;
+        $this->setEngine();
+    }
+
+    /**
+     * Sets additional authenticated data
+     *
+     * setAAD() is only used by gcm or in poly1305 mode
+     *
+     * @throws BadMethodCallException if mode isn't GCM or if poly1305 isn't being utilized
+     */
+    public function setAAD(string $aad): void
+    {
+        if ($this->mode != self::MODE_GCM && !$this->usePoly1305) {
+            throw new BadMethodCallException('Additional authenticated data is only utilized in GCM mode or with Poly1305');
+        }
+
+        $this->aad = $aad;
+    }
+
+    /**
+     * Returns whether or not the algorithm uses an IV
+     */
+    public function usesIV(): bool
+    {
+        return $this->mode != self::MODE_GCM && $this->mode != self::MODE_ECB;
+    }
+
+    /**
+     * Returns whether or not the algorithm uses a nonce
+     */
+    public function usesNonce(): bool
+    {
+        return $this->mode == self::MODE_GCM;
+    }
+
+    /**
+     * Returns the current key length in bits
+     */
+    public function getKeyLength(): int
+    {
+        return $this->key_length << 3;
+    }
+
+    /**
+     * Returns the current block length in bits
+     */
+    public function getBlockLength(): int
+    {
+        return $this->block_size << 3;
+    }
+
+    /**
+     * Returns the current block length in bytes
+     */
+    public function getBlockLengthInBytes(): int
+    {
+        return $this->block_size;
+    }
+
+    /**
+     * Sets the key length.
+     *
+     * Keys with explicitly set lengths need to be treated accordingly
+     */
+    public function setKeyLength(int $length): void
+    {
+        $this->explicit_key_length = $length >> 3;
+
+        if (is_string($this->key) && strlen($this->key) != $this->explicit_key_length) {
+            $this->key = false;
+            throw new InconsistentSetupException('Key has already been set and is not ' . $this->explicit_key_length . ' bytes long');
+        }
+    }
+
+    /**
+     * Sets the key.
+     *
+     * The min/max length(s) of the key depends on the cipher which is used.
+     * If the key not fits the length(s) of the cipher it will paded with null bytes
+     * up to the closest valid key length.  If the key is more than max length,
+     * we trim the excess bits.
+     *
+     * If the key is not explicitly set, it'll be assumed to be all null bytes.
+     *
+     * {@internal Could, but not must, extend by the child Crypt_* class}
+     */
+    public function setKey(string $key): void
+    {
+        if ($this->explicit_key_length !== false && strlen($key) != $this->explicit_key_length) {
+            throw new InconsistentSetupException('Key length has already been set to ' . $this->explicit_key_length . ' bytes and this key is ' . strlen($key) . ' bytes');
+        }
+
+        $this->key = $key;
+        $this->key_length = strlen($key);
+        $this->setEngine();
+    }
+
+    /**
+     * Sets the password.
+     *
+     * Depending on what $method is set to, setPassword()'s (optional) parameters are as follows:
+     *     {@link http://en.wikipedia.org/wiki/PBKDF2 pbkdf2} or pbkdf1:
+     *         $hash, $salt, $count, $dkLen
+     *
+     *         Where $hash (default = sha1) currently supports the following hashes: see: Crypt/Hash.php
+     *     {@link https://en.wikipedia.org/wiki/Bcrypt bcypt}:
+     *         $salt, $rounds, $keylen
+     *
+     *         This is a modified version of bcrypt used by OpenSSH.
+     *
+     * {@internal Could, but not must, extend by the child Crypt_* class}
+     *
+     * @param int|string ...$func_args
+     * @throws LengthException if pbkdf1 is being used and the derived key length exceeds the hash length
+     * @throws RuntimeException if bcrypt is being used and a salt isn't provided
+     * @see Crypt/Hash.php
+     */
+    public function setPassword(string $password, string $method = 'pbkdf2', ...$func_args): bool
+    {
+        $key = '';
+
+        $method = strtolower($method);
+        switch ($method) {
+            case 'bcrypt':
+                if (!isset($func_args[2])) {
+                    throw new RuntimeException('A salt must be provided for bcrypt to work');
+                }
+
+                $salt = $func_args[0];
+
+                $rounds = $func_args[1] ?? 16;
+                $keylen = $func_args[2] ?? $this->key_length;
+
+                $key = Blowfish::bcrypt_pbkdf($password, $salt, $keylen + $this->block_size, $rounds);
+
+                $this->setKey(substr($key, 0, $keylen));
+                $this->setIV(substr($key, $keylen));
+
+                return true;
+            case 'pkcs12': // from https://tools.ietf.org/html/rfc7292#appendix-B.2
+            case 'pbkdf1':
+            case 'pbkdf2':
+                // Hash function
+                $hash = isset($func_args[0]) ? strtolower($func_args[0]) : 'sha1';
+                $hashObj = new Hash();
+                $hashObj->setHash($hash);
+
+                // WPA and WPA2 use the SSID as the salt
+                $salt = $func_args[1] ?? $this->password_default_salt;
+
+                // RFC2898#section-4.2 uses 1,000 iterations by default
+                // WPA and WPA2 use 4,096.
+                $count = $func_args[2] ?? 1000;
+
+                // Keylength
+                if (isset($func_args[3])) {
+                    if ($func_args[3] <= 0) {
+                        throw new LengthException('Derived key length cannot be longer 0 or less');
+                    }
+                    $dkLen = $func_args[3];
+                } else {
+                    $key_length = $this->explicit_key_length !== false ? $this->explicit_key_length : $this->key_length;
+                    $dkLen = $method == 'pbkdf1' ? 2 * $key_length : $key_length;
+                }
+
+                switch (true) {
+                    case $method == 'pkcs12':
+                        /*
+                         In this specification, however, all passwords are created from
+                         BMPStrings with a NULL terminator.  This means that each character in
+                         the original BMPString is encoded in 2 bytes in big-endian format
+                         (most-significant byte first).  There are no Unicode byte order
+                         marks.  The 2 bytes produced from the last character in the BMPString
+                         are followed by 2 additional bytes with the value 0x00.
+
+                         -- https://tools.ietf.org/html/rfc7292#appendix-B.1
+                         */
+                        $password = "\0" . chunk_split($password, 1, "\0") . "\0";
+
+                        /*
+                         This standard specifies 3 different values for the ID byte mentioned
+                         above:
+
+                         1.  If ID=1, then the pseudorandom bits being produced are to be used
+                             as key material for performing encryption or decryption.
+
+                         2.  If ID=2, then the pseudorandom bits being produced are to be used
+                             as an IV (Initial Value) for encryption or decryption.
+
+                         3.  If ID=3, then the pseudorandom bits being produced are to be used
+                             as an integrity key for MACing.
+                         */
+                        // Construct a string, D (the "diversifier"), by concatenating v/8
+                        // copies of ID.
+                        $blockLength = $hashObj->getBlockLengthInBytes();
+                        $d1 = str_repeat(chr(1), $blockLength);
+                        $d2 = str_repeat(chr(2), $blockLength);
+                        $s = '';
+                        if (strlen($salt)) {
+                            while (strlen($s) < $blockLength) {
+                                $s .= $salt;
+                            }
+                        }
+                        $s = substr($s, 0, $blockLength);
+
+                        $p = '';
+                        if (strlen($password)) {
+                            while (strlen($p) < $blockLength) {
+                                $p .= $password;
+                            }
+                        }
+                        $p = substr($p, 0, $blockLength);
+
+                        $i = $s . $p;
+
+                        $this->setKey(self::pkcs12helper($dkLen, $hashObj, $i, $d1, $count));
+                        if ($this->usesIV()) {
+                            $this->setIV(self::pkcs12helper($this->block_size, $hashObj, $i, $d2, $count));
+                        }
+
+                        return true;
+                    case $method == 'pbkdf1':
+                        if ($dkLen > $hashObj->getLengthInBytes()) {
+                            throw new LengthException('Derived key length cannot be longer than the hash length');
+                        }
+                        $t = $password . $salt;
+                        for ($i = 0; $i < $count; ++$i) {
+                            $t = $hashObj->hash($t);
+                        }
+                        $key = substr($t, 0, $dkLen);
+
+                        $this->setKey(substr($key, 0, $dkLen >> 1));
+                        if ($this->usesIV()) {
+                            $this->setIV(substr($key, $dkLen >> 1));
+                        }
+
+                        return true;
+                    case !in_array($hash, hash_algos()):
+                        $i = 1;
+                        $hashObj->setKey($password);
+                        while (strlen($key) < $dkLen) {
+                            $f = $u = $hashObj->hash($salt . pack('N', $i++));
+                            for ($j = 2; $j <= $count; ++$j) {
+                                $u = $hashObj->hash($u);
+                                $f ^= $u;
+                            }
+                            $key .= $f;
+                        }
+                        $key = substr($key, 0, $dkLen);
+                        break;
+                    default:
+                        $key = hash_pbkdf2($hash, $password, $salt, $count, $dkLen, true);
+                }
+                break;
+            default:
+                throw new UnsupportedAlgorithmException($method . ' is not a supported password hashing method');
+        }
+
+        $this->setKey($key);
+
+        return true;
+    }
+
+    /**
+     * PKCS#12 KDF Helper Function
+     *
+     * As discussed here:
+     *
+     * {@link https://tools.ietf.org/html/rfc7292#appendix-B}
+     *
+     * @return string $a
+     * @see self::setPassword()
+     */
+    private static function pkcs12helper(int $n, Hash $hashObj, string $i, string $d, int $count): string
+    {
+        static $one;
+        if (!isset($one)) {
+            $one = new BigInteger(1);
+        }
+
+        $blockLength = $hashObj->getBlockLength() >> 3;
+
+        $c = ceil($n / $hashObj->getLengthInBytes());
+        $a = '';
+        for ($j = 1; $j <= $c; $j++) {
+            $ai = $d . $i;
+            for ($k = 0; $k < $count; $k++) {
+                $ai = $hashObj->hash($ai);
+            }
+            $b = '';
+            while (strlen($b) < $blockLength) {
+                $b .= $ai;
+            }
+            $b = substr($b, 0, $blockLength);
+            $b = new BigInteger($b, 256);
+            $newi = '';
+            for ($k = 0; $k < strlen($i); $k += $blockLength) {
+                $temp = substr($i, $k, $blockLength);
+                $temp = new BigInteger($temp, 256);
+                $temp->setPrecision($blockLength << 3);
+                $temp = $temp->add($b);
+                $temp = $temp->add($one);
+                $newi .= $temp->toBytes(false);
+            }
+            $i = $newi;
+            $a .= $ai;
+        }
+
+        return substr($a, 0, $n);
+    }
+
+    /**
+     * Encrypts a message.
+     *
+     * $plaintext will be padded with additional bytes such that it's length is a multiple of the block size. Other cipher
+     * implementations may or may not pad in the same manner.  Other common approaches to padding and the reasons why it's
+     * necessary are discussed in the following
+     * URL:
+     *
+     * {@link http://www.di-mgt.com.au/cryptopad.html http://www.di-mgt.com.au/cryptopad.html}
+     *
+     * An alternative to padding is to, separately, send the length of the file.  This is what SSH, in fact, does.
+     * strlen($plaintext) will still need to be a multiple of the block size, however, arbitrary values can be added to make it that
+     * length.
+     *
+     * {@internal Could, but not must, extend by the child Crypt_* class}
+     *
+     * @return string $ciphertext
+     * @see self::decrypt()
+     */
+    public function encrypt(string $plaintext): string
+    {
+        if ($this->paddable) {
+            $plaintext = $this->pad($plaintext);
+        }
+
+        $this->setup();
+
+        if ($this->mode == self::MODE_GCM) {
+            $oldIV = $this->iv;
+            Strings::increment_str($this->iv);
+            $cipher = new static('ctr');
+            $cipher->setKey($this->key);
+            $cipher->setIV($this->iv);
+            $ciphertext = $cipher->encrypt($plaintext);
+
+            $s = $this->ghash(
+                self::nullPad128($this->aad) .
+                self::nullPad128($ciphertext) .
+                self::len64($this->aad) .
+                self::len64($ciphertext)
+            );
+            $cipher->encryptIV = $this->iv = $this->encryptIV = $this->decryptIV = $oldIV;
+            $this->newtag = $cipher->encrypt($s);
+            return $ciphertext;
+        }
+
+        if (isset($this->poly1305Key)) {
+            $cipher = clone $this;
+            unset($cipher->poly1305Key);
+            $this->usePoly1305 = false;
+            $ciphertext = $cipher->encrypt($plaintext);
+            $this->newtag = $this->poly1305($ciphertext);
+            return $ciphertext;
+        }
+
+        if ($this->engine === self::ENGINE_OPENSSL) {
+            switch ($this->mode) {
+                case self::MODE_STREAM:
+                    return openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING);
+                case self::MODE_ECB:
+                    return openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING);
+                case self::MODE_CBC:
+                    $result = openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $this->encryptIV);
+                    if ($this->continuousBuffer) {
+                        $this->encryptIV = substr($result, -$this->block_size);
+                    }
+                    return $result;
+                case self::MODE_CTR:
+                    return $this->openssl_ctr_process($plaintext, $this->encryptIV, $this->enbuffer);
+                case self::MODE_CFB:
+                    // cfb loosely routines inspired by openssl's:
+                    // {@link http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1}
+                    $ciphertext = '';
+                    if ($this->continuousBuffer) {
+                        $iv = &$this->encryptIV;
+                        $pos = &$this->enbuffer['pos'];
+                    } else {
+                        $iv = $this->encryptIV;
+                        $pos = 0;
+                    }
+                    $len = strlen($plaintext);
+                    $i = 0;
+                    if ($pos) {
+                        $orig_pos = $pos;
+                        $max = $this->block_size - $pos;
+                        if ($len >= $max) {
+                            $i = $max;
+                            $len -= $max;
+                            $pos = 0;
+                        } else {
+                            $i = $len;
+                            $pos += $len;
+                            $len = 0;
+                        }
+                        // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
+                        $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
+                        $iv = substr_replace($iv, $ciphertext, $orig_pos, $i);
+                        $plaintext = substr($plaintext, $i);
+                    }
+
+                    $overflow = $len % $this->block_size;
+
+                    if ($overflow) {
+                        $ciphertext .= openssl_encrypt(substr($plaintext, 0, -$overflow) . str_repeat("\0", $this->block_size), $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $iv);
+                        $iv = Strings::pop($ciphertext, $this->block_size);
+
+                        $size = $len - $overflow;
+                        $block = $iv ^ substr($plaintext, -$overflow);
+                        $iv = substr_replace($iv, $block, 0, $overflow);
+                        $ciphertext .= $block;
+                        $pos = $overflow;
+                    } elseif ($len) {
+                        $ciphertext = openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $iv);
+                        $iv = substr($ciphertext, -$this->block_size);
+                    }
+
+                    return $ciphertext;
+                case self::MODE_CFB8:
+                    $ciphertext = openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $this->encryptIV);
+                    if ($this->continuousBuffer) {
+                        if (($len = strlen($ciphertext)) >= $this->block_size) {
+                            $this->encryptIV = substr($ciphertext, -$this->block_size);
+                        } else {
+                            $this->encryptIV = substr($this->encryptIV, $len - $this->block_size) . substr($ciphertext, -$len);
+                        }
+                    }
+                    return $ciphertext;
+                case self::MODE_OFB8:
+                    $ciphertext = '';
+                    $len = strlen($plaintext);
+                    $iv = $this->encryptIV;
+
+                    for ($i = 0; $i < $len; ++$i) {
+                        $xor = openssl_encrypt($iv, $this->cipher_name_openssl_ecb, $this->key, $this->openssl_options, $this->decryptIV);
+                        $ciphertext .= $plaintext[$i] ^ $xor;
+                        $iv = substr($iv, 1) . $xor[0];
+                    }
+
+                    if ($this->continuousBuffer) {
+                        $this->encryptIV = $iv;
+                    }
+                    break;
+                case self::MODE_OFB:
+                    return $this->openssl_ofb_process($plaintext, $this->encryptIV, $this->enbuffer);
+            }
+        }
+
+        if ($this->engine === self::ENGINE_EVAL) {
+            $inline = $this->inline_crypt;
+            return $inline('encrypt', $plaintext);
+        }
+
+        $buffer = &$this->enbuffer;
+        $block_size = $this->block_size;
+        $ciphertext = '';
+        switch ($this->mode) {
+            case self::MODE_ECB:
+                for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
+                    $ciphertext .= $this->encryptBlock(substr($plaintext, $i, $block_size));
+                }
+                break;
+            case self::MODE_CBC:
+                $xor = $this->encryptIV;
+                for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
+                    $block = substr($plaintext, $i, $block_size);
+                    $block = $this->encryptBlock($block ^ $xor);
+                    $xor = $block;
+                    $ciphertext .= $block;
+                }
+                if ($this->continuousBuffer) {
+                    $this->encryptIV = $xor;
+                }
+                break;
+            case self::MODE_CTR:
+                $xor = $this->encryptIV;
+                if (strlen($buffer['ciphertext'])) {
+                    for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
+                        $block = substr($plaintext, $i, $block_size);
+                        if (strlen($block) > strlen($buffer['ciphertext'])) {
+                            $buffer['ciphertext'] .= $this->encryptBlock($xor);
+                            Strings::increment_str($xor);
+                        }
+                        $key = Strings::shift($buffer['ciphertext'], $block_size);
+                        $ciphertext .= $block ^ $key;
+                    }
+                } else {
+                    for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
+                        $block = substr($plaintext, $i, $block_size);
+                        $key = $this->encryptBlock($xor);
+                        Strings::increment_str($xor);
+                        $ciphertext .= $block ^ $key;
+                    }
+                }
+                if ($this->continuousBuffer) {
+                    $this->encryptIV = $xor;
+                    if ($start = strlen($plaintext) % $block_size) {
+                        $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
+                    }
+                }
+                break;
+            case self::MODE_CFB:
+                // cfb loosely routines inspired by openssl's:
+                // {@link http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1}
+                if ($this->continuousBuffer) {
+                    $iv = &$this->encryptIV;
+                    $pos = &$buffer['pos'];
+                } else {
+                    $iv = $this->encryptIV;
+                    $pos = 0;
+                }
+                $len = strlen($plaintext);
+                $i = 0;
+                if ($pos) {
+                    $orig_pos = $pos;
+                    $max = $block_size - $pos;
+                    if ($len >= $max) {
+                        $i = $max;
+                        $len -= $max;
+                        $pos = 0;
+                    } else {
+                        $i = $len;
+                        $pos += $len;
+                        $len = 0;
+                    }
+                    // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
+                    $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
+                    $iv = substr_replace($iv, $ciphertext, $orig_pos, $i);
+                }
+                while ($len >= $block_size) {
+                    $iv = $this->encryptBlock($iv) ^ substr($plaintext, $i, $block_size);
+                    $ciphertext .= $iv;
+                    $len -= $block_size;
+                    $i += $block_size;
+                }
+                if ($len) {
+                    $iv = $this->encryptBlock($iv);
+                    $block = $iv ^ substr($plaintext, $i);
+                    $iv = substr_replace($iv, $block, 0, $len);
+                    $ciphertext .= $block;
+                    $pos = $len;
+                }
+                break;
+            case self::MODE_CFB8:
+                $ciphertext = '';
+                $len = strlen($plaintext);
+                $iv = $this->encryptIV;
+
+                for ($i = 0; $i < $len; ++$i) {
+                    $ciphertext .= ($c = $plaintext[$i] ^ $this->encryptBlock($iv));
+                    $iv = substr($iv, 1) . $c;
+                }
+
+                if ($this->continuousBuffer) {
+                    if ($len >= $block_size) {
+                        $this->encryptIV = substr($ciphertext, -$block_size);
+                    } else {
+                        $this->encryptIV = substr($this->encryptIV, $len - $block_size) . substr($ciphertext, -$len);
+                    }
+                }
+                break;
+            case self::MODE_OFB8:
+                $ciphertext = '';
+                $len = strlen($plaintext);
+                $iv = $this->encryptIV;
+
+                for ($i = 0; $i < $len; ++$i) {
+                    $xor = $this->encryptBlock($iv);
+                    $ciphertext .= $plaintext[$i] ^ $xor;
+                    $iv = substr($iv, 1) . $xor[0];
+                }
+
+                if ($this->continuousBuffer) {
+                    $this->encryptIV = $iv;
+                }
+                break;
+            case self::MODE_OFB:
+                $xor = $this->encryptIV;
+                if (strlen($buffer['xor'])) {
+                    for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
+                        $block = substr($plaintext, $i, $block_size);
+                        if (strlen($block) > strlen($buffer['xor'])) {
+                            $xor = $this->encryptBlock($xor);
+                            $buffer['xor'] .= $xor;
+                        }
+                        $key = Strings::shift($buffer['xor'], $block_size);
+                        $ciphertext .= $block ^ $key;
+                    }
+                } else {
+                    for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
+                        $xor = $this->encryptBlock($xor);
+                        $ciphertext .= substr($plaintext, $i, $block_size) ^ $xor;
+                    }
+                    $key = $xor;
+                }
+                if ($this->continuousBuffer) {
+                    $this->encryptIV = $xor;
+                    if ($start = strlen($plaintext) % $block_size) {
+                        $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                    }
+                }
+                break;
+            case self::MODE_STREAM:
+                $ciphertext = $this->encryptBlock($plaintext);
+                break;
+        }
+
+        return $ciphertext;
+    }
+
+    /**
+     * Decrypts a message.
+     *
+     * If strlen($ciphertext) is not a multiple of the block size, null bytes will be added to the end of the string until
+     * it is.
+     *
+     * {@internal Could, but not must, extend by the child Crypt_* class}
+     *
+     * @return string $plaintext
+     * @throws LengthException if we're inside a block cipher and the ciphertext length is not a multiple of the block size
+     * @see self::encrypt()
+     */
+    public function decrypt(string $ciphertext): string
+    {
+        if ($this->paddable && strlen($ciphertext) % $this->block_size) {
+            throw new LengthException('The ciphertext length (' . strlen($ciphertext) . ') needs to be a multiple of the block size (' . $this->block_size . ')');
+        }
+        $this->setup();
+
+        if ($this->mode == self::MODE_GCM || isset($this->poly1305Key)) {
+            if ($this->oldtag === false) {
+                throw new InsufficientSetupException('Authentication Tag has not been set');
+            }
+
+            if (isset($this->poly1305Key)) {
+                $newtag = $this->poly1305($ciphertext);
+            } else {
+                $oldIV = $this->iv;
+                Strings::increment_str($this->iv);
+                $cipher = new static('ctr');
+                $cipher->setKey($this->key);
+                $cipher->setIV($this->iv);
+                $plaintext = $cipher->decrypt($ciphertext);
+
+                $s = $this->ghash(
+                    self::nullPad128($this->aad) .
+                    self::nullPad128($ciphertext) .
+                    self::len64($this->aad) .
+                    self::len64($ciphertext)
+                );
+                $cipher->encryptIV = $this->iv = $this->encryptIV = $this->decryptIV = $oldIV;
+                $newtag = $cipher->encrypt($s);
+            }
+            if ($this->oldtag != substr($newtag, 0, strlen($newtag))) {
+                $cipher = clone $this;
+                unset($cipher->poly1305Key);
+                $this->usePoly1305 = false;
+                $plaintext = $cipher->decrypt($ciphertext);
+                $this->oldtag = false;
+                throw new BadDecryptionException('Derived authentication tag and supplied authentication tag do not match');
+            }
+            $this->oldtag = false;
+            return $plaintext;
+        }
+
+        if ($this->engine === self::ENGINE_OPENSSL) {
+            switch ($this->mode) {
+                case self::MODE_STREAM:
+                    $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING);
+                    break;
+                case self::MODE_ECB:
+                    $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING);
+                    break;
+                case self::MODE_CBC:
+                    $offset = $this->block_size;
+                    $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $this->decryptIV);
+                    if ($this->continuousBuffer) {
+                        $this->decryptIV = substr($ciphertext, -$offset, $this->block_size);
+                    }
+                    break;
+                case self::MODE_CTR:
+                    $plaintext = $this->openssl_ctr_process($ciphertext, $this->decryptIV, $this->debuffer);
+                    break;
+                case self::MODE_CFB:
+                    // cfb loosely routines inspired by openssl's:
+                    // {@link http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1}
+                    $plaintext = '';
+                    if ($this->continuousBuffer) {
+                        $iv = &$this->decryptIV;
+                        $pos = &$this->debuffer['pos'];
+                    } else {
+                        $iv = $this->decryptIV;
+                        $pos = 0;
+                    }
+                    $len = strlen($ciphertext);
+                    $i = 0;
+                    if ($pos) {
+                        $orig_pos = $pos;
+                        $max = $this->block_size - $pos;
+                        if ($len >= $max) {
+                            $i = $max;
+                            $len -= $max;
+                            $pos = 0;
+                        } else {
+                            $i = $len;
+                            $pos += $len;
+                            $len = 0;
+                        }
+                        // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $this->blocksize
+                        $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
+                        $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
+                        $ciphertext = substr($ciphertext, $i);
+                    }
+                    $overflow = $len % $this->block_size;
+                    if ($overflow) {
+                        $plaintext .= openssl_decrypt(substr($ciphertext, 0, -$overflow), $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $iv);
+                        if ($len - $overflow) {
+                            $iv = substr($ciphertext, -$overflow - $this->block_size, -$overflow);
+                        }
+                        $iv = openssl_encrypt(str_repeat("\0", $this->block_size), $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $iv);
+                        $plaintext .= $iv ^ substr($ciphertext, -$overflow);
+                        $iv = substr_replace($iv, substr($ciphertext, -$overflow), 0, $overflow);
+                        $pos = $overflow;
+                    } elseif ($len) {
+                        $plaintext .= openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $iv);
+                        $iv = substr($ciphertext, -$this->block_size);
+                    }
+                    break;
+                case self::MODE_CFB8:
+                    $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $this->decryptIV);
+                    if ($this->continuousBuffer) {
+                        if (($len = strlen($ciphertext)) >= $this->block_size) {
+                            $this->decryptIV = substr($ciphertext, -$this->block_size);
+                        } else {
+                            $this->decryptIV = substr($this->decryptIV, $len - $this->block_size) . substr($ciphertext, -$len);
+                        }
+                    }
+                    break;
+                case self::MODE_OFB8:
+                    $plaintext = '';
+                    $len = strlen($ciphertext);
+                    $iv = $this->decryptIV;
+
+                    for ($i = 0; $i < $len; ++$i) {
+                        $xor = openssl_encrypt($iv, $this->cipher_name_openssl_ecb, $this->key, $this->openssl_options, $this->decryptIV);
+                        $plaintext .= $ciphertext[$i] ^ $xor;
+                        $iv = substr($iv, 1) . $xor[0];
+                    }
+
+                    if ($this->continuousBuffer) {
+                        $this->decryptIV = $iv;
+                    }
+                    break;
+                case self::MODE_OFB:
+                    $plaintext = $this->openssl_ofb_process($ciphertext, $this->decryptIV, $this->debuffer);
+            }
+
+            return $this->paddable ? $this->unpad($plaintext) : $plaintext;
+        }
+
+        if ($this->engine === self::ENGINE_EVAL) {
+            $inline = $this->inline_crypt;
+            return $inline('decrypt', $ciphertext);
+        }
+
+        $block_size = $this->block_size;
+
+        $buffer = &$this->debuffer;
+        $plaintext = '';
+        switch ($this->mode) {
+            case self::MODE_ECB:
+                for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
+                    $plaintext .= $this->decryptBlock(substr($ciphertext, $i, $block_size));
+                }
+                break;
+            case self::MODE_CBC:
+                $xor = $this->decryptIV;
+                for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
+                    $block = substr($ciphertext, $i, $block_size);
+                    $plaintext .= $this->decryptBlock($block) ^ $xor;
+                    $xor = $block;
+                }
+                if ($this->continuousBuffer) {
+                    $this->decryptIV = $xor;
+                }
+                break;
+            case self::MODE_CTR:
+                $xor = $this->decryptIV;
+                if (strlen($buffer['ciphertext'])) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
+                        $block = substr($ciphertext, $i, $block_size);
+                        if (strlen($block) > strlen($buffer['ciphertext'])) {
+                            $buffer['ciphertext'] .= $this->encryptBlock($xor);
+                            Strings::increment_str($xor);
+                        }
+                        $key = Strings::shift($buffer['ciphertext'], $block_size);
+                        $plaintext .= $block ^ $key;
+                    }
+                } else {
+                    for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
+                        $block = substr($ciphertext, $i, $block_size);
+                        $key = $this->encryptBlock($xor);
+                        Strings::increment_str($xor);
+                        $plaintext .= $block ^ $key;
+                    }
+                }
+                if ($this->continuousBuffer) {
+                    $this->decryptIV = $xor;
+                    if ($start = strlen($ciphertext) % $block_size) {
+                        $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
+                    }
+                }
+                break;
+            case self::MODE_CFB:
+                if ($this->continuousBuffer) {
+                    $iv = &$this->decryptIV;
+                    $pos = &$buffer['pos'];
+                } else {
+                    $iv = $this->decryptIV;
+                    $pos = 0;
+                }
+                $len = strlen($ciphertext);
+                $i = 0;
+                if ($pos) {
+                    $orig_pos = $pos;
+                    $max = $block_size - $pos;
+                    if ($len >= $max) {
+                        $i = $max;
+                        $len -= $max;
+                        $pos = 0;
+                    } else {
+                        $i = $len;
+                        $pos += $len;
+                        $len = 0;
+                    }
+                    // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
+                    $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
+                    $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
+                }
+                while ($len >= $block_size) {
+                    $iv = $this->encryptBlock($iv);
+                    $cb = substr($ciphertext, $i, $block_size);
+                    $plaintext .= $iv ^ $cb;
+                    $iv = $cb;
+                    $len -= $block_size;
+                    $i += $block_size;
+                }
+                if ($len) {
+                    $iv = $this->encryptBlock($iv);
+                    $plaintext .= $iv ^ substr($ciphertext, $i);
+                    $iv = substr_replace($iv, substr($ciphertext, $i), 0, $len);
+                    $pos = $len;
+                }
+                break;
+            case self::MODE_CFB8:
+                $plaintext = '';
+                $len = strlen($ciphertext);
+                $iv = $this->decryptIV;
+
+                for ($i = 0; $i < $len; ++$i) {
+                    $plaintext .= $ciphertext[$i] ^ $this->encryptBlock($iv);
+                    $iv = substr($iv, 1) . $ciphertext[$i];
+                }
+
+                if ($this->continuousBuffer) {
+                    if ($len >= $block_size) {
+                        $this->decryptIV = substr($ciphertext, -$block_size);
+                    } else {
+                        $this->decryptIV = substr($this->decryptIV, $len - $block_size) . substr($ciphertext, -$len);
+                    }
+                }
+                break;
+            case self::MODE_OFB8:
+                $plaintext = '';
+                $len = strlen($ciphertext);
+                $iv = $this->decryptIV;
+
+                for ($i = 0; $i < $len; ++$i) {
+                    $xor = $this->encryptBlock($iv);
+                    $plaintext .= $ciphertext[$i] ^ $xor;
+                    $iv = substr($iv, 1) . $xor[0];
+                }
+
+                if ($this->continuousBuffer) {
+                    $this->decryptIV = $iv;
+                }
+                break;
+            case self::MODE_OFB:
+                $xor = $this->decryptIV;
+                if (strlen($buffer['xor'])) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
+                        $block = substr($ciphertext, $i, $block_size);
+                        if (strlen($block) > strlen($buffer['xor'])) {
+                            $xor = $this->encryptBlock($xor);
+                            $buffer['xor'] .= $xor;
+                        }
+                        $key = Strings::shift($buffer['xor'], $block_size);
+                        $plaintext .= $block ^ $key;
+                    }
+                } else {
+                    for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
+                        $xor = $this->encryptBlock($xor);
+                        $plaintext .= substr($ciphertext, $i, $block_size) ^ $xor;
+                    }
+                    $key = $xor;
+                }
+                if ($this->continuousBuffer) {
+                    $this->decryptIV = $xor;
+                    if ($start = strlen($ciphertext) % $block_size) {
+                        $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                    }
+                }
+                break;
+            case self::MODE_STREAM:
+                $plaintext = $this->decryptBlock($ciphertext);
+                break;
+        }
+        return $this->paddable ? $this->unpad($plaintext) : $plaintext;
+    }
+
+    /**
+     * Get the authentication tag
+     *
+     * Only used in GCM or Poly1305 mode
+     *
+     * @param int $length optional
+     * @return string
+     * @throws LengthException if $length isn't of a sufficient length
+     * @throws RuntimeException if GCM mode isn't being used
+     * @see self::encrypt()
+     */
+    public function getTag(int $length = 16)
+    {
+        if ($this->mode != self::MODE_GCM && !$this->usePoly1305) {
+            throw new BadMethodCallException('Authentication tags are only utilized in GCM mode or with Poly1305');
+        }
+
+        if ($this->newtag === false) {
+            throw new BadMethodCallException('A tag can only be returned after a round of encryption has been performed');
+        }
+
+        // the tag is 128-bits. it can't be greater than 16 bytes because that's bigger than the tag is. if it
+        // were 0 you might as well be doing CTR and less than 4 provides minimal security that could be trivially
+        // easily brute forced.
+        // see https://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38d.pdf#page=36
+        // for more info
+        if ($length < 4 || $length > 16) {
+            throw new LengthException('The authentication tag must be between 4 and 16 bytes long');
+        }
+
+        return $length == 16 ?
+            $this->newtag :
+            substr($this->newtag, 0, $length);
+    }
+
+    /**
+     * Sets the authentication tag
+     *
+     * Only used in GCM mode
+     *
+     * @throws LengthException if $length isn't of a sufficient length
+     * @throws RuntimeException if GCM mode isn't being used
+     * @see self::decrypt()
+     */
+    public function setTag(string $tag): void
+    {
+        if ($this->usePoly1305 && !isset($this->poly1305Key) && method_exists($this, 'createPoly1305Key')) {
+            $this->createPoly1305Key();
+        }
+
+        if ($this->mode != self::MODE_GCM && !$this->usePoly1305) {
+            throw new BadMethodCallException('Authentication tags are only utilized in GCM mode or with Poly1305');
+        }
+
+        $length = strlen($tag);
+        if ($length < 4 || $length > 16) {
+            throw new LengthException('The authentication tag must be between 4 and 16 bytes long');
+        }
+        $this->oldtag = $tag;
+    }
+
+    /**
+     * OpenSSL CTR Processor
+     *
+     * PHP's OpenSSL bindings do not operate in continuous mode so we'll wrap around it. Since the keystream
+     * for CTR is the same for both encrypting and decrypting this function is re-used by both SymmetricKey::encrypt()
+     * and SymmetricKey::decrypt(). Also, OpenSSL doesn't implement CTR for all of it's symmetric ciphers so this
+     * function will emulate CTR with ECB when necessary.
+     *
+     * @see self::encrypt()
+     * @see self::decrypt()
+     */
+    private function openssl_ctr_process(string $plaintext, string &$encryptIV, array &$buffer): string
+    {
+        $ciphertext = '';
+
+        $block_size = $this->block_size;
+        $key = $this->key;
+
+        if ($this->openssl_emulate_ctr) {
+            $xor = $encryptIV;
+            if (strlen($buffer['ciphertext'])) {
+                for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
+                    $block = substr($plaintext, $i, $block_size);
+                    if (strlen($block) > strlen($buffer['ciphertext'])) {
+                        $buffer['ciphertext'] .= openssl_encrypt($xor, $this->cipher_name_openssl_ecb, $key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING);
+                    }
+                    Strings::increment_str($xor);
+                    $otp = Strings::shift($buffer['ciphertext'], $block_size);
+                    $ciphertext .= $block ^ $otp;
+                }
+            } else {
+                for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
+                    $block = substr($plaintext, $i, $block_size);
+                    $otp = openssl_encrypt($xor, $this->cipher_name_openssl_ecb, $key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING);
+                    Strings::increment_str($xor);
+                    $ciphertext .= $block ^ $otp;
+                }
+            }
+            if ($this->continuousBuffer) {
+                $encryptIV = $xor;
+                if ($start = strlen($plaintext) % $block_size) {
+                    $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
+                }
+            }
+
+            return $ciphertext;
+        }
+
+        if (strlen($buffer['ciphertext'])) {
+            $ciphertext = $plaintext ^ Strings::shift($buffer['ciphertext'], strlen($plaintext));
+            $plaintext = substr($plaintext, strlen($ciphertext));
+
+            if (!strlen($plaintext)) {
+                return $ciphertext;
+            }
+        }
+
+        $overflow = strlen($plaintext) % $block_size;
+        if ($overflow) {
+            $plaintext2 = Strings::pop($plaintext, $overflow); // ie. trim $plaintext to a multiple of $block_size and put rest of $plaintext in $plaintext2
+            $encrypted = openssl_encrypt($plaintext . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $encryptIV);
+            $temp = Strings::pop($encrypted, $block_size);
+            $ciphertext .= $encrypted . ($plaintext2 ^ $temp);
+            if ($this->continuousBuffer) {
+                $buffer['ciphertext'] = substr($temp, $overflow);
+                $encryptIV = $temp;
+            }
+        } elseif (!strlen($buffer['ciphertext'])) {
+            $ciphertext .= openssl_encrypt($plaintext . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $encryptIV);
+            $temp = Strings::pop($ciphertext, $block_size);
+            if ($this->continuousBuffer) {
+                $encryptIV = $temp;
+            }
+        }
+        if ($this->continuousBuffer) {
+            $encryptIV = openssl_decrypt($encryptIV, $this->cipher_name_openssl_ecb, $key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING);
+            if ($overflow) {
+                Strings::increment_str($encryptIV);
+            }
+        }
+
+        return $ciphertext;
+    }
+
+    /**
+     * OpenSSL OFB Processor
+     *
+     * PHP's OpenSSL bindings do not operate in continuous mode so we'll wrap around it. Since the keystream
+     * for OFB is the same for both encrypting and decrypting this function is re-used by both SymmetricKey::encrypt()
+     * and SymmetricKey::decrypt().
+     *
+     * @see self::encrypt()
+     * @see self::decrypt()
+     */
+    private function openssl_ofb_process(string $plaintext, string &$encryptIV, array &$buffer): string
+    {
+        if (strlen($buffer['xor'])) {
+            $ciphertext = $plaintext ^ $buffer['xor'];
+            $buffer['xor'] = substr($buffer['xor'], strlen($ciphertext));
+            $plaintext = substr($plaintext, strlen($ciphertext));
+        } else {
+            $ciphertext = '';
+        }
+
+        $block_size = $this->block_size;
+
+        $len = strlen($plaintext);
+        $key = $this->key;
+        $overflow = $len % $block_size;
+
+        if (strlen($plaintext)) {
+            if ($overflow) {
+                $ciphertext .= openssl_encrypt(substr($plaintext, 0, -$overflow) . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $encryptIV);
+                $xor = Strings::pop($ciphertext, $block_size);
+                if ($this->continuousBuffer) {
+                    $encryptIV = $xor;
+                }
+                $ciphertext .= Strings::shift($xor, $overflow) ^ substr($plaintext, -$overflow);
+                if ($this->continuousBuffer) {
+                    $buffer['xor'] = $xor;
+                }
+            } else {
+                $ciphertext = openssl_encrypt($plaintext, $this->cipher_name_openssl, $key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $encryptIV);
+                if ($this->continuousBuffer) {
+                    $encryptIV = substr($ciphertext, -$block_size) ^ substr($plaintext, -$block_size);
+                }
+            }
+        }
+
+        return $ciphertext;
+    }
+
+    /**
+     * phpseclib <-> OpenSSL Mode Mapper
+     *
+     * May need to be overwritten by classes extending this one in some cases
+     */
+    protected function openssl_translate_mode(): ?string
+    {
+        switch ($this->mode) {
+            case self::MODE_ECB:
+                return 'ecb';
+            case self::MODE_CBC:
+                return 'cbc';
+            case self::MODE_CTR:
+            case self::MODE_GCM:
+                return 'ctr';
+            case self::MODE_CFB:
+                return 'cfb';
+            case self::MODE_CFB8:
+                return 'cfb8';
+            case self::MODE_OFB:
+                return 'ofb';
+        }
+        return null;
+    }
+
+    /**
+     * Pad "packets".
+     *
+     * Block ciphers working by encrypting between their specified [$this->]block_size at a time
+     * If you ever need to encrypt or decrypt something that isn't of the proper length, it becomes necessary to
+     * pad the input so that it is of the proper length.
+     *
+     * Padding is enabled by default.  Sometimes, however, it is undesirable to pad strings.  Such is the case in SSH,
+     * where "packets" are padded with random bytes before being encrypted.  Unpad these packets and you risk stripping
+     * away characters that shouldn't be stripped away. (SSH knows how many bytes are added because the length is
+     * transmitted separately)
+     *
+     * @see self::disablePadding()
+     */
+    public function enablePadding(): void
+    {
+        $this->padding = true;
+    }
+
+    /**
+     * Do not pad packets.
+     *
+     * @see self::enablePadding()
+     */
+    public function disablePadding(): void
+    {
+        $this->padding = false;
+    }
+
+    /**
+     * Treat consecutive "packets" as if they are a continuous buffer.
+     *
+     * Say you have a 32-byte plaintext $plaintext.  Using the default behavior, the two following code snippets
+     * will yield different outputs:
+     *
+     * <code>
+     *    echo $rijndael->encrypt(substr($plaintext,  0, 16));
+     *    echo $rijndael->encrypt(substr($plaintext, 16, 16));
+     * </code>
+     * <code>
+     *    echo $rijndael->encrypt($plaintext);
+     * </code>
+     *
+     * The solution is to enable the continuous buffer.  Although this will resolve the above discrepancy, it creates
+     * another, as demonstrated with the following:
+     *
+     * <code>
+     *    $rijndael->encrypt(substr($plaintext, 0, 16));
+     *    echo $rijndael->decrypt($rijndael->encrypt(substr($plaintext, 16, 16)));
+     * </code>
+     * <code>
+     *    echo $rijndael->decrypt($rijndael->encrypt(substr($plaintext, 16, 16)));
+     * </code>
+     *
+     * With the continuous buffer disabled, these would yield the same output.  With it enabled, they yield different
+     * outputs.  The reason is due to the fact that the initialization vector's change after every encryption /
+     * decryption round when the continuous buffer is enabled.  When it's disabled, they remain constant.
+     *
+     * Put another way, when the continuous buffer is enabled, the state of the \phpseclib3\Crypt\*() object changes after each
+     * encryption / decryption round, whereas otherwise, it'd remain constant.  For this reason, it's recommended that
+     * continuous buffers not be used.  They do offer better security and are, in fact, sometimes required (SSH uses them),
+     * however, they are also less intuitive and more likely to cause you problems.
+     *
+     * {@internal Could, but not must, extend by the child Crypt_* class}
+     *
+     * @see self::disableContinuousBuffer()
+     */
+    public function enableContinuousBuffer(): void
+    {
+        if ($this->mode == self::MODE_ECB) {
+            return;
+        }
+
+        if ($this->mode == self::MODE_GCM) {
+            throw new BadMethodCallException('This mode does not run in continuous mode');
+        }
+
+        $this->continuousBuffer = true;
+
+        $this->setEngine();
+    }
+
+    /**
+     * Treat consecutive packets as if they are a discontinuous buffer.
+     *
+     * The default behavior.
+     *
+     * {@internal Could, but not must, extend by the child Crypt_* class}
+     *
+     * @see self::enableContinuousBuffer()
+     */
+    public function disableContinuousBuffer(): void
+    {
+        if ($this->mode == self::MODE_ECB) {
+            return;
+        }
+        if (!$this->continuousBuffer) {
+            return;
+        }
+
+        $this->continuousBuffer = false;
+
+        $this->setEngine();
+    }
+
+    /**
+     * Test for engine validity
+     *
+     * @see self::__construct()
+     */
+    protected function isValidEngineHelper(int $engine): bool
+    {
+        switch ($engine) {
+            case self::ENGINE_OPENSSL:
+                $this->openssl_emulate_ctr = false;
+                $result = $this->cipher_name_openssl &&
+                          extension_loaded('openssl');
+                if (!$result) {
+                    return false;
+                }
+
+                $methods = openssl_get_cipher_methods();
+                if (in_array($this->cipher_name_openssl, $methods)) {
+                    return true;
+                }
+                // not all of openssl's symmetric cipher's support ctr. for those
+                // that don't we'll emulate it
+                switch ($this->mode) {
+                    case self::MODE_CTR:
+                        if (in_array($this->cipher_name_openssl_ecb, $methods)) {
+                            $this->openssl_emulate_ctr = true;
+                            return true;
+                        }
+                }
+                return false;
+            case self::ENGINE_EVAL:
+                return method_exists($this, 'setupInlineCrypt');
+            case self::ENGINE_INTERNAL:
+                return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Test for engine validity
+     *
+          * @see self::__construct()
+     */
+    public function isValidEngine(string $engine): bool
+    {
+        static $reverseMap;
+        if (!isset($reverseMap)) {
+            $reverseMap = array_map('strtolower', self::ENGINE_MAP);
+            $reverseMap = array_flip($reverseMap);
+        }
+        $engine = strtolower($engine);
+        if (!isset($reverseMap[$engine])) {
+            return false;
+        }
+
+        return $this->isValidEngineHelper($reverseMap[$engine]);
+    }
+
+    /**
+     * Sets the preferred crypt engine
+     *
+     * Currently, $engine could be:
+     *
+     * - libsodium[very fast]
+     *
+     * - OpenSSL  [very fast]
+     *
+     * - Eval     [slow]
+     *
+     * - PHP      [slowest]
+     *
+     * If the preferred crypt engine is not available the fastest available one will be used
+     *
+     * @see self::__construct()
+     */
+    public function setPreferredEngine(string $engine): void
+    {
+        static $reverseMap;
+        if (!isset($reverseMap)) {
+            $reverseMap = array_map('strtolower', self::ENGINE_MAP);
+            $reverseMap = array_flip($reverseMap);
+        }
+        $engine = is_string($engine) ? strtolower($engine) : '';
+        $this->preferredEngine = $reverseMap[$engine] ?? self::ENGINE_LIBSODIUM;
+
+        $this->setEngine();
+    }
+
+    /**
+     * Returns the engine currently being utilized
+     *
+     * @see self::setEngine()
+     */
+    public function getEngine(): string
+    {
+        return self::ENGINE_MAP[$this->engine];
+    }
+
+    /**
+     * Sets the engine as appropriate
+     *
+     * @see self::__construct()
+     */
+    protected function setEngine(): void
+    {
+        $this->engine = null;
+
+        $candidateEngines = [
+            self::ENGINE_LIBSODIUM,
+            self::ENGINE_OPENSSL_GCM,
+            self::ENGINE_OPENSSL,
+            self::ENGINE_EVAL,
+        ];
+        if (isset($this->preferredEngine)) {
+            $temp = [$this->preferredEngine];
+            $candidateEngines = array_merge(
+                $temp,
+                array_diff($candidateEngines, $temp)
+            );
+        }
+        foreach ($candidateEngines as $engine) {
+            if ($this->isValidEngineHelper($engine)) {
+                $this->engine = $engine;
+                break;
+            }
+        }
+        if (!$this->engine) {
+            $this->engine = self::ENGINE_INTERNAL;
+        }
+
+        $this->changed = $this->nonIVChanged = true;
+    }
+
+    /**
+     * Encrypts a block
+     *
+     * Note: Must be extended by the child \phpseclib3\Crypt\* class
+     */
+    abstract protected function encryptBlock(string $in): string;
+
+    /**
+     * Decrypts a block
+     *
+     * Note: Must be extended by the child \phpseclib3\Crypt\* class
+     */
+    abstract protected function decryptBlock(string $in): string;
+
+    /**
+     * Setup the key (expansion)
+     *
+     * Only used if $engine == self::ENGINE_INTERNAL
+     *
+     * Note: Must extend by the child \phpseclib3\Crypt\* class
+     *
+     * @see self::setup()
+     */
+    abstract protected function setupKey();
+
+    /**
+     * Setup the self::ENGINE_INTERNAL $engine
+     *
+     * (re)init, if necessary, the internal cipher $engine and flush all $buffers
+     * Used (only) if $engine == self::ENGINE_INTERNAL
+     *
+     * _setup() will be called each time if $changed === true
+     * typically this happens when using one or more of following public methods:
+     *
+     * - setKey()
+     *
+     * - setIV()
+     *
+     * - disableContinuousBuffer()
+     *
+     * - First run of encrypt() / decrypt() with no init-settings
+     *
+     * {@internal setup() is always called before en/decryption.}
+     *
+     * {@internal Could, but not must, extend by the child Crypt_* class}
+     *
+     * @see self::setKey()
+     * @see self::setIV()
+     * @see self::disableContinuousBuffer()
+     */
+    protected function setup(): void
+    {
+        if (!$this->changed) {
+            return;
+        }
+
+        $this->changed = false;
+
+        if ($this->usePoly1305 && !isset($this->poly1305Key) && method_exists($this, 'createPoly1305Key')) {
+            $this->createPoly1305Key();
+        }
+
+        $this->enbuffer = $this->debuffer = ['ciphertext' => '', 'xor' => '', 'pos' => 0, 'enmcrypt_init' => true];
+        //$this->newtag = $this->oldtag = false;
+
+        if ($this->usesNonce()) {
+            if ($this->nonce === false) {
+                throw new InsufficientSetupException('No nonce has been defined');
+            }
+            if ($this->mode == self::MODE_GCM && !in_array($this->engine, [self::ENGINE_LIBSODIUM, self::ENGINE_OPENSSL_GCM])) {
+                $this->setupGCM();
+            }
+        } else {
+            $this->iv = $this->origIV;
+        }
+
+        if ($this->iv === false && !in_array($this->mode, [self::MODE_STREAM, self::MODE_ECB])) {
+            if ($this->mode != self::MODE_GCM || !in_array($this->engine, [self::ENGINE_LIBSODIUM, self::ENGINE_OPENSSL_GCM])) {
+                throw new InsufficientSetupException('No IV has been defined');
+            }
+        }
+
+        if ($this->key === false) {
+            throw new InsufficientSetupException('No key has been defined');
+        }
+
+        $this->encryptIV = $this->decryptIV = $this->iv;
+
+        switch ($this->engine) {
+            case self::ENGINE_INTERNAL:
+                $this->setupKey();
+                break;
+            case self::ENGINE_EVAL:
+                if ($this->nonIVChanged) {
+                    $this->setupKey();
+                    $this->setupInlineCrypt();
+                }
+        }
+
+        $this->nonIVChanged = false;
+    }
+
+    /**
+     * Pads a string
+     *
+     * Pads a string using the RSA PKCS padding standards so that its length is a multiple of the blocksize.
+     * $this->block_size - (strlen($text) % $this->block_size) bytes are added, each of which is equal to
+     * chr($this->block_size - (strlen($text) % $this->block_size)
+     *
+     * If padding is disabled and $text is not a multiple of the blocksize, the string will be padded regardless
+     * and padding will, hence forth, be enabled.
+     *
+     * @throws LengthException if padding is disabled and the plaintext's length is not a multiple of the block size
+     * @see self::unpad()
+     */
+    protected function pad(string $text): string
+    {
+        $length = strlen($text);
+
+        if (!$this->padding) {
+            if ($length % $this->block_size == 0) {
+                return $text;
+            } else {
+                throw new LengthException("The plaintext's length ($length) is not a multiple of the block size ({$this->block_size}). Try enabling padding.");
+            }
+        }
+
+        $pad = $this->block_size - ($length % $this->block_size);
+
+        return str_pad($text, $length + $pad, chr($pad));
+    }
+
+    /**
+     * Unpads a string.
+     *
+     * If padding is enabled and the reported padding length is invalid the encryption key will be assumed to be wrong
+     * and false will be returned.
+     *
+     * @throws LengthException if the ciphertext's length is not a multiple of the block size
+     * @see self::pad()
+     */
+    protected function unpad(string $text): string
+    {
+        if (!$this->padding) {
+            return $text;
+        }
+
+        $length = ord($text[-1]);
+
+        if (!$length || $length > $this->block_size) {
+            throw new BadDecryptionException("The ciphertext has an invalid padding length ($length) compared to the block size ({$this->block_size})");
+        }
+
+        return substr($text, 0, -$length);
+    }
+
+    /**
+     * Setup the performance-optimized function for de/encrypt()
+     *
+     * Stores the created (or existing) callback function-name
+     * in $this->inline_crypt
+     *
+     * Internally for phpseclib developers:
+     *
+     *     _setupInlineCrypt() would be called only if:
+     *
+     *     - $this->engine === self::ENGINE_EVAL
+     *
+     *     - each time on _setup(), after(!) _setupKey()
+     *
+     *
+     *     This ensures that _setupInlineCrypt() has always a
+     *     full ready2go initializated internal cipher $engine state
+     *     where, for example, the keys already expanded,
+     *     keys/block_size calculated and such.
+     *
+     *     It is, each time if called, the responsibility of _setupInlineCrypt():
+     *
+     *     - to set $this->inline_crypt to a valid and fully working callback function
+     *       as a (faster) replacement for encrypt() / decrypt()
+     *
+     *     - NOT to create unlimited callback functions (for memory reasons!)
+     *       no matter how often _setupInlineCrypt() would be called. At some
+     *       point of amount they must be generic re-useable.
+     *
+     *     - the code of _setupInlineCrypt() it self,
+     *       and the generated callback code,
+     *       must be, in following order:
+     *       - 100% safe
+     *       - 100% compatible to encrypt()/decrypt()
+     *       - using only php5+ features/lang-constructs/php-extensions if
+     *         compatibility (down to php4) or fallback is provided
+     *       - readable/maintainable/understandable/commented and... not-cryptic-styled-code :-)
+     *       - >= 10% faster than encrypt()/decrypt() [which is, by the way,
+     *         the reason for the existence of _setupInlineCrypt() :-)]
+     *       - memory-nice
+     *       - short (as good as possible)
+     *
+     * Note: - _setupInlineCrypt() is using _createInlineCryptFunction() to create the full callback function code.
+     *       - In case of using inline crypting, _setupInlineCrypt() must extend by the child \phpseclib3\Crypt\* class.
+     *       - The following variable names are reserved:
+     *         - $_*  (all variable names prefixed with an underscore)
+     *         - $self (object reference to it self. Do not use $this, but $self instead)
+     *         - $in (the content of $in has to en/decrypt by the generated code)
+     *       - The callback function should not use the 'return' statement, but en/decrypt'ing the content of $in only
+     *
+     * {@internal If a Crypt_* class providing inline crypting it must extend _setupInlineCrypt()}
+     *
+     * @see self::setup()
+     * @see self::createInlineCryptFunction()
+     * @see self::encrypt()
+     * @see self::decrypt()
+     */
+    //protected function setupInlineCrypt();
+
+    /**
+     * Creates the performance-optimized function for en/decrypt()
+     *
+     * Internally for phpseclib developers:
+     *
+     *    _createInlineCryptFunction():
+     *
+     *    - merge the $cipher_code [setup'ed by _setupInlineCrypt()]
+     *      with the current [$this->]mode of operation code
+     *
+     *    - create the $inline function, which called by encrypt() / decrypt()
+     *      as its replacement to speed up the en/decryption operations.
+     *
+     *    - return the name of the created $inline callback function
+     *
+     *    - used to speed up en/decryption
+     *
+     *
+     *
+     *    The main reason why can speed up things [up to 50%] this way are:
+     *
+     *    - using variables more effective then regular.
+     *      (ie no use of expensive arrays but integers $k_0, $k_1 ...
+     *      or even, for example, the pure $key[] values hardcoded)
+     *
+     *    - avoiding 1000's of function calls of ie _encryptBlock()
+     *      but inlining the crypt operations.
+     *      in the mode of operation for() loop.
+     *
+     *    - full loop unroll the (sometimes key-dependent) rounds
+     *      avoiding this way ++$i counters and runtime-if's etc...
+     *
+     *    The basic code architectur of the generated $inline en/decrypt()
+     *    lambda function, in pseudo php, is:
+     *
+     *    <code>
+     *    +----------------------------------------------------------------------------------------------+
+     *    | callback $inline = create_function:                                                          |
+     *    | lambda_function_0001_crypt_ECB($action, $text)                                               |
+     *    | {                                                                                            |
+     *    |     INSERT PHP CODE OF:                                                                      |
+     *    |     $cipher_code['init_crypt'];                  // general init code.                       |
+     *    |                                                  // ie: $sbox'es declarations used for       |
+     *    |                                                  //     encrypt and decrypt'ing.             |
+     *    |                                                                                              |
+     *    |     switch ($action) {                                                                       |
+     *    |         case 'encrypt':                                                                      |
+     *    |             INSERT PHP CODE OF:                                                              |
+     *    |             $cipher_code['init_encrypt'];       // encrypt sepcific init code.               |
+     *    |                                                    ie: specified $key or $box                |
+     *    |                                                        declarations for encrypt'ing.         |
+     *    |                                                                                              |
+     *    |             foreach ($ciphertext) {                                                          |
+     *    |                 $in = $block_size of $ciphertext;                                            |
+     *    |                                                                                              |
+     *    |                 INSERT PHP CODE OF:                                                          |
+     *    |                 $cipher_code['encrypt_block'];  // encrypt's (string) $in, which is always:  |
+     *    |                                                 // strlen($in) == $this->block_size          |
+     *    |                                                 // here comes the cipher algorithm in action |
+     *    |                                                 // for encryption.                           |
+     *    |                                                 // $cipher_code['encrypt_block'] has to      |
+     *    |                                                 // encrypt the content of the $in variable   |
+     *    |                                                                                              |
+     *    |                 $plaintext .= $in;                                                           |
+     *    |             }                                                                                |
+     *    |             return $plaintext;                                                               |
+     *    |                                                                                              |
+     *    |         case 'decrypt':                                                                      |
+     *    |             INSERT PHP CODE OF:                                                              |
+     *    |             $cipher_code['init_decrypt'];       // decrypt sepcific init code                |
+     *    |                                                    ie: specified $key or $box                |
+     *    |                                                        declarations for decrypt'ing.         |
+     *    |             foreach ($plaintext) {                                                           |
+     *    |                 $in = $block_size of $plaintext;                                             |
+     *    |                                                                                              |
+     *    |                 INSERT PHP CODE OF:                                                          |
+     *    |                 $cipher_code['decrypt_block'];  // decrypt's (string) $in, which is always   |
+     *    |                                                 // strlen($in) == $this->block_size          |
+     *    |                                                 // here comes the cipher algorithm in action |
+     *    |                                                 // for decryption.                           |
+     *    |                                                 // $cipher_code['decrypt_block'] has to      |
+     *    |                                                 // decrypt the content of the $in variable   |
+     *    |                 $ciphertext .= $in;                                                          |
+     *    |             }                                                                                |
+     *    |             return $ciphertext;                                                              |
+     *    |     }                                                                                        |
+     *    | }                                                                                            |
+     *    +----------------------------------------------------------------------------------------------+
+     *    </code>
+     *
+     *    See also the \phpseclib3\Crypt\*::_setupInlineCrypt()'s for
+     *    productive inline $cipher_code's how they works.
+     *
+     *    Structure of:
+     *    <code>
+     *    $cipher_code = [
+     *        'init_crypt'    => (string) '', // optional
+     *        'init_encrypt'  => (string) '', // optional
+     *        'init_decrypt'  => (string) '', // optional
+     *        'encrypt_block' => (string) '', // required
+     *        'decrypt_block' => (string) ''  // required
+     *    ];
+     *    </code>
+     *
+     * @see self::decrypt()
+     * @see self::setupInlineCrypt()
+     * @see self::encrypt()
+     */
+    protected function createInlineCryptFunction(array $cipher_code): \Closure
+    {
+        $block_size = $this->block_size;
+
+        // optional
+        $init_crypt    = $cipher_code['init_crypt']    ?? '';
+        $init_encrypt  = $cipher_code['init_encrypt']  ?? '';
+        $init_decrypt  = $cipher_code['init_decrypt']  ?? '';
+        // required
+        $encrypt_block = $cipher_code['encrypt_block'];
+        $decrypt_block = $cipher_code['decrypt_block'];
+
+        // Generating mode of operation inline code,
+        // merged with the $cipher_code algorithm
+        // for encrypt- and decryption.
+        switch ($this->mode) {
+            case self::MODE_ECB:
+                $encrypt = $init_encrypt . '
+                    $_ciphertext = "";
+                    $_plaintext_len = strlen($_text);
+
+                    for ($_i = 0; $_i < $_plaintext_len; $_i+= ' . $block_size . ') {
+                        $in = substr($_text, $_i, ' . $block_size . ');
+                        ' . $encrypt_block . '
+                        $_ciphertext.= $in;
+                    }
+
+                    return $_ciphertext;
+                    ';
+
+                $decrypt = $init_decrypt . '
+                    $_plaintext = "";
+                    $_text = str_pad($_text, strlen($_text) + (' . $block_size . ' - strlen($_text) % ' . $block_size . ') % ' . $block_size . ', chr(0));
+                    $_ciphertext_len = strlen($_text);
+
+                    for ($_i = 0; $_i < $_ciphertext_len; $_i+= ' . $block_size . ') {
+                        $in = substr($_text, $_i, ' . $block_size . ');
+                        ' . $decrypt_block . '
+                        $_plaintext.= $in;
+                    }
+
+                    return $this->unpad($_plaintext);
+                    ';
+                break;
+            case self::MODE_CTR:
+                $encrypt = $init_encrypt . '
+                    $_ciphertext = "";
+                    $_plaintext_len = strlen($_text);
+                    $_xor = $this->encryptIV;
+                    $_buffer = &$this->enbuffer;
+                    if (strlen($_buffer["ciphertext"])) {
+                        for ($_i = 0; $_i < $_plaintext_len; $_i+= ' . $block_size . ') {
+                            $_block = substr($_text, $_i, ' . $block_size . ');
+                            if (strlen($_block) > strlen($_buffer["ciphertext"])) {
+                                $in = $_xor;
+                                ' . $encrypt_block . '
+                                \phpseclib3\Common\Functions\Strings::increment_str($_xor);
+                                $_buffer["ciphertext"].= $in;
+                            }
+                            $_key = \phpseclib3\Common\Functions\Strings::shift($_buffer["ciphertext"], ' . $block_size . ');
+                            $_ciphertext.= $_block ^ $_key;
+                        }
+                    } else {
+                        for ($_i = 0; $_i < $_plaintext_len; $_i+= ' . $block_size . ') {
+                            $_block = substr($_text, $_i, ' . $block_size . ');
+                            $in = $_xor;
+                            ' . $encrypt_block . '
+                            \phpseclib3\Common\Functions\Strings::increment_str($_xor);
+                            $_key = $in;
+                            $_ciphertext.= $_block ^ $_key;
+                        }
+                    }
+                    if ($this->continuousBuffer) {
+                        $this->encryptIV = $_xor;
+                        if ($_start = $_plaintext_len % ' . $block_size . ') {
+                            $_buffer["ciphertext"] = substr($_key, $_start) . $_buffer["ciphertext"];
+                        }
+                    }
+
+                    return $_ciphertext;
+                ';
+
+                $decrypt = $init_encrypt . '
+                    $_plaintext = "";
+                    $_ciphertext_len = strlen($_text);
+                    $_xor = $this->decryptIV;
+                    $_buffer = &$this->debuffer;
+
+                    if (strlen($_buffer["ciphertext"])) {
+                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= ' . $block_size . ') {
+                            $_block = substr($_text, $_i, ' . $block_size . ');
+                            if (strlen($_block) > strlen($_buffer["ciphertext"])) {
+                                $in = $_xor;
+                                ' . $encrypt_block . '
+                                \phpseclib3\Common\Functions\Strings::increment_str($_xor);
+                                $_buffer["ciphertext"].= $in;
+                            }
+                            $_key = \phpseclib3\Common\Functions\Strings::shift($_buffer["ciphertext"], ' . $block_size . ');
+                            $_plaintext.= $_block ^ $_key;
+                        }
+                    } else {
+                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= ' . $block_size . ') {
+                            $_block = substr($_text, $_i, ' . $block_size . ');
+                            $in = $_xor;
+                            ' . $encrypt_block . '
+                            \phpseclib3\Common\Functions\Strings::increment_str($_xor);
+                            $_key = $in;
+                            $_plaintext.= $_block ^ $_key;
+                        }
+                    }
+                    if ($this->continuousBuffer) {
+                        $this->decryptIV = $_xor;
+                        if ($_start = $_ciphertext_len % ' . $block_size . ') {
+                            $_buffer["ciphertext"] = substr($_key, $_start) . $_buffer["ciphertext"];
+                        }
+                    }
+
+                    return $_plaintext;
+                    ';
+                break;
+            case self::MODE_CFB:
+                $encrypt = $init_encrypt . '
+                    $_ciphertext = "";
+                    $_buffer = &$this->enbuffer;
+
+                    if ($this->continuousBuffer) {
+                        $_iv = &$this->encryptIV;
+                        $_pos = &$_buffer["pos"];
+                    } else {
+                        $_iv = $this->encryptIV;
+                        $_pos = 0;
+                    }
+                    $_len = strlen($_text);
+                    $_i = 0;
+                    if ($_pos) {
+                        $_orig_pos = $_pos;
+                        $_max = ' . $block_size . ' - $_pos;
+                        if ($_len >= $_max) {
+                            $_i = $_max;
+                            $_len-= $_max;
+                            $_pos = 0;
+                        } else {
+                            $_i = $_len;
+                            $_pos+= $_len;
+                            $_len = 0;
+                        }
+                        $_ciphertext = substr($_iv, $_orig_pos) ^ $_text;
+                        $_iv = substr_replace($_iv, $_ciphertext, $_orig_pos, $_i);
+                    }
+                    while ($_len >= ' . $block_size . ') {
+                        $in = $_iv;
+                        ' . $encrypt_block . ';
+                        $_iv = $in ^ substr($_text, $_i, ' . $block_size . ');
+                        $_ciphertext.= $_iv;
+                        $_len-= ' . $block_size . ';
+                        $_i+= ' . $block_size . ';
+                    }
+                    if ($_len) {
+                        $in = $_iv;
+                        ' . $encrypt_block . '
+                        $_iv = $in;
+                        $_block = $_iv ^ substr($_text, $_i);
+                        $_iv = substr_replace($_iv, $_block, 0, $_len);
+                        $_ciphertext.= $_block;
+                        $_pos = $_len;
+                    }
+                    return $_ciphertext;
+                ';
+
+                $decrypt = $init_encrypt . '
+                    $_plaintext = "";
+                    $_buffer = &$this->debuffer;
+
+                    if ($this->continuousBuffer) {
+                        $_iv = &$this->decryptIV;
+                        $_pos = &$_buffer["pos"];
+                    } else {
+                        $_iv = $this->decryptIV;
+                        $_pos = 0;
+                    }
+                    $_len = strlen($_text);
+                    $_i = 0;
+                    if ($_pos) {
+                        $_orig_pos = $_pos;
+                        $_max = ' . $block_size . ' - $_pos;
+                        if ($_len >= $_max) {
+                            $_i = $_max;
+                            $_len-= $_max;
+                            $_pos = 0;
+                        } else {
+                            $_i = $_len;
+                            $_pos+= $_len;
+                            $_len = 0;
+                        }
+                        $_plaintext = substr($_iv, $_orig_pos) ^ $_text;
+                        $_iv = substr_replace($_iv, substr($_text, 0, $_i), $_orig_pos, $_i);
+                    }
+                    while ($_len >= ' . $block_size . ') {
+                        $in = $_iv;
+                        ' . $encrypt_block . '
+                        $_iv = $in;
+                        $cb = substr($_text, $_i, ' . $block_size . ');
+                        $_plaintext.= $_iv ^ $cb;
+                        $_iv = $cb;
+                        $_len-= ' . $block_size . ';
+                        $_i+= ' . $block_size . ';
+                    }
+                    if ($_len) {
+                        $in = $_iv;
+                        ' . $encrypt_block . '
+                        $_iv = $in;
+                        $_plaintext.= $_iv ^ substr($_text, $_i);
+                        $_iv = substr_replace($_iv, substr($_text, $_i), 0, $_len);
+                        $_pos = $_len;
+                    }
+
+                    return $_plaintext;
+                    ';
+                break;
+            case self::MODE_CFB8:
+                $encrypt = $init_encrypt . '
+                    $_ciphertext = "";
+                    $_len = strlen($_text);
+                    $_iv = $this->encryptIV;
+
+                    for ($_i = 0; $_i < $_len; ++$_i) {
+                        $in = $_iv;
+                        ' . $encrypt_block . '
+                        $_ciphertext .= ($_c = $_text[$_i] ^ $in);
+                        $_iv = substr($_iv, 1) . $_c;
+                    }
+
+                    if ($this->continuousBuffer) {
+                        if ($_len >= ' . $block_size . ') {
+                            $this->encryptIV = substr($_ciphertext, -' . $block_size . ');
+                        } else {
+                            $this->encryptIV = substr($this->encryptIV, $_len - ' . $block_size . ') . substr($_ciphertext, -$_len);
+                        }
+                    }
+
+                    return $_ciphertext;
+                    ';
+                $decrypt = $init_encrypt . '
+                    $_plaintext = "";
+                    $_len = strlen($_text);
+                    $_iv = $this->decryptIV;
+
+                    for ($_i = 0; $_i < $_len; ++$_i) {
+                        $in = $_iv;
+                        ' . $encrypt_block . '
+                        $_plaintext .= $_text[$_i] ^ $in;
+                        $_iv = substr($_iv, 1) . $_text[$_i];
+                    }
+
+                    if ($this->continuousBuffer) {
+                        if ($_len >= ' . $block_size . ') {
+                            $this->decryptIV = substr($_text, -' . $block_size . ');
+                        } else {
+                            $this->decryptIV = substr($this->decryptIV, $_len - ' . $block_size . ') . substr($_text, -$_len);
+                        }
+                    }
+
+                    return $_plaintext;
+                    ';
+                break;
+            case self::MODE_OFB8:
+                $encrypt = $init_encrypt . '
+                    $_ciphertext = "";
+                    $_len = strlen($_text);
+                    $_iv = $this->encryptIV;
+
+                    for ($_i = 0; $_i < $_len; ++$_i) {
+                        $in = $_iv;
+                        ' . $encrypt_block . '
+                        $_ciphertext.= $_text[$_i] ^ $in;
+                        $_iv = substr($_iv, 1) . $in[0];
+                    }
+
+                    if ($this->continuousBuffer) {
+                        $this->encryptIV = $_iv;
+                    }
+
+                    return $_ciphertext;
+                    ';
+                $decrypt = $init_encrypt . '
+                    $_plaintext = "";
+                    $_len = strlen($_text);
+                    $_iv = $this->decryptIV;
+
+                    for ($_i = 0; $_i < $_len; ++$_i) {
+                        $in = $_iv;
+                        ' . $encrypt_block . '
+                        $_plaintext.= $_text[$_i] ^ $in;
+                        $_iv = substr($_iv, 1) . $in[0];
+                    }
+
+                    if ($this->continuousBuffer) {
+                        $this->decryptIV = $_iv;
+                    }
+
+                    return $_plaintext;
+                    ';
+                break;
+            case self::MODE_OFB:
+                $encrypt = $init_encrypt . '
+                    $_ciphertext = "";
+                    $_plaintext_len = strlen($_text);
+                    $_xor = $this->encryptIV;
+                    $_buffer = &$this->enbuffer;
+
+                    if (strlen($_buffer["xor"])) {
+                        for ($_i = 0; $_i < $_plaintext_len; $_i+= ' . $block_size . ') {
+                            $_block = substr($_text, $_i, ' . $block_size . ');
+                            if (strlen($_block) > strlen($_buffer["xor"])) {
+                                $in = $_xor;
+                                ' . $encrypt_block . '
+                                $_xor = $in;
+                                $_buffer["xor"].= $_xor;
+                            }
+                            $_key = \phpseclib3\Common\Functions\Strings::shift($_buffer["xor"], ' . $block_size . ');
+                            $_ciphertext.= $_block ^ $_key;
+                        }
+                    } else {
+                        for ($_i = 0; $_i < $_plaintext_len; $_i+= ' . $block_size . ') {
+                            $in = $_xor;
+                            ' . $encrypt_block . '
+                            $_xor = $in;
+                            $_ciphertext.= substr($_text, $_i, ' . $block_size . ') ^ $_xor;
+                        }
+                        $_key = $_xor;
+                    }
+                    if ($this->continuousBuffer) {
+                        $this->encryptIV = $_xor;
+                        if ($_start = $_plaintext_len % ' . $block_size . ') {
+                             $_buffer["xor"] = substr($_key, $_start) . $_buffer["xor"];
+                        }
+                    }
+                    return $_ciphertext;
+                    ';
+
+                $decrypt = $init_encrypt . '
+                    $_plaintext = "";
+                    $_ciphertext_len = strlen($_text);
+                    $_xor = $this->decryptIV;
+                    $_buffer = &$this->debuffer;
+
+                    if (strlen($_buffer["xor"])) {
+                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= ' . $block_size . ') {
+                            $_block = substr($_text, $_i, ' . $block_size . ');
+                            if (strlen($_block) > strlen($_buffer["xor"])) {
+                                $in = $_xor;
+                                ' . $encrypt_block . '
+                                $_xor = $in;
+                                $_buffer["xor"].= $_xor;
+                            }
+                            $_key = \phpseclib3\Common\Functions\Strings::shift($_buffer["xor"], ' . $block_size . ');
+                            $_plaintext.= $_block ^ $_key;
+                        }
+                    } else {
+                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= ' . $block_size . ') {
+                            $in = $_xor;
+                            ' . $encrypt_block . '
+                            $_xor = $in;
+                            $_plaintext.= substr($_text, $_i, ' . $block_size . ') ^ $_xor;
+                        }
+                        $_key = $_xor;
+                    }
+                    if ($this->continuousBuffer) {
+                        $this->decryptIV = $_xor;
+                        if ($_start = $_ciphertext_len % ' . $block_size . ') {
+                             $_buffer["xor"] = substr($_key, $_start) . $_buffer["xor"];
+                        }
+                    }
+                    return $_plaintext;
+                    ';
+                break;
+            case self::MODE_STREAM:
+                $encrypt = $init_encrypt . '
+                    $_ciphertext = "";
+                    ' . $encrypt_block . '
+                    return $_ciphertext;
+                    ';
+                $decrypt = $init_decrypt . '
+                    $_plaintext = "";
+                    ' . $decrypt_block . '
+                    return $_plaintext;
+                    ';
+                break;
+            // case self::MODE_CBC:
+            default:
+                $encrypt = $init_encrypt . '
+                    $_ciphertext = "";
+                    $_plaintext_len = strlen($_text);
+
+                    $in = $this->encryptIV;
+
+                    for ($_i = 0; $_i < $_plaintext_len; $_i+= ' . $block_size . ') {
+                        $in = substr($_text, $_i, ' . $block_size . ') ^ $in;
+                        ' . $encrypt_block . '
+                        $_ciphertext.= $in;
+                    }
+
+                    if ($this->continuousBuffer) {
+                        $this->encryptIV = $in;
+                    }
+
+                    return $_ciphertext;
+                    ';
+
+                $decrypt = $init_decrypt . '
+                    $_plaintext = "";
+                    $_text = str_pad($_text, strlen($_text) + (' . $block_size . ' - strlen($_text) % ' . $block_size . ') % ' . $block_size . ', chr(0));
+                    $_ciphertext_len = strlen($_text);
+
+                    $_iv = $this->decryptIV;
+
+                    for ($_i = 0; $_i < $_ciphertext_len; $_i+= ' . $block_size . ') {
+                        $in = $_block = substr($_text, $_i, ' . $block_size . ');
+                        ' . $decrypt_block . '
+                        $_plaintext.= $in ^ $_iv;
+                        $_iv = $_block;
+                    }
+
+                    if ($this->continuousBuffer) {
+                        $this->decryptIV = $_iv;
+                    }
+
+                    return $this->unpad($_plaintext);
+                    ';
+                break;
+        }
+
+        // Before discrediting this, please read the following:
+        // @see https://github.com/phpseclib/phpseclib/issues/1293
+        // @see https://github.com/phpseclib/phpseclib/pull/1143
+
+        /** @var \Closure $func */
+        $func = eval(<<<PHP
+            return function (string \$_action, string \$_text): string
+            {
+                {$init_crypt}
+                if (\$_action === 'encrypt') {
+                    {$encrypt}
+                } else {
+                    {$decrypt}
+                }
+            };
+            PHP
+        );
+
+        $bindedClosure = \Closure::bind($func, $this, static::class);
+        if ($bindedClosure instanceof \Closure) {
+            return $bindedClosure;
+        }
+        throw new LogicException('\Closure::bind() failed.');
+    }
+
+    /**
+     * Sets up GCM parameters
+     *
+     * See steps 1-2 of https://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38d.pdf#page=23
+     * for more info
+     */
+    private function setupGCM(): void
+    {
+        // don't keep on re-calculating $this->h
+        if (!$this->h || $this->hKey != $this->key) {
+            $cipher = new static('ecb');
+            $cipher->setKey($this->key);
+            $cipher->disablePadding();
+
+            $this->h = self::$gcmField->newInteger(
+                Strings::switchEndianness($cipher->encrypt("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"))
+            );
+            $this->hKey = $this->key;
+        }
+
+        if (strlen($this->nonce) == 12) {
+            $this->iv = $this->nonce . "\0\0\0\1";
+        } else {
+            $this->iv = $this->ghash(
+                self::nullPad128($this->nonce) . str_repeat("\0", 8) . self::len64($this->nonce)
+            );
+        }
+    }
+
+    /**
+     * Performs GHASH operation
+     *
+     * See https://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38d.pdf#page=20
+     * for more info
+     *
+     * @see self::decrypt()
+          * @see self::encrypt()
+     */
+    private function ghash(string $x): string
+    {
+        $h = $this->h;
+        $y = ["\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"];
+        $x = str_split($x, 16);
+        $n = 0;
+        // the switchEndianness calls are necessary because the multiplication algorithm in BinaryField/Integer
+        // interprets strings as polynomials in big endian order whereas in GCM they're interpreted in little
+        // endian order per https://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38d.pdf#page=19.
+        // big endian order is what binary field elliptic curves use per http://www.secg.org/sec1-v2.pdf#page=18.
+
+        // we could switchEndianness here instead of in the while loop but doing so in the while loop seems like it
+        // might be slightly more performant
+        //$x = Strings::switchEndianness($x);
+        foreach ($x as $xn) {
+            $xn = Strings::switchEndianness($xn);
+            $t = $y[$n] ^ $xn;
+            $temp = self::$gcmField->newInteger($t);
+            $y[++$n] = $temp->multiply($h)->toBytes();
+            $y[$n] = substr($y[$n], 1);
+        }
+        $y[$n] = Strings::switchEndianness($y[$n]);
+        return $y[$n];
+    }
+
+    /**
+     * Returns the bit length of a string in a packed format
+     *
+     * @see self::setupGCM()
+     * @see self::decrypt()
+          * @see self::encrypt()
+     */
+    private static function len64(string $str): string
+    {
+        return "\0\0\0\0" . pack('N', 8 * strlen($str));
+    }
+
+    /**
+     * NULL pads a string to be a multiple of 128
+     *
+     * @see self::setupGCM()
+     * @see self::decrypt()
+          * @see self::encrypt()
+     */
+    protected static function nullPad128(string $str): string
+    {
+        $len = strlen($str);
+        return $str . str_repeat("\0", 16 * ((int) ceil($len / 16)) - $len);
+    }
+
+    /**
+     * Calculates Poly1305 MAC
+     *
+     * On my system ChaCha20, with libsodium, takes 0.5s. With this custom Poly1305 implementation
+     * it takes 1.2s.
+     *
+     *@see self::decrypt()
+          * @see self::encrypt()
+     */
+    protected function poly1305(string $text): string
+    {
+        $s = $this->poly1305Key; // strlen($this->poly1305Key) == 32
+        $r = Strings::shift($s, 16);
+        $r = strrev($r);
+        $r &= "\x0f\xff\xff\xfc\x0f\xff\xff\xfc\x0f\xff\xff\xfc\x0f\xff\xff\xff";
+        $s = strrev($s);
+
+        $r = self::$poly1305Field->newInteger(new BigInteger($r, 256));
+        $s = self::$poly1305Field->newInteger(new BigInteger($s, 256));
+        $a = self::$poly1305Field->newInteger(new BigInteger());
+
+        $blocks = str_split($text, 16);
+        foreach ($blocks as $block) {
+            $n = strrev($block . chr(1));
+            $n = self::$poly1305Field->newInteger(new BigInteger($n, 256));
+            $a = $a->add($n);
+            $a = $a->multiply($r);
+        }
+        $r = $a->toBigInteger()->add($s->toBigInteger());
+        $mask = "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF";
+        return strrev($r->toBytes()) & $mask;
+    }
+
+    /**
+     * Return the mode
+     *
+     * You can do $obj instanceof AES or whatever to get the cipher but you can't do that to get the mode
+     */
+    public function getMode(): string
+    {
+        return array_flip(self::MODE_MAP)[$this->mode];
+    }
+
+    /**
+     * Is the continuous buffer enabled?
+     */
+    public function continuousBufferEnabled(): bool
+    {
+        return $this->continuousBuffer;
+    }
+}
diff --git a/phpseclib/Crypt/Common/Traits/Fingerprint.php b/phpseclib/Crypt/Common/Traits/Fingerprint.php
new file mode 100644
index 000000000..dfce8411a
--- /dev/null
+++ b/phpseclib/Crypt/Common/Traits/Fingerprint.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Fingerprint Trait for Public Keys
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\Common\Traits;
+
+use phpseclib3\Crypt\Hash;
+
+/**
+ * Fingerprint Trait for Private Keys
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+trait Fingerprint
+{
+    /**
+     * Returns the public key's fingerprint
+     *
+     * The public key's fingerprint is returned, which is equivalent to running `ssh-keygen -lf rsa.pub`. If there is
+     * no public key currently loaded, false is returned.
+     * Example output (md5): "c1:b1:30:29:d7:b8:de:6c:97:77:10:d7:46:41:63:87" (as specified by RFC 4716)
+     *
+     * @param string $algorithm The hashing algorithm to be used. Valid options are 'md5' and 'sha256'. False is returned
+     * for invalid values.
+     */
+    public function getFingerprint($algorithm = 'md5')
+    {
+        $type = self::validatePlugin('Keys', 'OpenSSH', 'savePublicKey');
+        if ($type === false) {
+            return false;
+        }
+        $key = $this->toString('OpenSSH', ['binary' => true]);
+        if ($key === false) {
+            return false;
+        }
+        switch ($algorithm) {
+            case 'sha256':
+                $hash = new Hash('sha256');
+                $base = base64_encode($hash->hash($key));
+                return substr($base, 0, strlen($base) - 1);
+            case 'md5':
+                return substr(chunk_split(md5($key), 2, ':'), 0, -1);
+            default:
+                return false;
+        }
+    }
+}
diff --git a/phpseclib/Crypt/Common/Traits/PasswordProtected.php b/phpseclib/Crypt/Common/Traits/PasswordProtected.php
new file mode 100644
index 000000000..984e1986a
--- /dev/null
+++ b/phpseclib/Crypt/Common/Traits/PasswordProtected.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * Password Protected Trait for Private Keys
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\Common\Traits;
+
+/**
+ * Password Protected Trait for Private Keys
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+trait PasswordProtected
+{
+    /**
+     * @var string|null
+     */
+    private $password = null;
+
+    /**
+     * Sets the password
+     *
+     * Private keys can be encrypted with a password.  To unset the password, pass in the empty string or false.
+     * Or rather, pass in $password such that empty($password) && !is_string($password) is true.
+     *
+     * @see self::createKey()
+     * @see self::load()
+     *
+     * @return static
+     */
+    public function withPassword(?string $password = null): self
+    {
+        $new = clone $this;
+        $new->password = $password;
+        return $new;
+    }
+}
diff --git a/phpseclib/Crypt/DES.php b/phpseclib/Crypt/DES.php
index 93e583a72..8917919f0 100644
--- a/phpseclib/Crypt/DES.php
+++ b/phpseclib/Crypt/DES.php
@@ -3,7 +3,7 @@
 /**
  * Pure-PHP implementation of DES.
  *
- * Uses mcrypt, if available, and an internal implementation, otherwise.
+ * Uses OpenSSL, if available/possible, and an internal implementation, otherwise
  *
  * PHP version 5
  *
@@ -18,7 +18,7 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $des = new \phpseclib\Crypt\DES();
+ *    $des = new \phpseclib3\Crypt\DES('ctr');
  *
  *    $des->setKey('abcdefgh');
  *
@@ -32,122 +32,106 @@
  * ?>
  * </code>
  *
- * @category  Crypt
- * @package   DES
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2007 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\Crypt;
+declare(strict_types=1);
 
-use phpseclib\Crypt\Base;
+namespace phpseclib3\Crypt;
+
+use phpseclib3\Crypt\Common\BlockCipher;
+use phpseclib3\Exception\BadModeException;
+use phpseclib3\Exception\LengthException;
 
 /**
  * Pure-PHP implementation of DES.
  *
- * @package DES
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
-class DES extends Base
+class DES extends BlockCipher
 {
-    /**#@+
-     * @access private
-     * @see \phpseclib\Crypt\DES::_setupKey()
-     * @see \phpseclib\Crypt\DES::_processBlock()
-     */
     /**
      * Contains $keys[self::ENCRYPT]
+     *
+     * @see \phpseclib3\Crypt\DES::setupKey()
+     * @see \phpseclib3\Crypt\DES::processBlock()
      */
-    const ENCRYPT = 0;
+    public const ENCRYPT = 0;
     /**
      * Contains $keys[self::DECRYPT]
+     *
+     * @see \phpseclib3\Crypt\DES::setupKey()
+     * @see \phpseclib3\Crypt\DES::processBlock()
      */
-    const DECRYPT = 1;
-    /**#@-*/
+    public const DECRYPT = 1;
 
     /**
      * Block Length of the cipher
      *
-     * @see \phpseclib\Crypt\Base::block_size
+     * @see Common\SymmetricKey::block_size
      * @var int
-     * @access private
      */
-    var $block_size = 8;
+    protected $block_size = 8;
 
     /**
      * Key Length (in bytes)
      *
-     * @see \phpseclib\Crypt\Base::setKeyLength()
+     * @see Common\SymmetricKey::setKeyLength()
      * @var int
-     * @access private
-     */
-    var $key_length = 8;
-
-    /**
-     * The mcrypt specific name of the cipher
-     *
-     * @see \phpseclib\Crypt\Base::cipher_name_mcrypt
-     * @var string
-     * @access private
      */
-    var $cipher_name_mcrypt = 'des';
+    protected $key_length = 8;
 
     /**
      * The OpenSSL names of the cipher / modes
      *
-     * @see \phpseclib\Crypt\Base::openssl_mode_names
+     * @see Common\SymmetricKey::openssl_mode_names
      * @var array
-     * @access private
      */
-    var $openssl_mode_names = array(
+    protected $openssl_mode_names = [
         self::MODE_ECB => 'des-ecb',
         self::MODE_CBC => 'des-cbc',
         self::MODE_CFB => 'des-cfb',
-        self::MODE_OFB => 'des-ofb'
+        self::MODE_OFB => 'des-ofb',
         // self::MODE_CTR is undefined for DES
-    );
-
-    /**
-     * Optimizing value while CFB-encrypting
-     *
-     * @see \phpseclib\Crypt\Base::cfb_init_len
-     * @var int
-     * @access private
-     */
-    var $cfb_init_len = 500;
+    ];
 
     /**
      * Switch for DES/3DES encryption
      *
      * Used only if $engine == self::ENGINE_INTERNAL
      *
-     * @see self::_setupKey()
-     * @see self::_processBlock()
+     * @see self::setupKey()
+     * @see self::processBlock()
      * @var int
-     * @access private
      */
-    var $des_rounds = 1;
+    protected $des_rounds = 1;
 
     /**
      * max possible size of $key
      *
      * @see self::setKey()
      * @var string
-     * @access private
      */
-    var $key_length_max = 8;
+    protected $key_length_max = 8;
 
     /**
      * The Key Schedule
      *
-     * @see self::_setupKey()
+     * @see self::setupKey()
      * @var array
-     * @access private
      */
-    var $keys;
+    private $keys;
+
+    /**
+     * Key Cache "key"
+     *
+     * @see self::setupKey()
+     * @var array
+     */
+    private $kl;
 
     /**
      * Shuffle table.
@@ -156,12 +140,11 @@ class DES extends Base
      * with each byte containing all bits in the same state as the
      * corresponding bit in the index value.
      *
-     * @see self::_processBlock()
-     * @see self::_setupKey()
+     * @see self::processBlock()
+     * @see self::setupKey()
      * @var array
-     * @access private
      */
-    var $shuffle = array(
+    protected static $shuffle = [
         "\x00\x00\x00\x00\x00\x00\x00\x00", "\x00\x00\x00\x00\x00\x00\x00\xFF",
         "\x00\x00\x00\x00\x00\x00\xFF\x00", "\x00\x00\x00\x00\x00\x00\xFF\xFF",
         "\x00\x00\x00\x00\x00\xFF\x00\x00", "\x00\x00\x00\x00\x00\xFF\x00\xFF",
@@ -289,8 +272,8 @@ class DES extends Base
         "\xFF\xFF\xFF\xFF\xFF\x00\x00\x00", "\xFF\xFF\xFF\xFF\xFF\x00\x00\xFF",
         "\xFF\xFF\xFF\xFF\xFF\x00\xFF\x00", "\xFF\xFF\xFF\xFF\xFF\x00\xFF\xFF",
         "\xFF\xFF\xFF\xFF\xFF\xFF\x00\x00", "\xFF\xFF\xFF\xFF\xFF\xFF\x00\xFF",
-        "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x00", "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF"
-    );
+        "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x00", "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF",
+    ];
 
     /**
      * IP mapping helper table.
@@ -298,9 +281,8 @@ class DES extends Base
      * Indexing this table with each source byte performs the initial bit permutation.
      *
      * @var array
-     * @access private
      */
-    var $ipmap = array(
+    protected static $ipmap = [
         0x00, 0x10, 0x01, 0x11, 0x20, 0x30, 0x21, 0x31,
         0x02, 0x12, 0x03, 0x13, 0x22, 0x32, 0x23, 0x33,
         0x40, 0x50, 0x41, 0x51, 0x60, 0x70, 0x61, 0x71,
@@ -332,17 +314,16 @@ class DES extends Base
         0x8C, 0x9C, 0x8D, 0x9D, 0xAC, 0xBC, 0xAD, 0xBD,
         0x8E, 0x9E, 0x8F, 0x9F, 0xAE, 0xBE, 0xAF, 0xBF,
         0xCC, 0xDC, 0xCD, 0xDD, 0xEC, 0xFC, 0xED, 0xFD,
-        0xCE, 0xDE, 0xCF, 0xDF, 0xEE, 0xFE, 0xEF, 0xFF
-    );
+        0xCE, 0xDE, 0xCF, 0xDF, 0xEE, 0xFE, 0xEF, 0xFF,
+    ];
 
     /**
      * Inverse IP mapping helper table.
      * Indexing this table with a byte value reverses the bit order.
      *
      * @var array
-     * @access private
      */
-    var $invipmap = array(
+    protected static $invipmap = [
         0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
         0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
         0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8,
@@ -374,8 +355,8 @@ class DES extends Base
         0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7,
         0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7, 0x77, 0xF7,
         0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF,
-        0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF
-    );
+        0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF,
+    ];
 
     /**
      * Pre-permuted S-box1
@@ -384,9 +365,8 @@ class DES extends Base
      * P table: concatenation can then be replaced by exclusive ORs.
      *
      * @var array
-     * @access private
      */
-    var $sbox1 = array(
+    protected static $sbox1 = [
         0x00808200, 0x00000000, 0x00008000, 0x00808202,
         0x00808002, 0x00008202, 0x00000002, 0x00008000,
         0x00000200, 0x00808200, 0x00808202, 0x00000200,
@@ -402,16 +382,15 @@ class DES extends Base
         0x00808202, 0x00008002, 0x00808000, 0x00800202,
         0x00800002, 0x00000202, 0x00008202, 0x00808200,
         0x00000202, 0x00800200, 0x00800200, 0x00000000,
-        0x00008002, 0x00008200, 0x00000000, 0x00808002
-    );
+        0x00008002, 0x00008200, 0x00000000, 0x00808002,
+    ];
 
     /**
      * Pre-permuted S-box2
      *
      * @var array
-     * @access private
      */
-    var $sbox2 = array(
+    protected static $sbox2 = [
         0x40084010, 0x40004000, 0x00004000, 0x00084010,
         0x00080000, 0x00000010, 0x40080010, 0x40004010,
         0x40000010, 0x40084010, 0x40084000, 0x40000000,
@@ -427,16 +406,15 @@ class DES extends Base
         0x00004010, 0x40084000, 0x00080000, 0x40000010,
         0x00080010, 0x40004010, 0x40000010, 0x00080010,
         0x00084000, 0x00000000, 0x40004000, 0x00004010,
-        0x40000000, 0x40080010, 0x40084010, 0x00084000
-    );
+        0x40000000, 0x40080010, 0x40084010, 0x00084000,
+    ];
 
     /**
      * Pre-permuted S-box3
      *
      * @var array
-     * @access private
      */
-    var $sbox3 = array(
+    protected static $sbox3 = [
         0x00000104, 0x04010100, 0x00000000, 0x04010004,
         0x04000100, 0x00000000, 0x00010104, 0x04000100,
         0x00010004, 0x04000004, 0x04000004, 0x00010000,
@@ -452,16 +430,15 @@ class DES extends Base
         0x04000104, 0x00010000, 0x04000000, 0x04010104,
         0x00000004, 0x00010104, 0x00010100, 0x04000004,
         0x04010000, 0x04000104, 0x00000104, 0x04010000,
-        0x00010104, 0x00000004, 0x04010004, 0x00010100
-    );
+        0x00010104, 0x00000004, 0x04010004, 0x00010100,
+    ];
 
     /**
      * Pre-permuted S-box4
      *
      * @var array
-     * @access private
      */
-    var $sbox4 = array(
+    protected static $sbox4 = [
         0x80401000, 0x80001040, 0x80001040, 0x00000040,
         0x00401040, 0x80400040, 0x80400000, 0x80001000,
         0x00000000, 0x00401000, 0x00401000, 0x80401040,
@@ -477,16 +454,15 @@ class DES extends Base
         0x80401040, 0x80000040, 0x80000000, 0x00001000,
         0x80400000, 0x80001000, 0x00401040, 0x80400040,
         0x80001000, 0x00001040, 0x00400000, 0x80401000,
-        0x00000040, 0x00400000, 0x00001000, 0x00401040
-    );
+        0x00000040, 0x00400000, 0x00001000, 0x00401040,
+    ];
 
     /**
      * Pre-permuted S-box5
      *
      * @var array
-     * @access private
      */
-    var $sbox5 = array(
+    protected static $sbox5 = [
         0x00000080, 0x01040080, 0x01040000, 0x21000080,
         0x00040000, 0x00000080, 0x20000000, 0x01040000,
         0x20040080, 0x00040000, 0x01000080, 0x20040080,
@@ -502,16 +478,15 @@ class DES extends Base
         0x21040080, 0x00040080, 0x21000000, 0x21040080,
         0x01040000, 0x00000000, 0x20040000, 0x21000000,
         0x00040080, 0x01000080, 0x20000080, 0x00040000,
-        0x00000000, 0x20040000, 0x01040080, 0x20000080
-    );
+        0x00000000, 0x20040000, 0x01040080, 0x20000080,
+    ];
 
     /**
      * Pre-permuted S-box6
      *
      * @var array
-     * @access private
      */
-    var $sbox6 = array(
+    protected static $sbox6 = [
         0x10000008, 0x10200000, 0x00002000, 0x10202008,
         0x10200000, 0x00000008, 0x10202008, 0x00200000,
         0x10002000, 0x00202008, 0x00200000, 0x10000008,
@@ -527,16 +502,15 @@ class DES extends Base
         0x00202008, 0x10202000, 0x00000000, 0x10200008,
         0x00000008, 0x00002000, 0x10200000, 0x00202008,
         0x00002000, 0x00200008, 0x10002008, 0x00000000,
-        0x10202000, 0x10000000, 0x00200008, 0x10002008
-    );
+        0x10202000, 0x10000000, 0x00200008, 0x10002008,
+    ];
 
     /**
      * Pre-permuted S-box7
      *
      * @var array
-     * @access private
      */
-    var $sbox7 = array(
+    protected static $sbox7 = [
         0x00100000, 0x02100001, 0x02000401, 0x00000000,
         0x00000400, 0x02000401, 0x00100401, 0x02100400,
         0x02100401, 0x00100000, 0x00000000, 0x02000001,
@@ -552,16 +526,15 @@ class DES extends Base
         0x00000401, 0x02000001, 0x02100401, 0x02100000,
         0x00100400, 0x00000000, 0x00000001, 0x02100401,
         0x00000000, 0x00100401, 0x02100000, 0x00000400,
-        0x02000001, 0x02000400, 0x00000400, 0x00100001
-    );
+        0x02000001, 0x02000400, 0x00000400, 0x00100001,
+    ];
 
     /**
      * Pre-permuted S-box8
      *
      * @var array
-     * @access private
      */
-    var $sbox8 = array(
+    protected static $sbox8 = [
         0x08000820, 0x00000800, 0x00020000, 0x08020820,
         0x08000000, 0x08000820, 0x00000020, 0x08000000,
         0x00020020, 0x08020000, 0x08020820, 0x00020800,
@@ -577,52 +550,61 @@ class DES extends Base
         0x00000000, 0x08020820, 0x00020020, 0x08000020,
         0x08020000, 0x08000800, 0x08000820, 0x00000000,
         0x08020820, 0x00020800, 0x00020800, 0x00000820,
-        0x00000820, 0x00020020, 0x08000000, 0x08020800
-    );
+        0x00000820, 0x00020020, 0x08000000, 0x08020800,
+    ];
+
+    /**
+     * Default Constructor.
+     *
+     * @throws BadModeException if an invalid / unsupported mode is provided
+     */
+    public function __construct(string $mode)
+    {
+        parent::__construct($mode);
+
+        if ($this->mode == self::MODE_STREAM) {
+            throw new BadModeException('Block ciphers cannot be ran in stream mode');
+        }
+    }
 
     /**
      * Test for engine validity
      *
-     * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
+     * This is mainly just a wrapper to set things up for \phpseclib3\Crypt\Common\SymmetricKey::isValidEngine()
      *
-     * @see \phpseclib\Crypt\Base::isValidEngine()
-     * @param int $engine
-     * @access public
-     * @return bool
+     * @see Common\SymmetricKey::isValidEngine()
      */
-    function isValidEngine($engine)
+    protected function isValidEngineHelper(int $engine): bool
     {
         if ($this->key_length_max == 8) {
             if ($engine == self::ENGINE_OPENSSL) {
+                // quoting https://www.openssl.org/news/openssl-3.0-notes.html, OpenSSL 3.0.1
+                // "Moved all variations of the EVP ciphers CAST5, BF, IDEA, SEED, RC2, RC4, RC5, and DES to the legacy provider"
+                // in theory openssl_get_cipher_methods() should catch this but, on GitHub Actions, at least, it does not
+                if (defined('OPENSSL_VERSION_TEXT') && version_compare(preg_replace('#OpenSSL (\d+\.\d+\.\d+) .*#', '$1', OPENSSL_VERSION_TEXT), '3.0.1', '>=')) {
+                    return false;
+                }
                 $this->cipher_name_openssl_ecb = 'des-ecb';
-                $this->cipher_name_openssl = 'des-' . $this->_openssl_translate_mode();
+                $this->cipher_name_openssl = 'des-' . $this->openssl_translate_mode();
             }
         }
 
-        return parent::isValidEngine($engine);
+        return parent::isValidEngineHelper($engine);
     }
 
     /**
      * Sets the key.
      *
-     * Keys can be of any length.  DES, itself, uses 64-bit keys (eg. strlen($key) == 8), however, we
-     * only use the first eight, if $key has more then eight characters in it, and pad $key with the
-     * null byte if it is less then eight characters long.
+     * Keys must be 64-bits long or 8 bytes long.
      *
      * DES also requires that every eighth bit be a parity bit, however, we'll ignore that.
      *
-     * If the key is not explicitly set, it'll be assumed to be all zero's.
-     *
-     * @see \phpseclib\Crypt\Base::setKey()
-     * @access public
-     * @param string $key
+     * @see Common\SymmetricKey::setKey()
      */
-    function setKey($key)
+    public function setKey(string $key): void
     {
-        // We check/cut here only up to max length of the key.
-        // Key padding to the proper length will be done in _setupKey()
-        if (strlen($key) > $this->key_length_max) {
-            $key = substr($key, 0, $this->key_length_max);
+        if (!($this instanceof TripleDES) && strlen($key) != 8) {
+            throw new LengthException('Key of size ' . strlen($key) . ' not supported by this algorithm. Only keys of size 8 are supported');
         }
 
         // Sets the key
@@ -632,31 +614,25 @@ function setKey($key)
     /**
      * Encrypts a block
      *
-     * @see \phpseclib\Crypt\Base::_encryptBlock()
-     * @see \phpseclib\Crypt\Base::encrypt()
      * @see self::encrypt()
-     * @access private
-     * @param string $in
-     * @return string
+     * @see Common\SymmetricKey::encryptBlock()
+     * @see Common\SymmetricKey::encrypt()
      */
-    function _encryptBlock($in)
+    protected function encryptBlock(string $in): string
     {
-        return $this->_processBlock($in, self::ENCRYPT);
+        return $this->processBlock($in, self::ENCRYPT);
     }
 
     /**
      * Decrypts a block
      *
-     * @see \phpseclib\Crypt\Base::_decryptBlock()
-     * @see \phpseclib\Crypt\Base::decrypt()
      * @see self::decrypt()
-     * @access private
-     * @param string $in
-     * @return string
+     * @see Common\SymmetricKey::decryptBlock()
+     * @see Common\SymmetricKey::decrypt()
      */
-    function _decryptBlock($in)
+    protected function decryptBlock(string $in): string
     {
-        return $this->_processBlock($in, self::DECRYPT);
+        return $this->processBlock($in, self::DECRYPT);
     }
 
     /**
@@ -666,29 +642,26 @@ function _decryptBlock($in)
      * {@link http://en.wikipedia.org/wiki/Image:Feistel.png Feistel.png} to get a general
      * idea of what this function does.
      *
-     * @see self::_encryptBlock()
-     * @see self::_decryptBlock()
-     * @access private
-     * @param string $block
-     * @param int $mode
      * @return string
+     * @see self::decryptBlock()
+     * @see self::encryptBlock()
      */
-    function _processBlock($block, $mode)
+    private function processBlock(string $block, int $mode)
     {
         static $sbox1, $sbox2, $sbox3, $sbox4, $sbox5, $sbox6, $sbox7, $sbox8, $shuffleip, $shuffleinvip;
         if (!$sbox1) {
-            $sbox1 = array_map("intval", $this->sbox1);
-            $sbox2 = array_map("intval", $this->sbox2);
-            $sbox3 = array_map("intval", $this->sbox3);
-            $sbox4 = array_map("intval", $this->sbox4);
-            $sbox5 = array_map("intval", $this->sbox5);
-            $sbox6 = array_map("intval", $this->sbox6);
-            $sbox7 = array_map("intval", $this->sbox7);
-            $sbox8 = array_map("intval", $this->sbox8);
+            $sbox1 = array_map('intval', self::$sbox1);
+            $sbox2 = array_map('intval', self::$sbox2);
+            $sbox3 = array_map('intval', self::$sbox3);
+            $sbox4 = array_map('intval', self::$sbox4);
+            $sbox5 = array_map('intval', self::$sbox5);
+            $sbox6 = array_map('intval', self::$sbox6);
+            $sbox7 = array_map('intval', self::$sbox7);
+            $sbox8 = array_map('intval', self::$sbox8);
             /* Merge $shuffle with $[inv]ipmap */
             for ($i = 0; $i < 256; ++$i) {
-                $shuffleip[]    =  $this->shuffle[$this->ipmap[$i]];
-                $shuffleinvip[] =  $this->shuffle[$this->invipmap[$i]];
+                $shuffleip[]    =  self::$shuffle[self::$ipmap[$i]];
+                $shuffleinvip[] =  self::$shuffle[self::$invipmap[$i]];
             }
         }
 
@@ -697,7 +670,7 @@ function _processBlock($block, $mode)
 
         // Do the initial IP permutation.
         $t = unpack('Nl/Nr', $block);
-        list($l, $r) = array($t['l'], $t['r']);
+        [$l, $r] = [$t['l'], $t['r']];
         $block = ($shuffleip[ $r        & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
                  ($shuffleip[($r >>  8) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
                  ($shuffleip[($r >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
@@ -709,7 +682,7 @@ function _processBlock($block, $mode)
 
         // Extract L0 and R0.
         $t = unpack('Nl/Nr', $block);
-        list($l, $r) = array($t['l'], $t['r']);
+        [$l, $r] = [$t['l'], $t['r']];
 
         for ($des_round = 0; $des_round < $this->des_rounds; ++$des_round) {
             // Perform the 16 steps.
@@ -751,22 +724,21 @@ function _processBlock($block, $mode)
     /**
      * Creates the key schedule
      *
-     * @see \phpseclib\Crypt\Base::_setupKey()
-     * @access private
+     * @see Common\SymmetricKey::setupKey()
      */
-    function _setupKey()
+    protected function setupKey(): void
     {
         if (isset($this->kl['key']) && $this->key === $this->kl['key'] && $this->des_rounds === $this->kl['des_rounds']) {
             // already expanded
             return;
         }
-        $this->kl = array('key' => $this->key, 'des_rounds' => $this->des_rounds);
+        $this->kl = ['key' => $this->key, 'des_rounds' => $this->des_rounds];
 
-        static $shifts = array( // number of key bits shifted per round
-            1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1
-        );
+        static $shifts = [ // number of key bits shifted per round
+            1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1,
+        ];
 
-        static $pc1map = array(
+        static $pc1map = [
             0x00, 0x00, 0x08, 0x08, 0x04, 0x04, 0x0C, 0x0C,
             0x02, 0x02, 0x0A, 0x0A, 0x06, 0x06, 0x0E, 0x0E,
             0x10, 0x10, 0x18, 0x18, 0x14, 0x14, 0x1C, 0x1C,
@@ -798,17 +770,17 @@ function _setupKey()
             0xE0, 0xE0, 0xE8, 0xE8, 0xE4, 0xE4, 0xEC, 0xEC,
             0xE2, 0xE2, 0xEA, 0xEA, 0xE6, 0xE6, 0xEE, 0xEE,
             0xF0, 0xF0, 0xF8, 0xF8, 0xF4, 0xF4, 0xFC, 0xFC,
-            0xF2, 0xF2, 0xFA, 0xFA, 0xF6, 0xF6, 0xFE, 0xFE
-        );
+            0xF2, 0xF2, 0xFA, 0xFA, 0xF6, 0xF6, 0xFE, 0xFE,
+        ];
 
         // Mapping tables for the PC-2 transformation.
-        static $pc2mapc1 = array(
+        static $pc2mapc1 = [
             0x00000000, 0x00000400, 0x00200000, 0x00200400,
             0x00000001, 0x00000401, 0x00200001, 0x00200401,
             0x02000000, 0x02000400, 0x02200000, 0x02200400,
-            0x02000001, 0x02000401, 0x02200001, 0x02200401
-        );
-        static $pc2mapc2 = array(
+            0x02000001, 0x02000401, 0x02200001, 0x02200401,
+        ];
+        static $pc2mapc2 = [
             0x00000000, 0x00000800, 0x08000000, 0x08000800,
             0x00010000, 0x00010800, 0x08010000, 0x08010800,
             0x00000000, 0x00000800, 0x08000000, 0x08000800,
@@ -872,9 +844,9 @@ function _setupKey()
             0x01040110, 0x01040910, 0x09040110, 0x09040910,
             0x01050110, 0x01050910, 0x09050110, 0x09050910,
             0x01040110, 0x01040910, 0x09040110, 0x09040910,
-            0x01050110, 0x01050910, 0x09050110, 0x09050910
-        );
-        static $pc2mapc3 = array(
+            0x01050110, 0x01050910, 0x09050110, 0x09050910,
+        ];
+        static $pc2mapc3 = [
             0x00000000, 0x00000004, 0x00001000, 0x00001004,
             0x00000000, 0x00000004, 0x00001000, 0x00001004,
             0x10000000, 0x10000004, 0x10001000, 0x10001004,
@@ -938,9 +910,9 @@ function _setupKey()
             0x20080022, 0x20080026, 0x20081022, 0x20081026,
             0x20080022, 0x20080026, 0x20081022, 0x20081026,
             0x30080022, 0x30080026, 0x30081022, 0x30081026,
-            0x30080022, 0x30080026, 0x30081022, 0x30081026
-        );
-        static $pc2mapc4 = array(
+            0x30080022, 0x30080026, 0x30081022, 0x30081026,
+        ];
+        static $pc2mapc4 = [
             0x00000000, 0x00100000, 0x00000008, 0x00100008,
             0x00000200, 0x00100200, 0x00000208, 0x00100208,
             0x00000000, 0x00100000, 0x00000008, 0x00100008,
@@ -1004,15 +976,15 @@ function _setupKey()
             0x04022000, 0x04122000, 0x04022008, 0x04122008,
             0x04022200, 0x04122200, 0x04022208, 0x04122208,
             0x04022000, 0x04122000, 0x04022008, 0x04122008,
-            0x04022200, 0x04122200, 0x04022208, 0x04122208
-        );
-        static $pc2mapd1 = array(
+            0x04022200, 0x04122200, 0x04022208, 0x04122208,
+        ];
+        static $pc2mapd1 = [
             0x00000000, 0x00000001, 0x08000000, 0x08000001,
             0x00200000, 0x00200001, 0x08200000, 0x08200001,
             0x00000002, 0x00000003, 0x08000002, 0x08000003,
-            0x00200002, 0x00200003, 0x08200002, 0x08200003
-        );
-        static $pc2mapd2 = array(
+            0x00200002, 0x00200003, 0x08200002, 0x08200003,
+        ];
+        static $pc2mapd2 = [
             0x00000000, 0x00100000, 0x00000800, 0x00100800,
             0x00000000, 0x00100000, 0x00000800, 0x00100800,
             0x04000000, 0x04100000, 0x04000800, 0x04100800,
@@ -1076,9 +1048,9 @@ function _setupKey()
             0x00020204, 0x00120204, 0x00020A04, 0x00120A04,
             0x00020204, 0x00120204, 0x00020A04, 0x00120A04,
             0x04020204, 0x04120204, 0x04020A04, 0x04120A04,
-            0x04020204, 0x04120204, 0x04020A04, 0x04120A04
-        );
-        static $pc2mapd3 = array(
+            0x04020204, 0x04120204, 0x04020A04, 0x04120A04,
+        ];
+        static $pc2mapd3 = [
             0x00000000, 0x00010000, 0x02000000, 0x02010000,
             0x00000020, 0x00010020, 0x02000020, 0x02010020,
             0x00040000, 0x00050000, 0x02040000, 0x02050000,
@@ -1142,9 +1114,9 @@ function _setupKey()
             0x20002010, 0x20012010, 0x22002010, 0x22012010,
             0x20002030, 0x20012030, 0x22002030, 0x22012030,
             0x20042010, 0x20052010, 0x22042010, 0x22052010,
-            0x20042030, 0x20052030, 0x22042030, 0x22052030
-        );
-        static $pc2mapd4 = array(
+            0x20042030, 0x20052030, 0x22042030, 0x22052030,
+        ];
+        static $pc2mapd4 = [
             0x00000000, 0x00000400, 0x01000000, 0x01000400,
             0x00000000, 0x00000400, 0x01000000, 0x01000400,
             0x00000100, 0x00000500, 0x01000100, 0x01000500,
@@ -1208,34 +1180,34 @@ function _setupKey()
             0x10081008, 0x10081408, 0x11081008, 0x11081408,
             0x10081008, 0x10081408, 0x11081008, 0x11081408,
             0x10081108, 0x10081508, 0x11081108, 0x11081508,
-            0x10081108, 0x10081508, 0x11081108, 0x11081508
-        );
+            0x10081108, 0x10081508, 0x11081108, 0x11081508,
+        ];
 
-        $keys = array();
+        $keys = [];
         for ($des_round = 0; $des_round < $this->des_rounds; ++$des_round) {
             // pad the key and remove extra characters as appropriate.
             $key = str_pad(substr($this->key, $des_round * 8, 8), 8, "\0");
 
             // Perform the PC/1 transformation and compute C and D.
             $t = unpack('Nl/Nr', $key);
-            list($l, $r) = array($t['l'], $t['r']);
-            $key = ($this->shuffle[$pc1map[ $r        & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x00") |
-                   ($this->shuffle[$pc1map[($r >>  8) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x00") |
-                   ($this->shuffle[$pc1map[($r >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x00") |
-                   ($this->shuffle[$pc1map[($r >> 24) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x00") |
-                   ($this->shuffle[$pc1map[ $l        & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x00") |
-                   ($this->shuffle[$pc1map[($l >>  8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x00") |
-                   ($this->shuffle[$pc1map[($l >> 16) & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x00") |
-                   ($this->shuffle[$pc1map[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x00");
+            [$l, $r] = [$t['l'], $t['r']];
+            $key = (self::$shuffle[$pc1map[ $r        & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x00") |
+                   (self::$shuffle[$pc1map[($r >>  8) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x00") |
+                   (self::$shuffle[$pc1map[($r >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x00") |
+                   (self::$shuffle[$pc1map[($r >> 24) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x00") |
+                   (self::$shuffle[$pc1map[ $l        & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x00") |
+                   (self::$shuffle[$pc1map[($l >>  8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x00") |
+                   (self::$shuffle[$pc1map[($l >> 16) & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x00") |
+                   (self::$shuffle[$pc1map[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x00");
             $key = unpack('Nc/Nd', $key);
             $c = ( $key['c'] >> 4) & 0x0FFFFFFF;
             $d = (($key['d'] >> 4) & 0x0FFFFFF0) | ($key['c'] & 0x0F);
 
-            $keys[$des_round] = array(
-                self::ENCRYPT => array(),
-                self::DECRYPT => array_fill(0, 32, 0)
-            );
-            for ($i = 0, $ki = 31; $i < 16; ++$i, $ki-= 2) {
+            $keys[$des_round] = [
+                self::ENCRYPT => [],
+                self::DECRYPT => array_fill(0, 32, 0),
+            ];
+            for ($i = 0, $ki = 31; $i < 16; ++$i, $ki -= 2) {
                 $c <<= $shifts[$i];
                 $c = ($c | ($c >> 28)) & 0x0FFFFFFF;
                 $d <<= $shifts[$i];
@@ -1248,9 +1220,9 @@ function _setupKey()
                       $pc2mapd3[($d >>  8) & 0xFF] | $pc2mapd4[ $d        & 0xFF];
 
                 // Reorder: odd bytes/even bytes. Push the result in key schedule.
-                $val1 = ( $cp        & 0xFF000000) | (($cp <<  8) & 0x00FF0000) |
+                $val1 = ( $cp        & intval(0xFF000000)) | (($cp <<  8) & 0x00FF0000) |
                         (($dp >> 16) & 0x0000FF00) | (($dp >>  8) & 0x000000FF);
-                $val2 = (($cp <<  8) & 0xFF000000) | (($cp << 16) & 0x00FF0000) |
+                $val2 = (($cp <<  8) & intval(0xFF000000)) | (($cp << 16) & 0x00FF0000) |
                         (($dp >>  8) & 0x0000FF00) | ( $dp        & 0x000000FF);
                 $keys[$des_round][self::ENCRYPT][       ] = $val1;
                 $keys[$des_round][self::DECRYPT][$ki - 1] = $val1;
@@ -1261,7 +1233,7 @@ function _setupKey()
 
         switch ($this->des_rounds) {
             case 3: // 3DES keys
-                $this->keys = array(
+                $this->keys = [
                     self::ENCRYPT => array_merge(
                         $keys[0][self::ENCRYPT],
                         $keys[1][self::DECRYPT],
@@ -1271,175 +1243,127 @@ function _setupKey()
                         $keys[2][self::DECRYPT],
                         $keys[1][self::ENCRYPT],
                         $keys[0][self::DECRYPT]
-                    )
-                );
+                    ),
+                ];
                 break;
             // case 1: // DES keys
             default:
-                $this->keys = array(
+                $this->keys = [
                     self::ENCRYPT => $keys[0][self::ENCRYPT],
-                    self::DECRYPT => $keys[0][self::DECRYPT]
-                );
+                    self::DECRYPT => $keys[0][self::DECRYPT],
+                ];
         }
     }
 
     /**
      * Setup the performance-optimized function for de/encrypt()
      *
-     * @see \phpseclib\Crypt\Base::_setupInlineCrypt()
-     * @access private
+     * @see Common\SymmetricKey::setupInlineCrypt()
      */
-    function _setupInlineCrypt()
+    protected function setupInlineCrypt(): void
     {
-        $lambda_functions =& self::_getLambdaFunctions();
-
         // Engine configuration for:
         // -  DES ($des_rounds == 1) or
         // - 3DES ($des_rounds == 3)
         $des_rounds = $this->des_rounds;
 
-        // We create max. 10 hi-optimized code for memory reason. Means: For each $key one ultra fast inline-crypt function.
-        // (Currently, for DES, one generated $lambda_function cost on php5.5@32bit ~135kb unfreeable mem and ~230kb on php5.5@64bit)
-        // (Currently, for TripleDES, one generated $lambda_function cost on php5.5@32bit ~240kb unfreeable mem and ~340kb on php5.5@64bit)
-        // After that, we'll still create very fast optimized code but not the hi-ultimative code, for each $mode one
-        $gen_hi_opt_code = (bool)( count($lambda_functions) < 10 );
-
-        // Generation of a uniqe hash for our generated code
-        $code_hash = "Crypt_DES, $des_rounds, {$this->mode}";
-        if ($gen_hi_opt_code) {
-            // For hi-optimized code, we create for each combination of
-            // $mode, $des_rounds and $this->key its own encrypt/decrypt function.
-            // After max 10 hi-optimized functions, we create generic
-            // (still very fast.. but not ultra) functions for each $mode/$des_rounds
-            // Currently 2 * 5 generic functions will be then max. possible.
-            $code_hash = str_pad($code_hash, 32) . $this->_hashInlineCryptFunction($this->key);
-        }
-
-        // Is there a re-usable $lambda_functions in there? If not, we have to create it.
-        if (!isset($lambda_functions[$code_hash])) {
-            // Init code for both, encrypt and decrypt.
-            $init_crypt = 'static $sbox1, $sbox2, $sbox3, $sbox4, $sbox5, $sbox6, $sbox7, $sbox8, $shuffleip, $shuffleinvip;
-                if (!$sbox1) {
-                    $sbox1 = array_map("intval", $self->sbox1);
-                    $sbox2 = array_map("intval", $self->sbox2);
-                    $sbox3 = array_map("intval", $self->sbox3);
-                    $sbox4 = array_map("intval", $self->sbox4);
-                    $sbox5 = array_map("intval", $self->sbox5);
-                    $sbox6 = array_map("intval", $self->sbox6);
-                    $sbox7 = array_map("intval", $self->sbox7);
-                    $sbox8 = array_map("intval", $self->sbox8);'
-                    /* Merge $shuffle with $[inv]ipmap */ . '
-                    for ($i = 0; $i < 256; ++$i) {
-                        $shuffleip[]    =  $self->shuffle[$self->ipmap[$i]];
-                        $shuffleinvip[] =  $self->shuffle[$self->invipmap[$i]];
-                    }
+        $init_crypt = 'static $sbox1, $sbox2, $sbox3, $sbox4, $sbox5, $sbox6, $sbox7, $sbox8, $shuffleip, $shuffleinvip;
+            if (!$sbox1) {
+                $sbox1 = array_map("intval", self::$sbox1);
+                $sbox2 = array_map("intval", self::$sbox2);
+                $sbox3 = array_map("intval", self::$sbox3);
+                $sbox4 = array_map("intval", self::$sbox4);
+                $sbox5 = array_map("intval", self::$sbox5);
+                $sbox6 = array_map("intval", self::$sbox6);
+                $sbox7 = array_map("intval", self::$sbox7);
+                $sbox8 = array_map("intval", self::$sbox8);'
+                /* Merge $shuffle with $[inv]ipmap */ . '
+                for ($i = 0; $i < 256; ++$i) {
+                    $shuffleip[]    =  self::$shuffle[self::$ipmap[$i]];
+                    $shuffleinvip[] =  self::$shuffle[self::$invipmap[$i]];
                 }
-            ';
-
-            switch (true) {
-                case $gen_hi_opt_code:
-                    // In Hi-optimized code mode, we use our [3]DES key schedule as hardcoded integers.
-                    // No futher initialisation of the $keys schedule is necessary.
-                    // That is the extra performance boost.
-                    $k = array(
-                        self::ENCRYPT => $this->keys[self::ENCRYPT],
-                        self::DECRYPT => $this->keys[self::DECRYPT]
-                    );
-                    $init_encrypt = '';
-                    $init_decrypt = '';
-                    break;
-                default:
-                    // In generic optimized code mode, we have to use, as the best compromise [currently],
-                    // our key schedule as $ke/$kd arrays. (with hardcoded indexes...)
-                    $k = array(
-                        self::ENCRYPT => array(),
-                        self::DECRYPT => array()
-                    );
-                    for ($i = 0, $c = count($this->keys[self::ENCRYPT]); $i < $c; ++$i) {
-                        $k[self::ENCRYPT][$i] = '$ke[' . $i . ']';
-                        $k[self::DECRYPT][$i] = '$kd[' . $i . ']';
-                    }
-                    $init_encrypt = '$ke = $self->keys[self::ENCRYPT];';
-                    $init_decrypt = '$kd = $self->keys[self::DECRYPT];';
-                    break;
             }
+        ';
 
-            // Creating code for en- and decryption.
-            $crypt_block = array();
-            foreach (array(self::ENCRYPT, self::DECRYPT) as $c) {
-                /* Do the initial IP permutation. */
-                $crypt_block[$c] = '
-                    $in = unpack("N*", $in);
-                    $l  = $in[1];
-                    $r  = $in[2];
-                    $in = unpack("N*",
-                        ($shuffleip[ $r        & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
-                        ($shuffleip[($r >>  8) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
-                        ($shuffleip[($r >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
-                        ($shuffleip[($r >> 24) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
-                        ($shuffleip[ $l        & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
-                        ($shuffleip[($l >>  8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
-                        ($shuffleip[($l >> 16) & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
-                        ($shuffleip[($l >> 24) & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01")
-                    );
-                    ' . /* Extract L0 and R0 */ '
-                    $l = $in[1];
-                    $r = $in[2];
-                ';
+        $k = [
+            self::ENCRYPT => $this->keys[self::ENCRYPT],
+            self::DECRYPT => $this->keys[self::DECRYPT],
+        ];
+        $init_encrypt = '';
+        $init_decrypt = '';
 
-                $l = '$l';
-                $r = '$r';
+        // Creating code for en- and decryption.
+        $crypt_block = [];
+        foreach ([self::ENCRYPT, self::DECRYPT] as $c) {
+            /* Do the initial IP permutation. */
+            $crypt_block[$c] = '
+                $in = unpack("N*", $in);
+                $l  = $in[1];
+                $r  = $in[2];
+                $in = unpack("N*",
+                    ($shuffleip[ $r        & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
+                    ($shuffleip[($r >>  8) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
+                    ($shuffleip[($r >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
+                    ($shuffleip[($r >> 24) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
+                    ($shuffleip[ $l        & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
+                    ($shuffleip[($l >>  8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
+                    ($shuffleip[($l >> 16) & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
+                    ($shuffleip[($l >> 24) & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01")
+                );
+                ' . /* Extract L0 and R0 */ '
+                $l = $in[1];
+                $r = $in[2];
+            ';
 
-                // Perform DES or 3DES.
-                for ($ki = -1, $des_round = 0; $des_round < $des_rounds; ++$des_round) {
-                    // Perform the 16 steps.
-                    for ($i = 0; $i < 16; ++$i) {
-                        // start of "the Feistel (F) function" - see the following URL:
-                        // http://en.wikipedia.org/wiki/Image:Data_Encryption_Standard_InfoBox_Diagram.png
-                        // Merge key schedule.
-                        $crypt_block[$c].= '
-                            $b1 = ((' . $r . ' >>  3) & 0x1FFFFFFF)  ^ (' . $r . ' << 29) ^ ' . $k[$c][++$ki] . ';
-                            $b2 = ((' . $r . ' >> 31) & 0x00000001)  ^ (' . $r . ' <<  1) ^ ' . $k[$c][++$ki] . ';' .
-                            /* S-box indexing. */
-                            $l . ' = $sbox1[($b1 >> 24) & 0x3F] ^ $sbox2[($b2 >> 24) & 0x3F] ^
-                                     $sbox3[($b1 >> 16) & 0x3F] ^ $sbox4[($b2 >> 16) & 0x3F] ^
-                                     $sbox5[($b1 >>  8) & 0x3F] ^ $sbox6[($b2 >>  8) & 0x3F] ^
-                                     $sbox7[ $b1        & 0x3F] ^ $sbox8[ $b2        & 0x3F] ^ ' . $l . ';
-                        ';
-                        // end of "the Feistel (F) function"
+            $l = '$l';
+            $r = '$r';
 
-                        // swap L & R
-                        list($l, $r) = array($r, $l);
-                    }
-                    list($l, $r) = array($r, $l);
-                }
+            // Perform DES or 3DES.
+            for ($ki = -1, $des_round = 0; $des_round < $des_rounds; ++$des_round) {
+                // Perform the 16 steps.
+                for ($i = 0; $i < 16; ++$i) {
+                    // start of "the Feistel (F) function" - see the following URL:
+                    // http://en.wikipedia.org/wiki/Image:Data_Encryption_Standard_InfoBox_Diagram.png
+                    // Merge key schedule.
+                    $crypt_block[$c] .= '
+                        $b1 = ((' . $r . ' >>  3) & 0x1FFFFFFF)  ^ (' . $r . ' << 29) ^ ' . $k[$c][++$ki] . ';
+                        $b2 = ((' . $r . ' >> 31) & 0x00000001)  ^ (' . $r . ' <<  1) ^ ' . $k[$c][++$ki] . ';' .
+                        /* S-box indexing. */
+                        $l . ' = $sbox1[($b1 >> 24) & 0x3F] ^ $sbox2[($b2 >> 24) & 0x3F] ^
+                                 $sbox3[($b1 >> 16) & 0x3F] ^ $sbox4[($b2 >> 16) & 0x3F] ^
+                                 $sbox5[($b1 >>  8) & 0x3F] ^ $sbox6[($b2 >>  8) & 0x3F] ^
+                                 $sbox7[ $b1        & 0x3F] ^ $sbox8[ $b2        & 0x3F] ^ ' . $l . ';
+                    ';
+                    // end of "the Feistel (F) function"
 
-                // Perform the inverse IP permutation.
-                $crypt_block[$c].= '$in =
-                    ($shuffleinvip[($l >> 24) & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
-                    ($shuffleinvip[($r >> 24) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
-                    ($shuffleinvip[($l >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
-                    ($shuffleinvip[($r >> 16) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
-                    ($shuffleinvip[($l >>  8) & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
-                    ($shuffleinvip[($r >>  8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
-                    ($shuffleinvip[ $l        & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
-                    ($shuffleinvip[ $r        & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01");
-                ';
+                    // swap L & R
+                    [$l, $r] = [$r, $l];
+                }
+                [$l, $r] = [$r, $l];
             }
 
-            // Creates the inline-crypt function
-            $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
-                array(
-                   'init_crypt'    => $init_crypt,
-                   'init_encrypt'  => $init_encrypt,
-                   'init_decrypt'  => $init_decrypt,
-                   'encrypt_block' => $crypt_block[self::ENCRYPT],
-                   'decrypt_block' => $crypt_block[self::DECRYPT]
-                )
-            );
+            // Perform the inverse IP permutation.
+            $crypt_block[$c] .= '$in =
+                ($shuffleinvip[($l >> 24) & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
+                ($shuffleinvip[($r >> 24) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
+                ($shuffleinvip[($l >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
+                ($shuffleinvip[($r >> 16) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
+                ($shuffleinvip[($l >>  8) & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
+                ($shuffleinvip[($r >>  8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
+                ($shuffleinvip[ $l        & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
+                ($shuffleinvip[ $r        & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01");
+            ';
         }
 
-        // Set the inline-crypt function as callback in: $this->inline_crypt
-        $this->inline_crypt = $lambda_functions[$code_hash];
+        // Creates the inline-crypt function
+        $this->inline_crypt = $this->createInlineCryptFunction(
+            [
+               'init_crypt'    => $init_crypt,
+               'init_encrypt'  => $init_encrypt,
+               'init_decrypt'  => $init_decrypt,
+               'encrypt_block' => $crypt_block[self::ENCRYPT],
+               'decrypt_block' => $crypt_block[self::DECRYPT],
+            ]
+        );
     }
 }
diff --git a/phpseclib/Crypt/DH.php b/phpseclib/Crypt/DH.php
new file mode 100644
index 000000000..9375ad33a
--- /dev/null
+++ b/phpseclib/Crypt/DH.php
@@ -0,0 +1,397 @@
+<?php
+
+/**
+ * Pure-PHP (EC)DH implementation
+ *
+ * PHP version 5
+ *
+ * Here's an example of how to compute a shared secret with this library:
+ * <code>
+ * <?php
+ * include 'vendor/autoload.php';
+ *
+ * $ourPrivate = \phpseclib3\Crypt\DH::createKey();
+ * $secret = DH::computeSecret($ourPrivate, $theirPublic);
+ *
+ * ?>
+ * </code>
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt;
+
+use phpseclib3\Crypt\Common\AsymmetricKey;
+use phpseclib3\Crypt\DH\Parameters;
+use phpseclib3\Crypt\DH\PrivateKey;
+use phpseclib3\Crypt\DH\PublicKey;
+use phpseclib3\Exception\InvalidArgumentException;
+use phpseclib3\Exception\NoKeyLoadedException;
+use phpseclib3\Exception\UnsupportedOperationException;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * Pure-PHP (EC)DH implementation
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class DH extends AsymmetricKey
+{
+    /**
+     * Algorithm Name
+     *
+     * @var string
+     */
+    public const ALGORITHM = 'DH';
+
+    /**
+     * DH prime
+     *
+     * @var BigInteger
+     */
+    protected $prime;
+
+    /**
+     * DH Base
+     *
+     * Prime divisor of p-1
+     *
+     * @var BigInteger
+     */
+    protected $base;
+
+    /**
+     * Public Key
+     *
+     * @var BigInteger
+     */
+    protected $publicKey;
+
+    /**
+     * Create DH parameters
+     *
+     * This method is a bit polymorphic. It can take any of the following:
+     *  - two BigInteger's (prime and base)
+     *  - an integer representing the size of the prime in bits (the base is assumed to be 2)
+     *  - a string (eg. diffie-hellman-group14-sha1)
+     */
+    public static function createParameters(...$args): Parameters
+    {
+        $class = new \ReflectionClass(static::class);
+        if ($class->isFinal()) {
+            throw new \RuntimeException('createParameters() should not be called from final classes (' . static::class . ')');
+        }
+
+        $params = new Parameters();
+        if (count($args) == 2 && $args[0] instanceof BigInteger && $args[1] instanceof BigInteger) {
+            //if (!$args[0]->isPrime()) {
+            //    throw new \phpseclib3\Exception\InvalidArgumentException('The first parameter should be a prime number');
+            //}
+            $params->prime = $args[0];
+            $params->base = $args[1];
+            return $params;
+        } elseif (count($args) == 1 && is_numeric($args[0])) {
+            $params->prime = BigInteger::randomPrime($args[0]);
+            $params->base = new BigInteger(2);
+            return $params;
+        } elseif (count($args) != 1 || !is_string($args[0])) {
+            throw new InvalidArgumentException('Valid parameters are either: two BigInteger\'s (prime and base), a single integer (the length of the prime; base is assumed to be 2) or a string');
+        }
+        switch ($args[0]) {
+            // see http://tools.ietf.org/html/rfc2409#section-6.2 and
+            // http://tools.ietf.org/html/rfc2412, appendex E
+            case 'diffie-hellman-group1-sha1':
+                $prime = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
+                         '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
+                         '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
+                         'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381FFFFFFFFFFFFFFFF';
+                break;
+            // see http://tools.ietf.org/html/rfc3526#section-3
+            case 'diffie-hellman-group14-sha1': // 2048-bit MODP Group
+            case 'diffie-hellman-group14-sha256':
+                $prime = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
+                         '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
+                         '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
+                         'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF05' .
+                         '98DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB' .
+                         '9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B' .
+                         'E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718' .
+                         '3995497CEA956AE515D2261898FA051015728E5A8AACAA68FFFFFFFFFFFFFFFF';
+                break;
+            // see https://tools.ietf.org/html/rfc3526#section-4
+            case 'diffie-hellman-group15-sha512': // 3072-bit MODP Group
+                $prime = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
+                         '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
+                         '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
+                         'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF05' .
+                         '98DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB' .
+                         '9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B' .
+                         'E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718' .
+                         '3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33' .
+                         'A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7' .
+                         'ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864' .
+                         'D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E2' .
+                         '08E24FA074E5AB3143DB5BFCE0FD108E4B82D120A93AD2CAFFFFFFFFFFFFFFFF';
+                break;
+            // see https://tools.ietf.org/html/rfc3526#section-5
+            case 'diffie-hellman-group16-sha512': // 4096-bit MODP Group
+                $prime = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
+                         '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
+                         '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
+                         'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF05' .
+                         '98DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB' .
+                         '9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B' .
+                         'E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718' .
+                         '3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33' .
+                         'A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7' .
+                         'ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864' .
+                         'D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E2' .
+                         '08E24FA074E5AB3143DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D7' .
+                         '88719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8' .
+                         'DBBBC2DB04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2' .
+                         '233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA9' .
+                         '93B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934063199FFFFFFFFFFFFFFFF';
+                break;
+            // see https://tools.ietf.org/html/rfc3526#section-6
+            case 'diffie-hellman-group17-sha512': // 6144-bit MODP Group
+                $prime = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
+                         '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
+                         '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
+                         'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF05' .
+                         '98DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB' .
+                         '9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B' .
+                         'E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718' .
+                         '3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33' .
+                         'A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7' .
+                         'ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864' .
+                         'D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E2' .
+                         '08E24FA074E5AB3143DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D7' .
+                         '88719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8' .
+                         'DBBBC2DB04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2' .
+                         '233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA9' .
+                         '93B4EA988D8FDDC186FFB7DC90A6C08F4DF435C93402849236C3FAB4D27C7026' .
+                         'C1D4DCB2602646DEC9751E763DBA37BDF8FF9406AD9E530EE5DB382F413001AE' .
+                         'B06A53ED9027D831179727B0865A8918DA3EDBEBCF9B14ED44CE6CBACED4BB1B' .
+                         'DB7F1447E6CC254B332051512BD7AF426FB8F401378CD2BF5983CA01C64B92EC' .
+                         'F032EA15D1721D03F482D7CE6E74FEF6D55E702F46980C82B5A84031900B1C9E' .
+                         '59E7C97FBEC7E8F323A97A7E36CC88BE0F1D45B7FF585AC54BD407B22B4154AA' .
+                         'CC8F6D7EBF48E1D814CC5ED20F8037E0A79715EEF29BE32806A1D58BB7C5DA76' .
+                         'F550AA3D8A1FBFF0EB19CCB1A313D55CDA56C9EC2EF29632387FE8D76E3C0468' .
+                         '043E8F663F4860EE12BF2D5B0B7474D6E694F91E6DCC4024FFFFFFFFFFFFFFFF';
+                break;
+            // see https://tools.ietf.org/html/rfc3526#section-7
+            case 'diffie-hellman-group18-sha512': // 8192-bit MODP Group
+                $prime = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
+                         '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
+                         '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
+                         'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF05' .
+                         '98DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB' .
+                         '9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B' .
+                         'E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718' .
+                         '3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33' .
+                         'A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7' .
+                         'ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864' .
+                         'D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E2' .
+                         '08E24FA074E5AB3143DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D7' .
+                         '88719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8' .
+                         'DBBBC2DB04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2' .
+                         '233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA9' .
+                         '93B4EA988D8FDDC186FFB7DC90A6C08F4DF435C93402849236C3FAB4D27C7026' .
+                         'C1D4DCB2602646DEC9751E763DBA37BDF8FF9406AD9E530EE5DB382F413001AE' .
+                         'B06A53ED9027D831179727B0865A8918DA3EDBEBCF9B14ED44CE6CBACED4BB1B' .
+                         'DB7F1447E6CC254B332051512BD7AF426FB8F401378CD2BF5983CA01C64B92EC' .
+                         'F032EA15D1721D03F482D7CE6E74FEF6D55E702F46980C82B5A84031900B1C9E' .
+                         '59E7C97FBEC7E8F323A97A7E36CC88BE0F1D45B7FF585AC54BD407B22B4154AA' .
+                         'CC8F6D7EBF48E1D814CC5ED20F8037E0A79715EEF29BE32806A1D58BB7C5DA76' .
+                         'F550AA3D8A1FBFF0EB19CCB1A313D55CDA56C9EC2EF29632387FE8D76E3C0468' .
+                         '043E8F663F4860EE12BF2D5B0B7474D6E694F91E6DBE115974A3926F12FEE5E4' .
+                         '38777CB6A932DF8CD8BEC4D073B931BA3BC832B68D9DD300741FA7BF8AFC47ED' .
+                         '2576F6936BA424663AAB639C5AE4F5683423B4742BF1C978238F16CBE39D652D' .
+                         'E3FDB8BEFC848AD922222E04A4037C0713EB57A81A23F0C73473FC646CEA306B' .
+                         '4BCBC8862F8385DDFA9D4B7FA2C087E879683303ED5BDD3A062B3CF5B3A278A6' .
+                         '6D2A13F83F44F82DDF310EE074AB6A364597E899A0255DC164F31CC50846851D' .
+                         'F9AB48195DED7EA1B1D510BD7EE74D73FAF36BC31ECFA268359046F4EB879F92' .
+                         '4009438B481C6CD7889A002ED5EE382BC9190DA6FC026E479558E4475677E9AA' .
+                         '9E3050E2765694DFC81F56E880B96E7160C980DD98EDD3DFFFFFFFFFFFFFFFFF';
+                break;
+            default:
+                throw new InvalidArgumentException('Invalid named prime provided');
+        }
+
+        $params->prime = new BigInteger($prime, 16);
+        $params->base = new BigInteger(2);
+
+        return $params;
+    }
+
+    /**
+     * Create public / private key pair.
+     *
+     * The rationale for the second parameter is described in http://tools.ietf.org/html/rfc4419#section-6.2 :
+     *
+     * "To increase the speed of the key exchange, both client and server may
+     *  reduce the size of their private exponents.  It should be at least
+     *  twice as long as the key material that is generated from the shared
+     *  secret.  For more details, see the paper by van Oorschot and Wiener
+     *  [VAN-OORSCHOT]."
+     *
+     * $length is in bits
+     *
+     * @param int $length optional
+     */
+    public static function createKey(Parameters $params, int $length = 0): PrivateKey
+    {
+        $class = new \ReflectionClass(static::class);
+        if ($class->isFinal()) {
+            throw new \RuntimeException('createKey() should not be called from final classes (' . static::class . ')');
+        }
+
+        $one = new BigInteger(1);
+        if ($length) {
+            $max = $one->bitwise_leftShift($length);
+            $max = $max->subtract($one);
+        } else {
+            $max = $params->prime->subtract($one);
+        }
+
+        $key = new PrivateKey();
+        $key->prime = $params->prime;
+        $key->base = $params->base;
+        $key->privateKey = BigInteger::randomRange($one, $max);
+        $key->publicKey = $key->base->powMod($key->privateKey, $key->prime);
+        return $key;
+    }
+
+    /**
+     * Compute Shared Secret
+     *
+     * @param PrivateKey|EC $private
+     * @param PublicKey|BigInteger|string $public
+     */
+    public static function computeSecret($private, $public)
+    {
+        if ($private instanceof PrivateKey) { // DH\PrivateKey
+            switch (true) {
+                case $public instanceof PublicKey:
+                    if (!$private->prime->equals($public->prime) || !$private->base->equals($public->base)) {
+                        throw new InvalidArgumentException('The public and private key do not share the same prime and / or base numbers');
+                    }
+                    return $public->publicKey->powMod($private->privateKey, $private->prime)->toBytes(true);
+                case is_string($public):
+                    $public = new BigInteger($public, -256);
+                    // fall-through
+                case $public instanceof BigInteger:
+                    return $public->powMod($private->privateKey, $private->prime)->toBytes(true);
+                default:
+                    throw new InvalidArgumentException('$public needs to be an instance of DH\PublicKey, a BigInteger or a string');
+            }
+        }
+
+        if ($private instanceof EC\PrivateKey) {
+            switch (true) {
+                case $public instanceof EC\PublicKey:
+                    $public = $public->getEncodedCoordinates();
+                    // fall-through
+                case is_string($public):
+                    $point = $private->multiply($public);
+                    switch ($private->getCurve()) {
+                        case 'Curve25519':
+                        case 'Curve448':
+                            $secret = $point;
+                            break;
+                        default:
+                            // according to https://www.secg.org/sec1-v2.pdf#page=33 only X is returned
+                            $secret = substr($point, 1, (strlen($point) - 1) >> 1);
+                    }
+                    /*
+                    if (($secret[0] & "\x80") === "\x80") {
+                        $secret = "\0$secret";
+                    }
+                    */
+                    return $secret;
+                default:
+                    throw new InvalidArgumentException('$public needs to be an instance of EC\PublicKey or a string (an encoded coordinate)');
+            }
+        }
+    }
+
+    /**
+     * Load the key
+     *
+     * @param string|array $key
+     */
+    public static function load($key, ?string $password = null): AsymmetricKey
+    {
+        try {
+            return EC::load($key, $password);
+        } catch (NoKeyLoadedException $e) {
+        }
+
+        return parent::load($key, $password);
+    }
+
+    /**
+     * OnLoad Handler
+     *
+     * @return Parameters|PrivateKey|PublicKey
+     */
+    protected static function onLoad(array $components)
+    {
+        if (!isset($components['privateKey']) && !isset($components['publicKey'])) {
+            $new = new Parameters();
+        } else {
+            $new = isset($components['privateKey']) ?
+                new PrivateKey() :
+                new PublicKey();
+        }
+
+        $new->prime = $components['prime'];
+        $new->base = $components['base'];
+
+        if (isset($components['privateKey'])) {
+            $new->privateKey = $components['privateKey'];
+        }
+        if (isset($components['publicKey'])) {
+            $new->publicKey = $components['publicKey'];
+        }
+
+        return $new;
+    }
+
+    /**
+     * Determines which hashing function should be used
+     */
+    public function withHash(string $hash): AsymmetricKey
+    {
+        throw new UnsupportedOperationException('DH does not use a hash algorithm');
+    }
+
+    /**
+     * Returns the hash algorithm currently being used
+     */
+    public function getHash(): Hash
+    {
+        throw new UnsupportedOperationException('DH does not use a hash algorithm');
+    }
+
+    /**
+     * Returns the parameters
+     *
+     * A public / private key is only returned if the currently loaded "key" contains an x or y
+     * value.
+     *
+     * @see self::getPublicKey()
+     */
+    public function getParameters(): AsymmetricKey
+    {
+        $type = DH::validatePlugin('Keys', 'PKCS1', 'saveParameters');
+
+        $key = $type::saveParameters($this->prime, $this->base);
+        return DH::load($key, 'PKCS1');
+    }
+}
diff --git a/phpseclib/Crypt/DH/Formats/Keys/PKCS1.php b/phpseclib/Crypt/DH/Formats/Keys/PKCS1.php
new file mode 100644
index 000000000..b134df9f7
--- /dev/null
+++ b/phpseclib/Crypt/DH/Formats/Keys/PKCS1.php
@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * "PKCS1" Formatted EC Key Handler
+ *
+ * PHP version 5
+ *
+ * Processes keys with the following headers:
+ *
+ * -----BEGIN DH PARAMETERS-----
+ *
+ * Technically, PKCS1 is for RSA keys, only, but we're using PKCS1 to describe
+ * DSA, whose format isn't really formally described anywhere, so might as well
+ * use it to describe this, too.
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\DH\Formats\Keys;
+
+use phpseclib3\Crypt\Common\Formats\Keys\PKCS1 as Progenitor;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\File\ASN1;
+use phpseclib3\File\ASN1\Maps;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * "PKCS1" Formatted DH Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PKCS1 extends Progenitor
+{
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param string|array $key
+     */
+    public static function load($key, ?string $password = null): array
+    {
+        $key = parent::load($key, $password);
+
+        $decoded = ASN1::decodeBER($key);
+        if (!$decoded) {
+            throw new RuntimeException('Unable to decode BER');
+        }
+
+        $components = ASN1::asn1map($decoded[0], Maps\DHParameter::MAP);
+        if (!is_array($components)) {
+            throw new RuntimeException('Unable to perform ASN1 mapping on parameters');
+        }
+
+        return $components;
+    }
+
+    /**
+     * Convert EC parameters to the appropriate format
+     */
+    public static function saveParameters(BigInteger $prime, BigInteger $base, array $options = []): string
+    {
+        $params = [
+            'prime' => $prime,
+            'base' => $base,
+        ];
+        $params = ASN1::encodeDER($params, Maps\DHParameter::MAP);
+
+        return "-----BEGIN DH PARAMETERS-----\r\n" .
+               chunk_split(base64_encode($params), 64) .
+               "-----END DH PARAMETERS-----\r\n";
+    }
+}
diff --git a/phpseclib/Crypt/DH/Formats/Keys/PKCS8.php b/phpseclib/Crypt/DH/Formats/Keys/PKCS8.php
new file mode 100644
index 000000000..5b8f65a41
--- /dev/null
+++ b/phpseclib/Crypt/DH/Formats/Keys/PKCS8.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * PKCS#8 Formatted DH Key Handler
+ *
+ * PHP version 5
+ *
+ * Processes keys with the following headers:
+ *
+ * -----BEGIN ENCRYPTED PRIVATE KEY-----
+ * -----BEGIN PRIVATE KEY-----
+ * -----BEGIN PUBLIC KEY-----
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\DH\Formats\Keys;
+
+use phpseclib3\Crypt\Common\Formats\Keys\PKCS8 as Progenitor;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\File\ASN1;
+use phpseclib3\File\ASN1\Maps;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * PKCS#8 Formatted DH Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PKCS8 extends Progenitor
+{
+    /**
+     * OID Name
+     *
+     * @var string
+     */
+    public const OID_NAME = 'dhKeyAgreement';
+
+    /**
+     * OID Value
+     *
+     * @var string
+     */
+    public const OID_VALUE = '1.2.840.113549.1.3.1';
+
+    /**
+     * Child OIDs loaded
+     *
+     * @var bool
+     */
+    protected static $childOIDsLoaded = false;
+
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param string|array $key
+     */
+    public static function load($key, ?string $password = null): array
+    {
+        $key = parent::load($key, $password);
+
+        $type = isset($key['privateKey']) ? 'privateKey' : 'publicKey';
+
+        $decoded = ASN1::decodeBER($key[$type . 'Algorithm']['parameters']->element);
+        if (empty($decoded)) {
+            throw new RuntimeException('Unable to decode BER of parameters');
+        }
+        $components = ASN1::asn1map($decoded[0], Maps\DHParameter::MAP);
+        if (!is_array($components)) {
+            throw new RuntimeException('Unable to perform ASN1 mapping on parameters');
+        }
+
+        $decoded = ASN1::decodeBER($key[$type]);
+        switch (true) {
+            case !isset($decoded):
+            case !isset($decoded[0]['content']):
+            case !$decoded[0]['content'] instanceof BigInteger:
+                throw new RuntimeException('Unable to decode BER of parameters');
+        }
+        $components[$type] = $decoded[0]['content'];
+
+        return $components;
+    }
+
+    /**
+     * Convert a private key to the appropriate format.
+     */
+    public static function savePrivateKey(BigInteger $prime, BigInteger $base, BigInteger $privateKey, BigInteger $publicKey, ?string $password = null, array $options = []): string
+    {
+        $params = [
+            'prime' => $prime,
+            'base' => $base,
+        ];
+        $params = ASN1::encodeDER($params, Maps\DHParameter::MAP);
+        $params = new ASN1\Element($params);
+        $key = ASN1::encodeDER($privateKey, ['type' => ASN1::TYPE_INTEGER]);
+        return self::wrapPrivateKey($key, [], $params, $password, null, '', $options);
+    }
+
+    /**
+     * Convert a public key to the appropriate format
+     *
+     * @param array $options optional
+     */
+    public static function savePublicKey(BigInteger $prime, BigInteger $base, BigInteger $publicKey, array $options = []): string
+    {
+        $params = [
+            'prime' => $prime,
+            'base' => $base,
+        ];
+        $params = ASN1::encodeDER($params, Maps\DHParameter::MAP);
+        $params = new ASN1\Element($params);
+        $key = ASN1::encodeDER($publicKey, ['type' => ASN1::TYPE_INTEGER]);
+        return self::wrapPublicKey($key, $params, null, $options);
+    }
+}
diff --git a/phpseclib/Crypt/DH/Parameters.php b/phpseclib/Crypt/DH/Parameters.php
new file mode 100644
index 000000000..7e8106ed3
--- /dev/null
+++ b/phpseclib/Crypt/DH/Parameters.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * DH Parameters
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\DH;
+
+use phpseclib3\Crypt\DH;
+
+/**
+ * DH Parameters
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+final class Parameters extends DH
+{
+    /**
+     * Returns the parameters
+     *
+     * @param array $options optional
+     */
+    public function toString(string $type = 'PKCS1', array $options = []): string
+    {
+        $type = self::validatePlugin('Keys', 'PKCS1', 'saveParameters');
+
+        return $type::saveParameters($this->prime, $this->base, $options);
+    }
+}
diff --git a/phpseclib/Crypt/DH/PrivateKey.php b/phpseclib/Crypt/DH/PrivateKey.php
new file mode 100644
index 000000000..30a783ea8
--- /dev/null
+++ b/phpseclib/Crypt/DH/PrivateKey.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * DH Private Key
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\DH;
+
+use phpseclib3\Crypt\Common;
+use phpseclib3\Crypt\DH;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * DH Private Key
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+final class PrivateKey extends DH
+{
+    use Common\Traits\PasswordProtected;
+
+    /**
+     * Private Key
+     *
+     * @var BigInteger
+     */
+    protected $privateKey;
+
+    /**
+     * Public Key
+     *
+     * @var BigInteger
+     */
+    protected $publicKey;
+
+    /**
+     * Returns the public key
+     */
+    public function getPublicKey(): PublicKey
+    {
+        $type = self::validatePlugin('Keys', 'PKCS8', 'savePublicKey');
+
+        if (!isset($this->publicKey)) {
+            $this->publicKey = $this->base->powMod($this->privateKey, $this->prime);
+        }
+
+        $key = $type::savePublicKey($this->prime, $this->base, $this->publicKey);
+
+        return DH::loadFormat('PKCS8', $key);
+    }
+
+    /**
+     * Returns the private key
+     *
+     * @param array $options optional
+     */
+    public function toString(string $type, array $options = []): string
+    {
+        $type = self::validatePlugin('Keys', $type, 'savePrivateKey');
+
+        if (!isset($this->publicKey)) {
+            $this->publicKey = $this->base->powMod($this->privateKey, $this->prime);
+        }
+
+        return $type::savePrivateKey($this->prime, $this->base, $this->privateKey, $this->publicKey, $this->password, $options);
+    }
+}
diff --git a/phpseclib/Crypt/DH/PublicKey.php b/phpseclib/Crypt/DH/PublicKey.php
new file mode 100644
index 000000000..134b39a1c
--- /dev/null
+++ b/phpseclib/Crypt/DH/PublicKey.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * DH Public Key
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\DH;
+
+use phpseclib3\Crypt\Common;
+use phpseclib3\Crypt\DH;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * DH Public Key
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+final class PublicKey extends DH
+{
+    use Common\Traits\Fingerprint;
+
+    /**
+     * Returns the public key
+     *
+     * @param array $options optional
+     */
+    public function toString(string $type, array $options = []): string
+    {
+        $type = self::validatePlugin('Keys', $type, 'savePublicKey');
+
+        return $type::savePublicKey($this->prime, $this->base, $this->publicKey, $options);
+    }
+
+    /**
+     * Returns the public key as a BigInteger
+     */
+    public function toBigInteger(): BigInteger
+    {
+        return $this->publicKey;
+    }
+}
diff --git a/phpseclib/Crypt/DSA.php b/phpseclib/Crypt/DSA.php
new file mode 100644
index 000000000..2175e4401
--- /dev/null
+++ b/phpseclib/Crypt/DSA.php
@@ -0,0 +1,330 @@
+<?php
+
+/**
+ * Pure-PHP FIPS 186-4 compliant implementation of DSA.
+ *
+ * PHP version 5
+ *
+ * Here's an example of how to create signatures and verify signatures with this library:
+ * <code>
+ * <?php
+ * include 'vendor/autoload.php';
+ *
+ * $private = \phpseclib3\Crypt\DSA::createKey();
+ * $public = $private->getPublicKey();
+ *
+ * $plaintext = 'terrafrost';
+ *
+ * $signature = $private->sign($plaintext);
+ *
+ * echo $public->verify($plaintext, $signature) ? 'verified' : 'unverified';
+ * ?>
+ * </code>
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt;
+
+use phpseclib3\Crypt\Common\AsymmetricKey;
+use phpseclib3\Crypt\DSA\Parameters;
+use phpseclib3\Crypt\DSA\PrivateKey;
+use phpseclib3\Crypt\DSA\PublicKey;
+use phpseclib3\Exception\InsufficientSetupException;
+use phpseclib3\Exception\InvalidArgumentException;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * Pure-PHP FIPS 186-4 compliant implementation of DSA.
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class DSA extends AsymmetricKey
+{
+    /**
+     * Algorithm Name
+     *
+     * @var string
+     */
+    public const ALGORITHM = 'DSA';
+
+    /**
+     * DSA Prime P
+     *
+     * @var BigInteger
+     */
+    protected $p;
+
+    /**
+     * DSA Group Order q
+     *
+     * Prime divisor of p-1
+     *
+     * @var BigInteger
+     */
+    protected $q;
+
+    /**
+     * DSA Group Generator G
+     *
+     * @var BigInteger
+     */
+    protected $g;
+
+    /**
+     * DSA public key value y
+     *
+     * @var BigInteger
+     */
+    protected $y;
+
+    /**
+     * Signature Format
+     *
+     * @var string
+     */
+    protected $sigFormat;
+
+    /**
+     * Signature Format (Short)
+     *
+     * @var string
+     */
+    protected $shortFormat;
+
+    /**
+     * Create DSA parameters
+     *
+     * @return DSA|bool
+     */
+    public static function createParameters(int $L = 2048, int $N = 224)
+    {
+        self::initialize_static_variables();
+
+        $class = new \ReflectionClass(static::class);
+        if ($class->isFinal()) {
+            throw new \RuntimeException('createParameters() should not be called from final classes (' . static::class . ')');
+        }
+
+        if (!isset(self::$engines['PHP'])) {
+            self::useBestEngine();
+        }
+
+        switch (true) {
+            case $N == 160:
+            /*
+              in FIPS 186-1 and 186-2 N was fixed at 160 whereas K had an upper bound of 1024.
+              RFC 4253 (SSH Transport Layer Protocol) references FIPS 186-2 and as such most
+              SSH DSA implementations only support keys with an N of 160.
+              puttygen let's you set the size of L (but not the size of N) and uses 2048 as the
+              default L value. that's not really compliant with any of the FIPS standards, however,
+              for the purposes of maintaining compatibility with puttygen, we'll support it
+            */
+            //case ($L >= 512 || $L <= 1024) && (($L & 0x3F) == 0) && $N == 160:
+            // FIPS 186-3 changed this as follows:
+            //case $L == 1024 && $N == 160:
+            case $L == 2048 && $N == 224:
+            case $L == 2048 && $N == 256:
+            case $L == 3072 && $N == 256:
+                break;
+            default:
+                throw new InvalidArgumentException('Invalid values for N and L');
+        }
+
+        $two = new BigInteger(2);
+
+        $q = BigInteger::randomPrime($N);
+        $divisor = $q->multiply($two);
+
+        do {
+            $x = BigInteger::random($L);
+            [, $c] = $x->divide($divisor);
+            $p = $x->subtract($c->subtract(self::$one));
+        } while ($p->getLength() != $L || !$p->isPrime());
+
+        $p_1 = $p->subtract(self::$one);
+        [$e] = $p_1->divide($q);
+
+        // quoting http://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-4.pdf#page=50 ,
+        // "h could be obtained from a random number generator or from a counter that
+        //  changes after each use". PuTTY (sshdssg.c) starts h off at 1 and increments
+        // it on each loop. wikipedia says "commonly h = 2 is used" so we'll just do that
+        $h = clone $two;
+        while (true) {
+            $g = $h->powMod($e, $p);
+            if (!$g->equals(self::$one)) {
+                break;
+            }
+            $h = $h->add(self::$one);
+        }
+
+        $dsa = new Parameters();
+        $dsa->p = $p;
+        $dsa->q = $q;
+        $dsa->g = $g;
+
+        return $dsa;
+    }
+
+    /**
+     * Create public / private key pair.
+     *
+     * This method is a bit polymorphic. It can take a DSA/Parameters object, L / N as two distinct parameters or
+     * no parameters (at which point L and N will be generated with this method)
+     *
+     * Returns the private key, from which the publickey can be extracted
+     *
+     * @param int[] ...$args
+     */
+    public static function createKey(...$args): PrivateKey
+    {
+        self::initialize_static_variables();
+
+        $class = new \ReflectionClass(static::class);
+        if ($class->isFinal()) {
+            throw new \RuntimeException('createKey() should not be called from final classes (' . static::class . ')');
+        }
+
+        if (!isset(self::$engines['PHP'])) {
+            self::useBestEngine();
+        }
+
+        if (count($args) == 2 && is_int($args[0]) && is_int($args[1])) {
+            $params = self::createParameters($args[0], $args[1]);
+        } elseif (count($args) == 1 && $args[0] instanceof Parameters) {
+            $params = $args[0];
+        } elseif (!count($args)) {
+            $params = self::createParameters();
+        } else {
+            throw new InsufficientSetupException('Valid parameters are either two integers (L and N), a single DSA object or no parameters at all.');
+        }
+
+        $private = new PrivateKey();
+        $private->p = $params->p;
+        $private->q = $params->q;
+        $private->g = $params->g;
+
+        $private->x = BigInteger::randomRange(self::$one, $private->q->subtract(self::$one));
+        $private->y = $private->g->powMod($private->x, $private->p);
+
+        //$public = clone $private;
+        //unset($public->x);
+
+        return $private
+            ->withHash($params->hash->getHash())
+            ->withSignatureFormat($params->shortFormat);
+    }
+
+    /**
+     * OnLoad Handler
+     *
+     * @return Parameters|PrivateKey|PublicKey
+     */
+    protected static function onLoad(array $components)
+    {
+        if (!isset(self::$engines['PHP'])) {
+            self::useBestEngine();
+        }
+
+        if (!isset($components['x']) && !isset($components['y'])) {
+            $new = new Parameters();
+        } elseif (isset($components['x'])) {
+            $new = new PrivateKey();
+            $new->x = $components['x'];
+        } else {
+            $new = new PublicKey();
+        }
+
+        $new->p = $components['p'];
+        $new->q = $components['q'];
+        $new->g = $components['g'];
+
+        if (isset($components['y'])) {
+            $new->y = $components['y'];
+        }
+
+        return $new;
+    }
+
+    /**
+     * Constructor
+     *
+     * PublicKey and PrivateKey objects can only be created from abstract RSA class
+     */
+    protected function __construct()
+    {
+        $this->sigFormat = self::validatePlugin('Signature', 'ASN1');
+        $this->shortFormat = 'ASN1';
+
+        parent::__construct();
+    }
+
+    /**
+     * Returns the key size
+     *
+     * More specifically, this L (the length of DSA Prime P) and N (the length of DSA Group Order q)
+     */
+    public function getLength(): array
+    {
+        return ['L' => $this->p->getLength(), 'N' => $this->q->getLength()];
+    }
+
+    /**
+     * Returns the current engine being used
+     *
+     * @see self::useInternalEngine()
+     * @see self::useBestEngine()
+     */
+    public function getEngine(): string
+    {
+        if (!isset(self::$engines['PHP'])) {
+            self::useBestEngine();
+        }
+        return self::$engines['OpenSSL'] && in_array($this->hash->getHash(), openssl_get_md_methods()) ?
+            'OpenSSL' : 'PHP';
+    }
+
+    /**
+     * Returns the parameters
+     *
+     * A public / private key is only returned if the currently loaded "key" contains an x or y
+     * value.
+     *
+     * @see self::getPublicKey()
+     */
+    public function getParameters()
+    {
+        $type = self::validatePlugin('Keys', 'PKCS1', 'saveParameters');
+
+        $key = $type::saveParameters($this->p, $this->q, $this->g);
+        return DSA::load($key, 'PKCS1')
+            ->withHash($this->hash->getHash())
+            ->withSignatureFormat($this->shortFormat);
+    }
+
+    /**
+     * Determines the signature padding mode
+     *
+     * Valid values are: ASN1, SSH2, Raw
+     */
+    public function withSignatureFormat(string $format): DSA
+    {
+        $new = clone $this;
+        $new->shortFormat = $format;
+        $new->sigFormat = self::validatePlugin('Signature', $format);
+        return $new;
+    }
+
+    /**
+     * Returns the signature format currently being used
+     */
+    public function getSignatureFormat(): string
+    {
+        return $this->shortFormat;
+    }
+}
diff --git a/phpseclib/Crypt/DSA/Formats/Keys/OpenSSH.php b/phpseclib/Crypt/DSA/Formats/Keys/OpenSSH.php
new file mode 100644
index 000000000..be295c0ea
--- /dev/null
+++ b/phpseclib/Crypt/DSA/Formats/Keys/OpenSSH.php
@@ -0,0 +1,106 @@
+<?php
+
+/**
+ * OpenSSH Formatted DSA Key Handler
+ *
+ * PHP version 5
+ *
+ * Place in $HOME/.ssh/authorized_keys
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\DSA\Formats\Keys;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Common\Formats\Keys\OpenSSH as Progenitor;
+use phpseclib3\Exception\InvalidArgumentException;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * OpenSSH Formatted DSA Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class OpenSSH extends Progenitor
+{
+    /**
+     * Supported Key Types
+     *
+     * @var array
+     */
+    protected static $types = ['ssh-dss'];
+
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param string|array $key
+     */
+    public static function load($key, ?string $password = null): array
+    {
+        $parsed = parent::load($key, $password);
+
+        if (isset($parsed['paddedKey'])) {
+            [$type] = Strings::unpackSSH2('s', $parsed['paddedKey']);
+            if ($type != $parsed['type']) {
+                throw new RuntimeException("The public and private keys are not of the same type ($type vs $parsed[type])");
+            }
+
+            [$p, $q, $g, $y, $x, $comment] = Strings::unpackSSH2('i5s', $parsed['paddedKey']);
+
+            return compact('p', 'q', 'g', 'y', 'x', 'comment');
+        }
+
+        [$p, $q, $g, $y] = Strings::unpackSSH2('iiii', $parsed['publicKey']);
+
+        $comment = $parsed['comment'];
+
+        return compact('p', 'q', 'g', 'y', 'comment');
+    }
+
+    /**
+     * Convert a public key to the appropriate format
+     *
+     * @param array $options optional
+     */
+    public static function savePublicKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y, array $options = []): string
+    {
+        if ($q->getLength() != 160) {
+            throw new InvalidArgumentException('SSH only supports keys with an N (length of Group Order q) of 160');
+        }
+
+        // from <http://tools.ietf.org/html/rfc4253#page-15>:
+        // string    "ssh-dss"
+        // mpint     p
+        // mpint     q
+        // mpint     g
+        // mpint     y
+        $DSAPublicKey = Strings::packSSH2('siiii', 'ssh-dss', $p, $q, $g, $y);
+
+        if ($options['binary'] ?? self::$binary) {
+            return $DSAPublicKey;
+        }
+
+        $comment = $options['comment'] ?? self::$comment;
+        $DSAPublicKey = 'ssh-dss ' . base64_encode($DSAPublicKey) . ' ' . $comment;
+
+        return $DSAPublicKey;
+    }
+
+    /**
+     * Convert a private key to the appropriate format.
+     */
+    public static function savePrivateKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y, BigInteger $x, ?string $password = null, array $options = []): string
+    {
+        $publicKey = self::savePublicKey($p, $q, $g, $y, ['binary' => true]);
+        $privateKey = Strings::packSSH2('si5', 'ssh-dss', $p, $q, $g, $y, $x);
+
+        return self::wrapPrivateKey($publicKey, $privateKey, $password, $options);
+    }
+}
diff --git a/phpseclib/Crypt/DSA/Formats/Keys/PKCS1.php b/phpseclib/Crypt/DSA/Formats/Keys/PKCS1.php
new file mode 100644
index 000000000..bd6d94525
--- /dev/null
+++ b/phpseclib/Crypt/DSA/Formats/Keys/PKCS1.php
@@ -0,0 +1,127 @@
+<?php
+
+/**
+ * PKCS#1 Formatted DSA Key Handler
+ *
+ * PHP version 5
+ *
+ * Used by File/X509.php
+ *
+ * Processes keys with the following headers:
+ *
+ * -----BEGIN DSA PRIVATE KEY-----
+ * -----BEGIN DSA PUBLIC KEY-----
+ * -----BEGIN DSA PARAMETERS-----
+ *
+ * Analogous to ssh-keygen's pem format (as specified by -m)
+ *
+ * Also, technically, PKCS1 decribes RSA but I am not aware of a formal specification for DSA.
+ * The DSA private key format seems to have been adapted from the RSA private key format so
+ * we're just re-using that as the name.
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\DSA\Formats\Keys;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Common\Formats\Keys\PKCS1 as Progenitor;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\File\ASN1;
+use phpseclib3\File\ASN1\Maps;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * PKCS#1 Formatted DSA Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PKCS1 extends Progenitor
+{
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param string|array $key
+     */
+    public static function load($key, ?string $password = null): array
+    {
+        $key = parent::load($key, $password);
+
+        $decoded = ASN1::decodeBER($key);
+        if (!$decoded) {
+            throw new RuntimeException('Unable to decode BER');
+        }
+
+        $key = ASN1::asn1map($decoded[0], Maps\DSAParams::MAP);
+        if (is_array($key)) {
+            return $key;
+        }
+
+        $key = ASN1::asn1map($decoded[0], Maps\DSAPrivateKey::MAP);
+        if (is_array($key)) {
+            return $key;
+        }
+
+        $key = ASN1::asn1map($decoded[0], Maps\DSAPublicKey::MAP);
+        if (is_array($key)) {
+            return $key;
+        }
+
+        throw new RuntimeException('Unable to perform ASN1 mapping');
+    }
+
+    /**
+     * Convert DSA parameters to the appropriate format
+     */
+    public static function saveParameters(BigInteger $p, BigInteger $q, BigInteger $g): string
+    {
+        $key = [
+            'p' => $p,
+            'q' => $q,
+            'g' => $g,
+        ];
+
+        $key = ASN1::encodeDER($key, Maps\DSAParams::MAP);
+
+        return "-----BEGIN DSA PARAMETERS-----\r\n" .
+               chunk_split(Strings::base64_encode($key), 64) .
+               "-----END DSA PARAMETERS-----\r\n";
+    }
+
+    /**
+     * Convert a private key to the appropriate format.
+     *
+     * @param string $password optional
+     * @param array $options optional
+     */
+    public static function savePrivateKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y, BigInteger $x, string $password = '', array $options = []): string
+    {
+        $key = [
+            'version' => 0,
+            'p' => $p,
+            'q' => $q,
+            'g' => $g,
+            'y' => $y,
+            'x' => $x,
+        ];
+
+        $key = ASN1::encodeDER($key, Maps\DSAPrivateKey::MAP);
+
+        return self::wrapPrivateKey($key, 'DSA', $password, $options);
+    }
+
+    /**
+     * Convert a public key to the appropriate format
+     */
+    public static function savePublicKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y): string
+    {
+        $key = ASN1::encodeDER($y, Maps\DSAPublicKey::MAP);
+
+        return self::wrapPublicKey($key, 'DSA');
+    }
+}
diff --git a/phpseclib/Crypt/DSA/Formats/Keys/PKCS8.php b/phpseclib/Crypt/DSA/Formats/Keys/PKCS8.php
new file mode 100644
index 000000000..1e04bb895
--- /dev/null
+++ b/phpseclib/Crypt/DSA/Formats/Keys/PKCS8.php
@@ -0,0 +1,133 @@
+<?php
+
+/**
+ * PKCS#8 Formatted DSA Key Handler
+ *
+ * PHP version 5
+ *
+ * Processes keys with the following headers:
+ *
+ * -----BEGIN ENCRYPTED PRIVATE KEY-----
+ * -----BEGIN PRIVATE KEY-----
+ * -----BEGIN PUBLIC KEY-----
+ *
+ * Analogous to ssh-keygen's pkcs8 format (as specified by -m). Although PKCS8
+ * is specific to private keys it's basically creating a DER-encoded wrapper
+ * for keys. This just extends that same concept to public keys (much like ssh-keygen)
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\DSA\Formats\Keys;
+
+use phpseclib3\Crypt\Common\Formats\Keys\PKCS8 as Progenitor;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\File\ASN1;
+use phpseclib3\File\ASN1\Maps;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * PKCS#8 Formatted DSA Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PKCS8 extends Progenitor
+{
+    /**
+     * OID Name
+     *
+     * @var string
+     */
+    public const OID_NAME = 'id-dsa';
+
+    /**
+     * OID Value
+     *
+     * @var string
+     */
+    public const OID_VALUE = '1.2.840.10040.4.1';
+
+    /**
+     * Child OIDs loaded
+     *
+     * @var bool
+     */
+    protected static $childOIDsLoaded = false;
+
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param string|array $key
+     */
+    public static function load($key, ?string $password = null): array
+    {
+        $key = parent::load($key, $password);
+
+        $type = isset($key['privateKey']) ? 'privateKey' : 'publicKey';
+
+        $decoded = ASN1::decodeBER($key[$type . 'Algorithm']['parameters']->element);
+        if (!$decoded) {
+            throw new RuntimeException('Unable to decode BER of parameters');
+        }
+        $components = ASN1::asn1map($decoded[0], Maps\DSAParams::MAP);
+        if (!is_array($components)) {
+            throw new RuntimeException('Unable to perform ASN1 mapping on parameters');
+        }
+
+        $decoded = ASN1::decodeBER($key[$type]);
+        if (empty($decoded)) {
+            throw new RuntimeException('Unable to decode BER');
+        }
+
+        $var = $type == 'privateKey' ? 'x' : 'y';
+        $components[$var] = ASN1::asn1map($decoded[0], Maps\DSAPublicKey::MAP);
+        if (!$components[$var] instanceof BigInteger) {
+            throw new RuntimeException('Unable to perform ASN1 mapping');
+        }
+
+        if (isset($key['meta'])) {
+            $components['meta'] = $key['meta'];
+        }
+
+        return $components;
+    }
+
+    /**
+     * Convert a private key to the appropriate format.
+     */
+    public static function savePrivateKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y, BigInteger $x, ?string $password = null, array $options = []): string
+    {
+        $params = [
+            'p' => $p,
+            'q' => $q,
+            'g' => $g,
+        ];
+        $params = ASN1::encodeDER($params, Maps\DSAParams::MAP);
+        $params = new ASN1\Element($params);
+        $key = ASN1::encodeDER($x, Maps\DSAPublicKey::MAP);
+        return self::wrapPrivateKey($key, [], $params, $password, null, '', $options);
+    }
+
+    /**
+     * Convert a public key to the appropriate format
+     *
+     * @param array $options optional
+     */
+    public static function savePublicKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y, array $options = []): string
+    {
+        $params = [
+            'p' => $p,
+            'q' => $q,
+            'g' => $g,
+        ];
+        $params = ASN1::encodeDER($params, Maps\DSAParams::MAP);
+        $params = new ASN1\Element($params);
+        $key = ASN1::encodeDER($y, Maps\DSAPublicKey::MAP);
+        return self::wrapPublicKey($key, $params, null, $options);
+    }
+}
diff --git a/phpseclib/Crypt/DSA/Formats/Keys/PuTTY.php b/phpseclib/Crypt/DSA/Formats/Keys/PuTTY.php
new file mode 100644
index 000000000..f23f478e8
--- /dev/null
+++ b/phpseclib/Crypt/DSA/Formats/Keys/PuTTY.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * PuTTY Formatted DSA Key Handler
+ *
+ * puttygen does not generate DSA keys with an N of anything other than 160, however,
+ * it can still load them and convert them. PuTTY will load them, too, but SSH servers
+ * won't accept them. Since PuTTY formatted keys are primarily used with SSH this makes
+ * keys with N > 160 kinda useless, hence this handlers not supporting such keys.
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\DSA\Formats\Keys;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Common\Formats\Keys\PuTTY as Progenitor;
+use phpseclib3\Exception\InvalidArgumentException;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * PuTTY Formatted DSA Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PuTTY extends Progenitor
+{
+    /**
+     * Public Handler
+     *
+     * @var string
+     */
+    public const PUBLIC_HANDLER = 'phpseclib3\Crypt\DSA\Formats\Keys\OpenSSH';
+
+    /**
+     * Algorithm Identifier
+     *
+     * @var array
+     */
+    protected static $types = ['ssh-dss'];
+
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param array|string $key
+     * @param string|false $password
+     * @return array|false
+     */
+    public static function load($key, $password)
+    {
+        $components = parent::load($key, $password);
+        if (!isset($components['private'])) {
+            return $components;
+        }
+        [
+            'type' => $type,
+            'comment' => $comment,
+            'public' => $public,
+            'private' => $private
+        ] = $components;
+        unset($components['public'], $components['private']);
+
+        [$p, $q, $g, $y] = Strings::unpackSSH2('iiii', $public);
+        [$x] = Strings::unpackSSH2('i', $private);
+
+        return compact('p', 'q', 'g', 'y', 'x', 'comment');
+    }
+
+    /**
+     * Convert a private key to the appropriate format.
+     */
+    public static function savePrivateKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y, BigInteger $x, ?string $password = null, array $options = []): string
+    {
+        if ($q->getLength() != 160) {
+            throw new InvalidArgumentException('SSH only supports keys with an N (length of Group Order q) of 160');
+        }
+
+        $public = Strings::packSSH2('iiii', $p, $q, $g, $y);
+        $private = Strings::packSSH2('i', $x);
+
+        return self::wrapPrivateKey($public, $private, 'ssh-dss', $password, $options);
+    }
+
+    /**
+     * Convert a public key to the appropriate format
+     */
+    public static function savePublicKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y): string
+    {
+        if ($q->getLength() != 160) {
+            throw new InvalidArgumentException('SSH only supports keys with an N (length of Group Order q) of 160');
+        }
+
+        return self::wrapPublicKey(Strings::packSSH2('iiii', $p, $q, $g, $y), 'ssh-dss');
+    }
+}
diff --git a/phpseclib/Crypt/DSA/Formats/Keys/Raw.php b/phpseclib/Crypt/DSA/Formats/Keys/Raw.php
new file mode 100644
index 000000000..3013199cd
--- /dev/null
+++ b/phpseclib/Crypt/DSA/Formats/Keys/Raw.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * Raw DSA Key Handler
+ *
+ * PHP version 5
+ *
+ * Reads and creates arrays as DSA keys
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\DSA\Formats\Keys;
+
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * Raw DSA Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Raw
+{
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param string|array $key
+     */
+    public static function load($key, ?string $password = null): array
+    {
+        if (!is_array($key)) {
+            throw new UnexpectedValueException('Key should be a array - not a ' . gettype($key));
+        }
+
+        switch (true) {
+            case !isset($key['p']) || !isset($key['q']) || !isset($key['g']):
+            case !$key['p'] instanceof BigInteger:
+            case !$key['q'] instanceof BigInteger:
+            case !$key['g'] instanceof BigInteger:
+            case !isset($key['x']) && !isset($key['y']):
+            case isset($key['x']) && !$key['x'] instanceof BigInteger:
+            case isset($key['y']) && !$key['y'] instanceof BigInteger:
+                throw new UnexpectedValueException('Key appears to be malformed');
+        }
+
+        $options = ['p' => 1, 'q' => 1, 'g' => 1, 'x' => 1, 'y' => 1];
+
+        return array_intersect_key($key, $options);
+    }
+
+    /**
+     * Convert a private key to the appropriate format.
+     *
+     * @param string $password optional
+     */
+    public static function savePrivateKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y, BigInteger $x, string $password = ''): string
+    {
+        return compact('p', 'q', 'g', 'y', 'x');
+    }
+
+    /**
+     * Convert a public key to the appropriate format
+     */
+    public static function savePublicKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y): string
+    {
+        return compact('p', 'q', 'g', 'y');
+    }
+}
diff --git a/phpseclib/Crypt/DSA/Formats/Keys/XML.php b/phpseclib/Crypt/DSA/Formats/Keys/XML.php
new file mode 100644
index 000000000..41a2088fd
--- /dev/null
+++ b/phpseclib/Crypt/DSA/Formats/Keys/XML.php
@@ -0,0 +1,125 @@
+<?php
+
+/**
+ * XML Formatted DSA Key Handler
+ *
+ * While XKMS defines a private key format for RSA it does not do so for DSA. Quoting that standard:
+ *
+ * "[XKMS] does not specify private key parameters for the DSA signature algorithm since the algorithm only
+ *  supports signature modes and so the application of server generated keys and key recovery is of limited
+ *  value"
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\DSA\Formats\Keys;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Exception\BadConfigurationException;
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * XML Formatted DSA Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class XML
+{
+    /**
+     * Break a public or private key down into its constituent components
+     */
+    public static function load(string $key, ?string $password = null): array
+    {
+        if (!Strings::is_stringable($key)) {
+            throw new UnexpectedValueException('Key should be a string - not a ' . gettype($key));
+        }
+
+        if (!class_exists('DOMDocument')) {
+            throw new BadConfigurationException('The dom extension is not setup correctly on this system');
+        }
+
+        $use_errors = libxml_use_internal_errors(true);
+
+        $dom = new \DOMDocument();
+        if (substr($key, 0, 5) != '<?xml') {
+            $key = '<xml>' . $key . '</xml>';
+        }
+        if (!$dom->loadXML($key)) {
+            libxml_use_internal_errors($use_errors);
+            throw new UnexpectedValueException('Key does not appear to contain XML');
+        }
+        $xpath = new \DOMXPath($dom);
+        $keys = ['p', 'q', 'g', 'y', 'j', 'seed', 'pgencounter'];
+        foreach ($keys as $key) {
+            // $dom->getElementsByTagName($key) is case-sensitive
+            $temp = $xpath->query("//*[translate(local-name(), 'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz')='$key']");
+            if (!$temp->length) {
+                continue;
+            }
+            $value = new BigInteger(Strings::base64_decode($temp->item(0)->nodeValue), 256);
+            switch ($key) {
+                case 'p': // a prime modulus meeting the [DSS] requirements
+                    // Parameters P, Q, and G can be public and common to a group of users. They might be known
+                    // from application context. As such, they are optional but P and Q must either both appear
+                    // or both be absent
+                    $components['p'] = $value;
+                    break;
+                case 'q': // an integer in the range 2**159 < Q < 2**160 which is a prime divisor of P-1
+                    $components['q'] = $value;
+                    break;
+                case 'g': // an integer with certain properties with respect to P and Q
+                    $components['g'] = $value;
+                    break;
+                case 'y': // G**X mod P (where X is part of the private key and not made public)
+                    $components['y'] = $value;
+                    // the remaining options do not do anything
+                case 'j': // (P - 1) / Q
+                    // Parameter J is available for inclusion solely for efficiency as it is calculatable from
+                    // P and Q
+                case 'seed': // a DSA prime generation seed
+                    // Parameters seed and pgenCounter are used in the DSA prime number generation algorithm
+                    // specified in [DSS]. As such, they are optional but must either both be present or both
+                    // be absent
+                case 'pgencounter': // a DSA prime generation counter
+            }
+        }
+
+        libxml_use_internal_errors($use_errors);
+
+        if (!isset($components['y'])) {
+            throw new UnexpectedValueException('Key is missing y component');
+        }
+
+        switch (true) {
+            case !isset($components['p']):
+            case !isset($components['q']):
+            case !isset($components['g']):
+                return ['y' => $components['y']];
+        }
+
+        return $components;
+    }
+
+    /**
+     * Convert a public key to the appropriate format
+     *
+     * See https://www.w3.org/TR/xmldsig-core/#sec-DSAKeyValue
+     */
+    public static function savePublicKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y): string
+    {
+        return "<DSAKeyValue>\r\n" .
+               '  <P>' . Strings::base64_encode($p->toBytes()) . "</P>\r\n" .
+               '  <Q>' . Strings::base64_encode($q->toBytes()) . "</Q>\r\n" .
+               '  <G>' . Strings::base64_encode($g->toBytes()) . "</G>\r\n" .
+               '  <Y>' . Strings::base64_encode($y->toBytes()) . "</Y>\r\n" .
+               '</DSAKeyValue>';
+    }
+}
diff --git a/phpseclib/Crypt/DSA/Formats/Signature/ASN1.php b/phpseclib/Crypt/DSA/Formats/Signature/ASN1.php
new file mode 100644
index 000000000..99a50c0f6
--- /dev/null
+++ b/phpseclib/Crypt/DSA/Formats/Signature/ASN1.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * ASN1 Signature Handler
+ *
+ * PHP version 5
+ *
+ * Handles signatures in the format described in
+ * https://tools.ietf.org/html/rfc3279#section-2.2.2
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\DSA\Formats\Signature;
+
+use phpseclib3\File\ASN1 as Encoder;
+use phpseclib3\File\ASN1\Maps;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * ASN1 Signature Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class ASN1
+{
+    /**
+     * Loads a signature
+     *
+     * @return array|bool
+     */
+    public static function load(string $sig)
+    {
+        if (!is_string($sig)) {
+            return false;
+        }
+
+        $decoded = Encoder::decodeBER($sig);
+        if (empty($decoded)) {
+            return false;
+        }
+        $components = Encoder::asn1map($decoded[0], Maps\DssSigValue::MAP);
+
+        return $components;
+    }
+
+    /**
+     * Returns a signature in the appropriate format
+     */
+    public static function save(BigInteger $r, BigInteger $s): string
+    {
+        return Encoder::encodeDER(compact('r', 's'), Maps\DssSigValue::MAP);
+    }
+}
diff --git a/phpseclib/Crypt/DSA/Formats/Signature/Raw.php b/phpseclib/Crypt/DSA/Formats/Signature/Raw.php
new file mode 100644
index 000000000..205ba710b
--- /dev/null
+++ b/phpseclib/Crypt/DSA/Formats/Signature/Raw.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Raw DSA Signature Handler
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\DSA\Formats\Signature;
+
+use phpseclib3\Crypt\Common\Formats\Signature\Raw as Progenitor;
+
+/**
+ * Raw DSA Signature Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Raw extends Progenitor
+{
+}
diff --git a/phpseclib/Crypt/DSA/Formats/Signature/SSH2.php b/phpseclib/Crypt/DSA/Formats/Signature/SSH2.php
new file mode 100644
index 000000000..5d1ba361d
--- /dev/null
+++ b/phpseclib/Crypt/DSA/Formats/Signature/SSH2.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * SSH2 Signature Handler
+ *
+ * PHP version 5
+ *
+ * Handles signatures in the format used by SSH2
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\DSA\Formats\Signature;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * SSH2 Signature Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class SSH2
+{
+    /**
+     * Loads a signature
+     */
+    public static function load(string $sig)
+    {
+        if (!is_string($sig)) {
+            return false;
+        }
+
+        $result = Strings::unpackSSH2('ss', $sig);
+        if ($result === false) {
+            return false;
+        }
+        [$type, $blob] = $result;
+        if ($type != 'ssh-dss' || strlen($blob) != 40) {
+            return false;
+        }
+
+        return [
+            'r' => new BigInteger(substr($blob, 0, 20), 256),
+            's' => new BigInteger(substr($blob, 20), 256),
+        ];
+    }
+
+    /**
+     * Returns a signature in the appropriate format
+     *
+     * @return string
+     */
+    public static function save(BigInteger $r, BigInteger $s)
+    {
+        if ($r->getLength() > 160 || $s->getLength() > 160) {
+            return false;
+        }
+        return Strings::packSSH2(
+            'ss',
+            'ssh-dss',
+            str_pad($r->toBytes(), 20, "\0", STR_PAD_LEFT) .
+            str_pad($s->toBytes(), 20, "\0", STR_PAD_LEFT)
+        );
+    }
+}
diff --git a/phpseclib/Crypt/DSA/Parameters.php b/phpseclib/Crypt/DSA/Parameters.php
new file mode 100644
index 000000000..243f0de55
--- /dev/null
+++ b/phpseclib/Crypt/DSA/Parameters.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * DSA Parameters
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\DSA;
+
+use phpseclib3\Crypt\DSA;
+
+/**
+ * DSA Parameters
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+final class Parameters extends DSA
+{
+    /**
+     * Returns the parameters
+     *
+     * @param array $options optional
+     */
+    public function toString(string $type = 'PKCS1', array $options = []): string
+    {
+        $type = self::validatePlugin('Keys', 'PKCS1', 'saveParameters');
+
+        return $type::saveParameters($this->p, $this->q, $this->g, $options);
+    }
+}
diff --git a/phpseclib/Crypt/DSA/PrivateKey.php b/phpseclib/Crypt/DSA/PrivateKey.php
new file mode 100644
index 000000000..4bb9a49f6
--- /dev/null
+++ b/phpseclib/Crypt/DSA/PrivateKey.php
@@ -0,0 +1,150 @@
+<?php
+
+/**
+ * DSA Private Key
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\DSA;
+
+use phpseclib3\Crypt\Common;
+use phpseclib3\Crypt\DSA;
+use phpseclib3\Crypt\DSA\Formats\Signature\ASN1 as ASN1Signature;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * DSA Private Key
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+final class PrivateKey extends DSA implements Common\PrivateKey
+{
+    use Common\Traits\PasswordProtected;
+
+    /**
+     * DSA secret exponent x
+     *
+     * @var BigInteger
+     */
+    protected $x;
+
+    /**
+     * Returns the public key
+     *
+     * If you do "openssl rsa -in private.rsa -pubout -outform PEM" you get a PKCS8 formatted key
+     * that contains a publicKeyAlgorithm AlgorithmIdentifier and a publicKey BIT STRING.
+     * An AlgorithmIdentifier contains an OID and a parameters field. With RSA public keys this
+     * parameters field is NULL. With DSA PKCS8 public keys it is not - it contains the p, q and g
+     * variables. The publicKey BIT STRING contains, simply, the y variable. This can be verified
+     * by getting a DSA PKCS8 public key:
+     *
+     * "openssl dsa -in private.dsa -pubout -outform PEM"
+     *
+     * ie. just swap out rsa with dsa in the rsa command above.
+     *
+     * A PKCS1 public key corresponds to the publicKey portion of the PKCS8 key. In the case of RSA
+     * the publicKey portion /is/ the key. In the case of DSA it is not. You cannot verify a signature
+     * without the parameters and the PKCS1 DSA public key format does not include the parameters.
+     *
+     * @see self::getPrivateKey()
+     */
+    public function getPublicKey()
+    {
+        $type = self::validatePlugin('Keys', 'PKCS8', 'savePublicKey');
+
+        if (!isset($this->y)) {
+            $this->y = $this->g->powMod($this->x, $this->p);
+        }
+
+        $key = $type::savePublicKey($this->p, $this->q, $this->g, $this->y);
+
+        return DSA::loadFormat('PKCS8', $key)
+            ->withHash($this->hash->getHash())
+            ->withSignatureFormat($this->shortFormat);
+    }
+
+    /**
+     * Create a signature
+     *
+     * @see self::verify()
+     * @param string $message
+     */
+    public function sign($message): string
+    {
+        $format = $this->sigFormat;
+
+        if (self::$engines['OpenSSL'] && in_array($this->hash->getHash(), openssl_get_md_methods())) {
+            $signature = '';
+            $result = openssl_sign($message, $signature, $this->toString('PKCS8'), $this->hash->getHash());
+
+            if ($result) {
+                if ($this->shortFormat == 'ASN1') {
+                    return $signature;
+                }
+
+                ['r' => $r, 's' => $s] = ASN1Signature::load($signature);
+
+                return $format::save($r, $s);
+            }
+        }
+
+        $h = $this->hash->hash($message);
+        $h = $this->bits2int($h);
+
+        while (true) {
+            $k = BigInteger::randomRange(self::$one, $this->q->subtract(self::$one));
+            $r = $this->g->powMod($k, $this->p);
+            [, $r] = $r->divide($this->q);
+            if ($r->equals(self::$zero)) {
+                continue;
+            }
+            $kinv = $k->modInverse($this->q);
+            $temp = $h->add($this->x->multiply($r));
+            $temp = $kinv->multiply($temp);
+            [, $s] = $temp->divide($this->q);
+            if (!$s->equals(self::$zero)) {
+                break;
+            }
+        }
+
+        // the following is an RFC6979 compliant implementation of deterministic DSA
+        // it's unused because it's mainly intended for use when a good CSPRNG isn't
+        // available. if phpseclib's CSPRNG isn't good then even key generation is
+        // suspect
+        /*
+        $h1 = $this->hash->hash($message);
+        $k = $this->computek($h1);
+        $r = $this->g->powMod($k, $this->p);
+        list(, $r) = $r->divide($this->q);
+        $kinv = $k->modInverse($this->q);
+        $h1 = $this->bits2int($h1);
+        $temp = $h1->add($this->x->multiply($r));
+        $temp = $kinv->multiply($temp);
+        list(, $s) = $temp->divide($this->q);
+        */
+
+        return $format::save($r, $s);
+    }
+
+    /**
+     * Returns the private key
+     *
+     * @param array $options optional
+     */
+    public function toString(string $type, array $options = []): string
+    {
+        $type = self::validatePlugin('Keys', $type, 'savePrivateKey');
+
+        if (!isset($this->y)) {
+            $this->y = $this->g->powMod($this->x, $this->p);
+        }
+
+        return $type::savePrivateKey($this->p, $this->q, $this->g, $this->y, $this->x, $this->password, $options);
+    }
+}
diff --git a/phpseclib/Crypt/DSA/PublicKey.php b/phpseclib/Crypt/DSA/PublicKey.php
new file mode 100644
index 000000000..38a3b5b08
--- /dev/null
+++ b/phpseclib/Crypt/DSA/PublicKey.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * DSA Public Key
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\DSA;
+
+use phpseclib3\Crypt\Common;
+use phpseclib3\Crypt\DSA;
+use phpseclib3\Crypt\DSA\Formats\Signature\ASN1 as ASN1Signature;
+
+/**
+ * DSA Public Key
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+final class PublicKey extends DSA implements Common\PublicKey
+{
+    use Common\Traits\Fingerprint;
+
+    /**
+     * Verify a signature
+     *
+     * @see self::verify()
+     * @param string $message
+     * @param string $signature
+     */
+    public function verify($message, $signature): bool
+    {
+        $format = $this->sigFormat;
+
+        $params = $format::load($signature);
+        if ($params === false || count($params) != 2) {
+            return false;
+        }
+        ['r' => $r, 's' => $s] = $params;
+
+        if (self::$engines['OpenSSL'] && in_array($this->hash->getHash(), openssl_get_md_methods())) {
+            $sig = $format != 'ASN1' ? ASN1Signature::save($r, $s) : $signature;
+
+            $result = openssl_verify($message, $sig, $this->toString('PKCS8'), $this->hash->getHash());
+
+            if ($result != -1) {
+                return (bool) $result;
+            }
+        }
+
+        $q_1 = $this->q->subtract(self::$one);
+        if (!$r->between(self::$one, $q_1) || !$s->between(self::$one, $q_1)) {
+            return false;
+        }
+
+        $w = $s->modInverse($this->q);
+        $h = $this->hash->hash($message);
+        $h = $this->bits2int($h);
+        [, $u1] = $h->multiply($w)->divide($this->q);
+        [, $u2] = $r->multiply($w)->divide($this->q);
+        $v1 = $this->g->powMod($u1, $this->p);
+        $v2 = $this->y->powMod($u2, $this->p);
+        [, $v] = $v1->multiply($v2)->divide($this->p);
+        [, $v] = $v->divide($this->q);
+
+        return $v->equals($r);
+    }
+
+    /**
+     * Returns the public key
+     *
+     * @param array $options optional
+     */
+    public function toString(string $type, array $options = []): string
+    {
+        $type = self::validatePlugin('Keys', $type, 'savePublicKey');
+
+        return $type::savePublicKey($this->p, $this->q, $this->g, $this->y, $options);
+    }
+}
diff --git a/phpseclib/Crypt/EC.php b/phpseclib/Crypt/EC.php
new file mode 100644
index 000000000..e5832a573
--- /dev/null
+++ b/phpseclib/Crypt/EC.php
@@ -0,0 +1,470 @@
+<?php
+
+/**
+ * Pure-PHP implementation of EC.
+ *
+ * PHP version 5
+ *
+ * Here's an example of how to create signatures and verify signatures with this library:
+ * <code>
+ * <?php
+ * include 'vendor/autoload.php';
+ *
+ * $private = \phpseclib3\Crypt\EC::createKey('secp256k1');
+ * $public = $private->getPublicKey();
+ *
+ * $plaintext = 'terrafrost';
+ *
+ * $signature = $private->sign($plaintext);
+ *
+ * echo $public->verify($plaintext, $signature) ? 'verified' : 'unverified';
+ * ?>
+ * </code>
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt;
+
+use phpseclib3\Crypt\Common\AsymmetricKey;
+use phpseclib3\Crypt\EC\BaseCurves\Base;
+use phpseclib3\Crypt\EC\BaseCurves\Montgomery as MontgomeryCurve;
+use phpseclib3\Crypt\EC\BaseCurves\TwistedEdwards as TwistedEdwardsCurve;
+use phpseclib3\Crypt\EC\Curves\Curve25519;
+use phpseclib3\Crypt\EC\Curves\Ed25519;
+use phpseclib3\Crypt\EC\Curves\Ed448;
+use phpseclib3\Crypt\EC\Formats\Keys\PKCS1;
+use phpseclib3\Crypt\EC\Parameters;
+use phpseclib3\Crypt\EC\PrivateKey;
+use phpseclib3\Crypt\EC\PublicKey;
+use phpseclib3\Exception\InvalidArgumentException;
+use phpseclib3\Exception\LengthException;
+use phpseclib3\Exception\UnsupportedAlgorithmException;
+use phpseclib3\Exception\UnsupportedCurveException;
+use phpseclib3\Exception\UnsupportedOperationException;
+use phpseclib3\File\ASN1;
+use phpseclib3\File\ASN1\Maps\ECParameters;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * Pure-PHP implementation of EC.
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class EC extends AsymmetricKey
+{
+    /**
+     * Algorithm Name
+     *
+     * @var string
+     */
+    public const ALGORITHM = 'EC';
+
+    /**
+     * Public Key QA
+     *
+     * @var object[]
+     */
+    protected $QA;
+
+    /**
+     * Curve
+     *
+     * @var Base
+     */
+    protected $curve;
+
+    /**
+     * Signature Format
+     *
+     * @var string
+     */
+    protected $format;
+
+    /**
+     * Signature Format (Short)
+     *
+     * @var string
+     */
+    protected $shortFormat;
+
+    /**
+     * Curve Name
+     *
+     * @var string
+     */
+    private $curveName;
+
+    /**
+     * Curve Order
+     *
+     * Used for deterministic ECDSA
+     *
+     * @var BigInteger
+     */
+    protected $q;
+
+    /**
+     * Alias for the private key
+     *
+     * Used for deterministic ECDSA. AsymmetricKey expects $x. I don't like x because
+     * with x you have x * the base point yielding an (x, y)-coordinate that is the
+     * public key. But the x is different depending on which side of the equal sign
+     * you're on. It's less ambiguous if you do dA * base point = (x, y)-coordinate.
+     *
+     * @var BigInteger
+     */
+    protected $x;
+
+    /**
+     * Context
+     *
+     * @var string
+     */
+    protected $context;
+
+    /**
+     * Signature Format
+     *
+     * @var string
+     */
+    protected $sigFormat;
+
+    /**
+     * Create public / private key pair.
+     */
+    public static function createKey(string $curve): PrivateKey
+    {
+        self::initialize_static_variables();
+
+        $class = new \ReflectionClass(static::class);
+        if ($class->isFinal()) {
+            throw new \RuntimeException('createKey() should not be called from final classes (' . static::class . ')');
+        }
+
+        if (!isset(self::$engines['PHP'])) {
+            self::useBestEngine();
+        }
+
+        $curve = strtolower($curve);
+        if (self::$engines['libsodium'] && $curve == 'ed25519' && function_exists('sodium_crypto_sign_keypair')) {
+            $kp = sodium_crypto_sign_keypair();
+
+            $privatekey = EC::loadFormat('libsodium', sodium_crypto_sign_secretkey($kp));
+            //$publickey = EC::loadFormat('libsodium', sodium_crypto_sign_publickey($kp));
+
+            $privatekey->curveName = 'Ed25519';
+            //$publickey->curveName = $curve;
+
+            return $privatekey;
+        }
+
+        $privatekey = new PrivateKey();
+
+        $curveName = $curve;
+        if (preg_match('#(?:^curve|^ed)\d+$#', $curveName)) {
+            $curveName = ucfirst($curveName);
+        } elseif (substr($curveName, 0, 10) == 'brainpoolp') {
+            $curveName = 'brainpoolP' . substr($curveName, 10);
+        }
+        $curve = '\phpseclib3\Crypt\EC\Curves\\' . $curveName;
+
+        if (!class_exists($curve)) {
+            throw new UnsupportedCurveException('Named Curve of ' . $curveName . ' is not supported');
+        }
+
+        $reflect = new \ReflectionClass($curve);
+        $curveName = $reflect->isFinal() ?
+            $reflect->getParentClass()->getShortName() :
+            $reflect->getShortName();
+
+        $curve = new $curve();
+        if ($curve instanceof TwistedEdwardsCurve) {
+            $arr = $curve->extractSecret(Random::string($curve instanceof Ed448 ? 57 : 32));
+            $privatekey->dA = $dA = $arr['dA'];
+            $privatekey->secret = $arr['secret'];
+        } else {
+            $privatekey->dA = $dA = $curve->createRandomMultiplier();
+        }
+        if ($curve instanceof Curve25519 && self::$engines['libsodium']) {
+            //$r = pack('H*', '0900000000000000000000000000000000000000000000000000000000000000');
+            //$QA = sodium_crypto_scalarmult($dA->toBytes(), $r);
+            $QA = sodium_crypto_box_publickey_from_secretkey($dA->toBytes());
+            $privatekey->QA = [$curve->convertInteger(new BigInteger(strrev($QA), 256))];
+        } else {
+            $privatekey->QA = $curve->multiplyPoint($curve->getBasePoint(), $dA);
+        }
+        $privatekey->curve = $curve;
+
+        //$publickey = clone $privatekey;
+        //unset($publickey->dA);
+        //unset($publickey->x);
+
+        $privatekey->curveName = $curveName;
+        //$publickey->curveName = $curveName;
+
+        if ($privatekey->curve instanceof TwistedEdwardsCurve) {
+            return $privatekey->withHash($curve::HASH);
+        }
+
+        return $privatekey;
+    }
+
+    /**
+     * OnLoad Handler
+     *
+     * @return AsymmetricKey|Parameters|PrivateKey|PublicKey
+     */
+    protected static function onLoad(array $components)
+    {
+        if (!isset(self::$engines['PHP'])) {
+            self::useBestEngine();
+        }
+
+        if (!isset($components['dA']) && !isset($components['QA'])) {
+            $new = new Parameters();
+            $new->curve = $components['curve'];
+            return $new;
+        }
+
+        $new = isset($components['dA']) ?
+            new PrivateKey() :
+            new PublicKey();
+        $new->curve = $components['curve'];
+        $new->QA = $components['QA'];
+
+        if (isset($components['dA'])) {
+            $new->dA = $components['dA'];
+            $new->secret = $components['secret'];
+        }
+
+        if ($new->curve instanceof TwistedEdwardsCurve) {
+            return $new->withHash($components['curve']::HASH);
+        }
+
+        return $new;
+    }
+
+    /**
+     * Constructor
+     *
+     * PublicKey and PrivateKey objects can only be created from abstract RSA class
+     */
+    protected function __construct()
+    {
+        $this->sigFormat = self::validatePlugin('Signature', 'ASN1');
+        $this->shortFormat = 'ASN1';
+
+        parent::__construct();
+    }
+
+    /**
+     * Returns the curve
+     *
+     * Returns a string if it's a named curve, an array if not
+     *
+     * @return string|array
+     */
+    public function getCurve()
+    {
+        if ($this->curveName) {
+            return $this->curveName;
+        }
+
+        if ($this->curve instanceof MontgomeryCurve) {
+            $this->curveName = $this->curve instanceof Curve25519 ? 'Curve25519' : 'Curve448';
+            return $this->curveName;
+        }
+
+        if ($this->curve instanceof TwistedEdwardsCurve) {
+            $this->curveName = $this->curve instanceof Ed25519 ? 'Ed25519' : 'Ed448';
+            return $this->curveName;
+        }
+
+        $params = $this->getParameters()->toString('PKCS8', ['namedCurve' => true]);
+        $decoded = ASN1::extractBER($params);
+        $decoded = ASN1::decodeBER($decoded);
+        $decoded = ASN1::asn1map($decoded[0], ECParameters::MAP);
+        if (isset($decoded['namedCurve'])) {
+            $this->curveName = $decoded['namedCurve'];
+            return $decoded['namedCurve'];
+        }
+
+        if (!$namedCurves) {
+            PKCS1::useSpecifiedCurve();
+        }
+
+        return $decoded;
+    }
+
+    /**
+     * Returns the key size
+     *
+     * Quoting https://tools.ietf.org/html/rfc5656#section-2,
+     *
+     * "The size of a set of elliptic curve domain parameters on a prime
+     *  curve is defined as the number of bits in the binary representation
+     *  of the field order, commonly denoted by p.  Size on a
+     *  characteristic-2 curve is defined as the number of bits in the binary
+     *  representation of the field, commonly denoted by m.  A set of
+     *  elliptic curve domain parameters defines a group of order n generated
+     *  by a base point P"
+     */
+    public function getLength(): int
+    {
+        return $this->curve->getLength();
+    }
+
+    /**
+     * Returns the current engine being used
+     *
+     * @see self::useInternalEngine()
+     * @see self::useBestEngine()
+     */
+    public function getEngine(): string
+    {
+        if (!isset(self::$engines['PHP'])) {
+            self::useBestEngine();
+        }
+        if ($this->curve instanceof TwistedEdwardsCurve) {
+            return $this->curve instanceof Ed25519 && self::$engines['libsodium'] && !isset($this->context) ?
+                'libsodium' : 'PHP';
+        }
+
+        return self::$engines['OpenSSL'] && in_array($this->hash->getHash(), openssl_get_md_methods()) ?
+            'OpenSSL' : 'PHP';
+    }
+
+    /**
+     * Returns the public key coordinates as a string
+     *
+     * Used by ECDH
+     */
+    public function getEncodedCoordinates(): string
+    {
+        if ($this->curve instanceof MontgomeryCurve) {
+            return strrev($this->QA[0]->toBytes(true));
+        }
+        if ($this->curve instanceof TwistedEdwardsCurve) {
+            return $this->curve->encodePoint($this->QA);
+        }
+        return "\4" . $this->QA[0]->toBytes(true) . $this->QA[1]->toBytes(true);
+    }
+
+    /**
+     * Returns the parameters
+     *
+     * @param string $type optional
+     * @see self::getPublicKey()
+     */
+    public function getParameters(string $type = 'PKCS1')
+    {
+        $type = self::validatePlugin('Keys', $type, 'saveParameters');
+
+        $key = $type::saveParameters($this->curve);
+
+        return EC::load($key, 'PKCS1')
+            ->withHash($this->hash->getHash())
+            ->withSignatureFormat($this->shortFormat);
+    }
+
+    /**
+     * Determines the signature padding mode
+     *
+     * Valid values are: ASN1, SSH2, Raw
+     */
+    public function withSignatureFormat(string $format): EC
+    {
+        if ($this->curve instanceof MontgomeryCurve) {
+            throw new UnsupportedOperationException('Montgomery Curves cannot be used to create signatures');
+        }
+
+        $new = clone $this;
+        $new->shortFormat = $format;
+        $new->sigFormat = self::validatePlugin('Signature', $format);
+        return $new;
+    }
+
+    /**
+     * Returns the signature format currently being used
+     */
+    public function getSignatureFormat(): string
+    {
+        return $this->shortFormat;
+    }
+
+    /**
+     * Sets the context
+     *
+     * Used by Ed25519 / Ed448.
+     *
+     * @param string|null $context optional
+     * @see self::verify()
+          * @see self::sign()
+     */
+    public function withContext(?string $context = null): EC
+    {
+        if (!$this->curve instanceof TwistedEdwardsCurve) {
+            throw new UnsupportedCurveException('Only Ed25519 and Ed448 support contexts');
+        }
+
+        $new = clone $this;
+        if (!isset($context)) {
+            $new->context = null;
+            return $new;
+        }
+        if (!is_string($context)) {
+            throw new InvalidArgumentException('setContext expects a string');
+        }
+        if (strlen($context) > 255) {
+            throw new LengthException('The context is supposed to be, at most, 255 bytes long');
+        }
+        $new->context = $context;
+        return $new;
+    }
+
+    /**
+     * Returns the signature format currently being used
+     */
+    public function getContext(): string
+    {
+        return $this->context;
+    }
+
+    /**
+     * Determines which hashing function should be used
+     */
+    public function withHash(string $hash): AsymmetricKey
+    {
+        if ($this->curve instanceof MontgomeryCurve) {
+            throw new UnsupportedOperationException('Montgomery Curves cannot be used to create signatures');
+        }
+        if ($this->curve instanceof Ed25519 && $hash != 'sha512') {
+            throw new UnsupportedAlgorithmException('Ed25519 only supports sha512 as a hash');
+        }
+        if ($this->curve instanceof Ed448 && $hash != 'shake256-912') {
+            throw new UnsupportedAlgorithmException('Ed448 only supports shake256 with a length of 114 bytes');
+        }
+
+        return parent::withHash($hash);
+    }
+
+    /**
+     * __toString() magic method
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        if ($this->curve instanceof MontgomeryCurve) {
+            return '';
+        }
+
+        return parent::__toString();
+    }
+}
diff --git a/phpseclib/Crypt/EC/BaseCurves/Base.php b/phpseclib/Crypt/EC/BaseCurves/Base.php
new file mode 100644
index 000000000..4e4642666
--- /dev/null
+++ b/phpseclib/Crypt/EC/BaseCurves/Base.php
@@ -0,0 +1,217 @@
+<?php
+
+/**
+ * Curve methods common to all curves
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\BaseCurves;
+
+use phpseclib3\Exception\RangeException;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Math\FiniteField\Integer;
+
+/**
+ * Base
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Base
+{
+    /**
+     * The Order
+     *
+     * @var BigInteger
+     */
+    protected $order;
+
+    /**
+     * Finite Field Integer factory
+     *
+     * @var Integer
+     */
+    protected $factory;
+
+    /**
+     * Returns a random integer
+     *
+     * @return object
+     */
+    public function randomInteger()
+    {
+        return $this->factory->randomInteger();
+    }
+
+    /**
+     * Converts a BigInteger to a \phpseclib3\Math\FiniteField\Integer integer
+     *
+     * @return object
+     */
+    public function convertInteger(BigInteger $x)
+    {
+        return $this->factory->newInteger($x);
+    }
+
+    /**
+     * Returns the length, in bytes, of the modulo
+     *
+     * @return Integer
+     */
+    public function getLengthInBytes(): int
+    {
+        return $this->factory->getLengthInBytes();
+    }
+
+    /**
+     * Returns the length, in bits, of the modulo
+     *
+     * @return Integer
+     */
+    public function getLength(): int
+    {
+        return $this->factory->getLength();
+    }
+
+    /**
+     * Multiply a point on the curve by a scalar
+     *
+     * Uses the montgomery ladder technique as described here:
+     *
+     * https://en.wikipedia.org/wiki/Elliptic_curve_point_multiplication#Montgomery_ladder
+     * https://github.com/phpecc/phpecc/issues/16#issuecomment-59176772
+     */
+    public function multiplyPoint(array $p, BigInteger $d): array
+    {
+        $alreadyInternal = isset($p[2]);
+        $r = $alreadyInternal ?
+            [[], $p] :
+            [[], $this->convertToInternal($p)];
+
+        $d = $d->toBits();
+        for ($i = 0; $i < strlen($d); $i++) {
+            $d_i = (int) $d[$i];
+            $r[1 - $d_i] = $this->addPoint($r[0], $r[1]);
+            $r[$d_i] = $this->doublePoint($r[$d_i]);
+        }
+
+        return $alreadyInternal ? $r[0] : $this->convertToAffine($r[0]);
+    }
+
+    /**
+     * Creates a random scalar multiplier
+     */
+    public function createRandomMultiplier(): BigInteger
+    {
+        static $one;
+        if (!isset($one)) {
+            $one = new BigInteger(1);
+        }
+
+        return BigInteger::randomRange($one, $this->order->subtract($one));
+    }
+
+    /**
+     * Performs range check
+     */
+    public function rangeCheck(BigInteger $x): void
+    {
+        static $zero;
+        if (!isset($zero)) {
+            $zero = new BigInteger();
+        }
+
+        if (!isset($this->order)) {
+            throw new RuntimeException('setOrder needs to be called before this method');
+        }
+        if ($x->compare($this->order) > 0 || $x->compare($zero) <= 0) {
+            throw new RangeException('x must be between 1 and the order of the curve');
+        }
+    }
+
+    /**
+     * Sets the Order
+     */
+    public function setOrder(BigInteger $order): void
+    {
+        $this->order = $order;
+    }
+
+    /**
+     * Returns the Order
+     */
+    public function getOrder(): BigInteger
+    {
+        return $this->order;
+    }
+
+    /**
+     * Use a custom defined modular reduction function
+     *
+     * @return object
+     */
+    public function setReduction(callable $func)
+    {
+        $this->factory->setReduction($func);
+    }
+
+    /**
+     * Returns the affine point
+     *
+     * @return object[]
+     */
+    public function convertToAffine(array $p): array
+    {
+        return $p;
+    }
+
+    /**
+     * Converts an affine point to a jacobian coordinate
+     *
+     * @return object[]
+     */
+    public function convertToInternal(array $p): array
+    {
+        return $p;
+    }
+
+    /**
+     * Negates a point
+     *
+     * @return object[]
+     */
+    public function negatePoint(array $p): array
+    {
+        $temp = [
+            $p[0],
+            $p[1]->negate(),
+        ];
+        if (isset($p[2])) {
+            $temp[] = $p[2];
+        }
+        return $temp;
+    }
+
+    /**
+     * Multiply and Add Points
+     *
+     * @return int[]
+     */
+    public function multiplyAddPoints(array $points, array $scalars): array
+    {
+        $p1 = $this->convertToInternal($points[0]);
+        $p2 = $this->convertToInternal($points[1]);
+        $p1 = $this->multiplyPoint($p1, $scalars[0]);
+        $p2 = $this->multiplyPoint($p2, $scalars[1]);
+        $r = $this->addPoint($p1, $p2);
+        return $this->convertToAffine($r);
+    }
+}
diff --git a/phpseclib/Crypt/EC/BaseCurves/Binary.php b/phpseclib/Crypt/EC/BaseCurves/Binary.php
new file mode 100644
index 000000000..09100a327
--- /dev/null
+++ b/phpseclib/Crypt/EC/BaseCurves/Binary.php
@@ -0,0 +1,371 @@
+<?php
+
+/**
+ * Curves over y^2 + x*y = x^3 + a*x^2 + b
+ *
+ * These are curves used in SEC 2 over prime fields: http://www.secg.org/SEC2-Ver-1.0.pdf
+ * The curve is a weierstrass curve with a[3] and a[2] set to 0.
+ *
+ * Uses Jacobian Coordinates for speed if able:
+ *
+ * https://en.wikipedia.org/wiki/Jacobian_curve
+ * https://en.wikibooks.org/wiki/Cryptography/Prime_Curve/Jacobian_Coordinates
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\BaseCurves;
+
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Math\BinaryField;
+use phpseclib3\Math\BinaryField\Integer as BinaryInteger;
+use phpseclib3\Math\PrimeField\Integer;
+
+/**
+ * Curves over y^2 + x*y = x^3 + a*x^2 + b
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class Binary extends Base
+{
+    /**
+     * Binary Field Integer factory
+     *
+     * @var BinaryField
+     */
+    protected $factory;
+
+    /**
+     * Cofficient for x^1
+     *
+     * @var object
+     */
+    protected $a;
+
+    /**
+     * Cofficient for x^0
+     *
+     * @var object
+     */
+    protected $b;
+
+    /**
+     * Base Point
+     *
+     * @var object
+     */
+    protected $p;
+
+    /**
+     * The number one over the specified finite field
+     *
+     * @var object
+     */
+    protected $one;
+
+    /**
+     * The modulo
+     *
+     * @var array
+     */
+    protected $modulo;
+
+    /**
+     * The Order
+     *
+     * @var BigInteger
+     */
+    protected $order;
+
+    /**
+     * Sets the modulo
+     */
+    public function setModulo(int ...$modulo): void
+    {
+        $this->modulo = $modulo;
+        $this->factory = new BinaryField(...$modulo);
+
+        $this->one = $this->factory->newInteger("\1");
+    }
+
+    /**
+     * Set coefficients a and b
+     */
+    public function setCoefficients(string $a, string $b): void
+    {
+        if (!isset($this->factory)) {
+            throw new RuntimeException('setModulo needs to be called before this method');
+        }
+        $this->a = $this->factory->newInteger(pack('H*', $a));
+        $this->b = $this->factory->newInteger(pack('H*', $b));
+    }
+
+    /**
+     * Set x and y coordinates for the base point
+     *
+     * @param string|BinaryInteger $x
+     * @param string|BinaryInteger $y
+     */
+    public function setBasePoint($x, $y): void
+    {
+        switch (true) {
+            case !is_string($x) && !$x instanceof BinaryInteger:
+                throw new UnexpectedValueException('Argument 1 passed to Binary::setBasePoint() must be a string or an instance of BinaryField\Integer');
+            case !is_string($y) && !$y instanceof BinaryInteger:
+                throw new UnexpectedValueException('Argument 2 passed to Binary::setBasePoint() must be a string or an instance of BinaryField\Integer');
+        }
+        if (!isset($this->factory)) {
+            throw new RuntimeException('setModulo needs to be called before this method');
+        }
+        $this->p = [
+            is_string($x) ? $this->factory->newInteger(pack('H*', $x)) : $x,
+            is_string($y) ? $this->factory->newInteger(pack('H*', $y)) : $y,
+        ];
+    }
+
+    /**
+     * Retrieve the base point as an array
+     *
+     * @return array
+     */
+    public function getBasePoint()
+    {
+        if (!isset($this->factory)) {
+            throw new RuntimeException('setModulo needs to be called before this method');
+        }
+        /*
+        if (!isset($this->p)) {
+            throw new \phpseclib3\Exception\RuntimeException('setBasePoint needs to be called before this method');
+        }
+        */
+        return $this->p;
+    }
+
+    /**
+     * Adds two points on the curve
+     *
+     * @return FiniteField[]
+     */
+    public function addPoint(array $p, array $q): array
+    {
+        if (!isset($this->factory)) {
+            throw new RuntimeException('setModulo needs to be called before this method');
+        }
+
+        if (!count($p) || !count($q)) {
+            if (count($q)) {
+                return $q;
+            }
+            if (count($p)) {
+                return $p;
+            }
+            return [];
+        }
+
+        if (!isset($p[2]) || !isset($q[2])) {
+            throw new RuntimeException('Affine coordinates need to be manually converted to "Jacobi" coordinates or vice versa');
+        }
+
+        if ($p[0]->equals($q[0])) {
+            return !$p[1]->equals($q[1]) ? [] : $this->doublePoint($p);
+        }
+
+        // formulas from http://hyperelliptic.org/EFD/g12o/auto-shortw-jacobian.html
+
+        [$x1, $y1, $z1] = $p;
+        [$x2, $y2, $z2] = $q;
+
+        $o1 = $z1->multiply($z1);
+        $b = $x2->multiply($o1);
+
+        if ($z2->equals($this->one)) {
+            $d = $y2->multiply($o1)->multiply($z1);
+            $e = $x1->add($b);
+            $f = $y1->add($d);
+            $z3 = $e->multiply($z1);
+            $h = $f->multiply($x2)->add($z3->multiply($y2));
+            $i = $f->add($z3);
+            $g = $z3->multiply($z3);
+            $p1 = $this->a->multiply($g);
+            $p2 = $f->multiply($i);
+            $p3 = $e->multiply($e)->multiply($e);
+            $x3 = $p1->add($p2)->add($p3);
+            $y3 = $i->multiply($x3)->add($g->multiply($h));
+
+            return [$x3, $y3, $z3];
+        }
+
+        $o2 = $z2->multiply($z2);
+        $a = $x1->multiply($o2);
+        $c = $y1->multiply($o2)->multiply($z2);
+        $d = $y2->multiply($o1)->multiply($z1);
+        $e = $a->add($b);
+        $f = $c->add($d);
+        $g = $e->multiply($z1);
+        $h = $f->multiply($x2)->add($g->multiply($y2));
+        $z3 = $g->multiply($z2);
+        $i = $f->add($z3);
+        $p1 = $this->a->multiply($z3->multiply($z3));
+        $p2 = $f->multiply($i);
+        $p3 = $e->multiply($e)->multiply($e);
+        $x3 = $p1->add($p2)->add($p3);
+        $y3 = $i->multiply($x3)->add($g->multiply($g)->multiply($h));
+
+        return [$x3, $y3, $z3];
+    }
+
+    /**
+     * Doubles a point on a curve
+     *
+     * @return FiniteField[]
+     */
+    public function doublePoint(array $p): array
+    {
+        if (!isset($this->factory)) {
+            throw new RuntimeException('setModulo needs to be called before this method');
+        }
+
+        if (!count($p)) {
+            return [];
+        }
+
+        if (!isset($p[2])) {
+            throw new RuntimeException('Affine coordinates need to be manually converted to "Jacobi" coordinates or vice versa');
+        }
+
+        // formulas from http://hyperelliptic.org/EFD/g12o/auto-shortw-jacobian.html
+
+        [$x1, $y1, $z1] = $p;
+
+        $a = $x1->multiply($x1);
+        $b = $a->multiply($a);
+
+        if ($z1->equals($this->one)) {
+            $x3 = $b->add($this->b);
+            $z3 = clone $x1;
+            $p1 = $a->add($y1)->add($z3)->multiply($this->b);
+            $p2 = $a->add($y1)->multiply($b);
+            $y3 = $p1->add($p2);
+
+            return [$x3, $y3, $z3];
+        }
+
+        $c = $z1->multiply($z1);
+        $d = $c->multiply($c);
+        $x3 = $b->add($this->b->multiply($d->multiply($d)));
+        $z3 = $x1->multiply($c);
+        $p1 = $b->multiply($z3);
+        $p2 = $a->add($y1->multiply($z1))->add($z3)->multiply($x3);
+        $y3 = $p1->add($p2);
+
+        return [$x3, $y3, $z3];
+    }
+
+    /**
+     * Returns the X coordinate and the derived Y coordinate
+     *
+     * Not supported because it is covered by patents.
+     * Quoting https://www.openssl.org/docs/man1.1.0/apps/ecparam.html ,
+     *
+     * "Due to patent issues the compressed option is disabled by default for binary curves
+     *  and can be enabled by defining the preprocessor macro OPENSSL_EC_BIN_PT_COMP at
+     *  compile time."
+     */
+    public function derivePoint($m): array
+    {
+        throw new RuntimeException('Point compression on binary finite field elliptic curves is not supported');
+    }
+
+    /**
+     * Tests whether or not the x / y values satisfy the equation
+     *
+     * @return boolean
+     */
+    public function verifyPoint(array $p): bool
+    {
+        [$x, $y] = $p;
+        $lhs = $y->multiply($y);
+        $lhs = $lhs->add($x->multiply($y));
+        $x2 = $x->multiply($x);
+        $x3 = $x2->multiply($x);
+        $rhs = $x3->add($this->a->multiply($x2))->add($this->b);
+
+        return $lhs->equals($rhs);
+    }
+
+    /**
+     * Returns the modulo
+     */
+    public function getModulo(): array
+    {
+        return $this->modulo;
+    }
+
+    /**
+     * Returns the a coefficient
+     *
+     * @return Integer
+     */
+    public function getA()
+    {
+        return $this->a;
+    }
+
+    /**
+     * Returns the a coefficient
+     *
+     * @return Integer
+     */
+    public function getB()
+    {
+        return $this->b;
+    }
+
+    /**
+     * Returns the affine point
+     *
+     * A Jacobian Coordinate is of the form (x, y, z).
+     * To convert a Jacobian Coordinate to an Affine Point
+     * you do (x / z^2, y / z^3)
+     *
+     * @return Integer[]
+     */
+    public function convertToAffine(array $p): array
+    {
+        if (!isset($p[2])) {
+            return $p;
+        }
+        [$x, $y, $z] = $p;
+        $z = $this->one->divide($z);
+        $z2 = $z->multiply($z);
+        return [
+            $x->multiply($z2),
+            $y->multiply($z2)->multiply($z),
+        ];
+    }
+
+    /**
+     * Converts an affine point to a jacobian coordinate
+     *
+     * @return Integer[]
+     */
+    public function convertToInternal(array $p): array
+    {
+        if (isset($p[2])) {
+            return $p;
+        }
+
+        $p[2] = clone $this->one;
+        $p['fresh'] = true;
+        return $p;
+    }
+}
diff --git a/phpseclib/Crypt/EC/BaseCurves/KoblitzPrime.php b/phpseclib/Crypt/EC/BaseCurves/KoblitzPrime.php
new file mode 100644
index 000000000..81a24c63a
--- /dev/null
+++ b/phpseclib/Crypt/EC/BaseCurves/KoblitzPrime.php
@@ -0,0 +1,335 @@
+<?php
+
+/**
+ * Generalized Koblitz Curves over y^2 = x^3 + b.
+ *
+ * According to http://www.secg.org/SEC2-Ver-1.0.pdf Koblitz curves are over the GF(2**m)
+ * finite field. Both the $a$ and $b$ coefficients are either 0 or 1. However, SEC2
+ * generalizes the definition to include curves over GF(P) "which possess an efficiently
+ * computable endomorphism".
+ *
+ * For these generalized Koblitz curves $b$ doesn't have to be 0 or 1. Whether or not $a$
+ * has any restrictions on it is unclear, however, for all the GF(P) Koblitz curves defined
+ * in SEC2 v1.0 $a$ is $0$ so all of the methods defined herein will assume that it is.
+ *
+ * I suppose we could rename the $b$ coefficient to $a$, however, the documentation refers
+ * to $b$ so we'll just keep it.
+ *
+ * If a later version of SEC2 comes out wherein some $a$ values are non-zero we can create a
+ * new method for those. eg. KoblitzA1Prime.php or something.
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\BaseCurves;
+
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Math\PrimeField;
+
+/**
+ * Curves over y^2 = x^3 + b
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class KoblitzPrime extends Prime
+{
+    /**
+     * Basis
+     *
+     * @var list<array{a: BigInteger, b: BigInteger}>
+     */
+    public $basis;
+
+    /**
+     * Beta
+     *
+     * @var PrimeField\Integer
+     */
+    public $beta;
+
+    // don't overwrite setCoefficients() with one that only accepts one parameter so that
+    // one might be able to switch between KoblitzPrime and Prime more easily (for benchmarking
+    // purposes).
+
+    /**
+     * Multiply and Add Points
+     *
+     * Uses a efficiently computable endomorphism to achieve a slight speedup
+     *
+     * Adapted from:
+     * https://github.com/indutny/elliptic/blob/725bd91/lib/elliptic/curve/short.js#L219
+     *
+     * @return int[]
+     */
+    public function multiplyAddPoints(array $points, array $scalars): array
+    {
+        static $zero, $one, $two;
+        if (!isset($two)) {
+            $two = new BigInteger(2);
+            $one = new BigInteger(1);
+        }
+
+        if (!isset($this->beta)) {
+            // get roots
+            $inv = $this->one->divide($this->two)->negate();
+            $s = $this->three->negate()->squareRoot()->multiply($inv);
+            $betas = [
+                $inv->add($s),
+                $inv->subtract($s),
+            ];
+            $this->beta = $betas[0]->compare($betas[1]) < 0 ? $betas[0] : $betas[1];
+            //echo strtoupper($this->beta->toHex(true)) . "\n"; exit;
+        }
+
+        if (!isset($this->basis)) {
+            $factory = new PrimeField($this->order);
+            $tempOne = $factory->newInteger($one);
+            $tempTwo = $factory->newInteger($two);
+            $tempThree = $factory->newInteger(new BigInteger(3));
+
+            $inv = $tempOne->divide($tempTwo)->negate();
+            $s = $tempThree->negate()->squareRoot()->multiply($inv);
+
+            $lambdas = [
+                $inv->add($s),
+                $inv->subtract($s),
+            ];
+
+            $lhs = $this->multiplyPoint($this->p, $lambdas[0])[0];
+            $rhs = $this->p[0]->multiply($this->beta);
+            $lambda = $lhs->equals($rhs) ? $lambdas[0] : $lambdas[1];
+
+            $this->basis = static::extendedGCD($lambda->toBigInteger(), $this->order);
+            ///*
+            foreach ($this->basis as $basis) {
+                echo strtoupper($basis['a']->toHex(true)) . "\n";
+                echo strtoupper($basis['b']->toHex(true)) . "\n\n";
+            }
+            exit;
+            //*/
+        }
+
+        $npoints = $nscalars = [];
+        for ($i = 0; $i < count($points); $i++) {
+            $p = $points[$i];
+            $k = $scalars[$i]->toBigInteger();
+
+            // begin split
+            [$v1, $v2] = $this->basis;
+
+            $c1 = $v2['b']->multiply($k);
+            [$c1, $r] = $c1->divide($this->order);
+            if ($this->order->compare($r->multiply($two)) <= 0) {
+                $c1 = $c1->add($one);
+            }
+
+            $c2 = $v1['b']->negate()->multiply($k);
+            [$c2, $r] = $c2->divide($this->order);
+            if ($this->order->compare($r->multiply($two)) <= 0) {
+                $c2 = $c2->add($one);
+            }
+
+            $p1 = $c1->multiply($v1['a']);
+            $p2 = $c2->multiply($v2['a']);
+            $q1 = $c1->multiply($v1['b']);
+            $q2 = $c2->multiply($v2['b']);
+
+            $k1 = $k->subtract($p1)->subtract($p2);
+            $k2 = $q1->add($q2)->negate();
+            // end split
+
+            $beta = [
+                $p[0]->multiply($this->beta),
+                $p[1],
+                clone $this->one,
+            ];
+
+            if (isset($p['naf'])) {
+                $beta['naf'] = array_map(function ($p) {
+                    return [
+                        $p[0]->multiply($this->beta),
+                        $p[1],
+                        clone $this->one,
+                    ];
+                }, $p['naf']);
+                $beta['nafwidth'] = $p['nafwidth'];
+            }
+
+            if ($k1->isNegative()) {
+                $k1 = $k1->negate();
+                $p = $this->negatePoint($p);
+            }
+
+            if ($k2->isNegative()) {
+                $k2 = $k2->negate();
+                $beta = $this->negatePoint($beta);
+            }
+
+            $pos = 2 * $i;
+            $npoints[$pos] = $p;
+            $nscalars[$pos] = $this->factory->newInteger($k1);
+
+            $pos++;
+            $npoints[$pos] = $beta;
+            $nscalars[$pos] = $this->factory->newInteger($k2);
+        }
+
+        return parent::multiplyAddPoints($npoints, $nscalars);
+    }
+
+    /**
+     * Returns the numerator and denominator of the slope
+     *
+     * @return FiniteField[]
+     */
+    protected function doublePointHelper(array $p): array
+    {
+        $numerator = $this->three->multiply($p[0])->multiply($p[0]);
+        $denominator = $this->two->multiply($p[1]);
+        return [$numerator, $denominator];
+    }
+
+    /**
+     * Doubles a jacobian coordinate on the curve
+     *
+     * See http://hyperelliptic.org/EFD/g1p/auto-shortw-jacobian-0.html#doubling-dbl-2009-l
+     *
+     * @return FiniteField[]
+     */
+    protected function jacobianDoublePoint(array $p): array
+    {
+        [$x1, $y1, $z1] = $p;
+        $a = $x1->multiply($x1);
+        $b = $y1->multiply($y1);
+        $c = $b->multiply($b);
+        $d = $x1->add($b);
+        $d = $d->multiply($d)->subtract($a)->subtract($c)->multiply($this->two);
+        $e = $this->three->multiply($a);
+        $f = $e->multiply($e);
+        $x3 = $f->subtract($this->two->multiply($d));
+        $y3 = $e->multiply($d->subtract($x3))->subtract(
+            $this->eight->multiply($c)
+        );
+        $z3 = $this->two->multiply($y1)->multiply($z1);
+        return [$x3, $y3, $z3];
+    }
+
+    /**
+     * Doubles a "fresh" jacobian coordinate on the curve
+     *
+     * See http://hyperelliptic.org/EFD/g1p/auto-shortw-jacobian-0.html#doubling-mdbl-2007-bl
+     *
+     * @return FiniteField[]
+     */
+    protected function jacobianDoublePointMixed(array $p): array
+    {
+        [$x1, $y1] = $p;
+        $xx = $x1->multiply($x1);
+        $yy = $y1->multiply($y1);
+        $yyyy = $yy->multiply($yy);
+        $s = $x1->add($yy);
+        $s = $s->multiply($s)->subtract($xx)->subtract($yyyy)->multiply($this->two);
+        $m = $this->three->multiply($xx);
+        $t = $m->multiply($m)->subtract($this->two->multiply($s));
+        $x3 = $t;
+        $y3 = $s->subtract($t);
+        $y3 = $m->multiply($y3)->subtract($this->eight->multiply($yyyy));
+        $z3 = $this->two->multiply($y1);
+        return [$x3, $y3, $z3];
+    }
+
+    /**
+     * Tests whether or not the x / y values satisfy the equation
+     *
+     * @return boolean
+     */
+    public function verifyPoint(array $p): bool
+    {
+        [$x, $y] = $p;
+        $lhs = $y->multiply($y);
+        $temp = $x->multiply($x)->multiply($x);
+        $rhs = $temp->add($this->b);
+
+        return $lhs->equals($rhs);
+    }
+
+    /**
+     * Calculates the parameters needed from the Euclidean algorithm as discussed at
+     * http://diamond.boisestate.edu/~liljanab/MATH308/GuideToECC.pdf#page=148
+     *
+     * @return BigInteger[]
+     */
+    protected static function extendedGCD(BigInteger $u, BigInteger $v): array
+    {
+        $one = new BigInteger(1);
+        $zero = new BigInteger();
+
+        $a = clone $one;
+        $b = clone $zero;
+        $c = clone $zero;
+        $d = clone $one;
+
+        $stop = $v->bitwise_rightShift($v->getLength() >> 1);
+
+        $a1 = clone $zero;
+        $b1 = clone $zero;
+        $a2 = clone $zero;
+        $b2 = clone $zero;
+
+        $postGreatestIndex = 0;
+
+        while (!$v->equals($zero)) {
+            [$q] = $u->divide($v);
+
+            $temp = $u;
+            $u = $v;
+            $v = $temp->subtract($v->multiply($q));
+
+            $temp = $a;
+            $a = $c;
+            $c = $temp->subtract($a->multiply($q));
+
+            $temp = $b;
+            $b = $d;
+            $d = $temp->subtract($b->multiply($q));
+
+            if ($v->compare($stop) > 0) {
+                $a0 = $v;
+                $b0 = $c;
+            } else {
+                $postGreatestIndex++;
+            }
+
+            if ($postGreatestIndex == 1) {
+                $a1 = $v;
+                $b1 = $c->negate();
+            }
+
+            if ($postGreatestIndex == 2) {
+                $rhs = $a0->multiply($a0)->add($b0->multiply($b0));
+                $lhs = $v->multiply($v)->add($b->multiply($b));
+                if ($lhs->compare($rhs) <= 0) {
+                    $a2 = $a0;
+                    $b2 = $b0->negate();
+                } else {
+                    $a2 = $v;
+                    $b2 = $c->negate();
+                }
+
+                break;
+            }
+        }
+
+        return [
+            ['a' => $a1, 'b' => $b1],
+            ['a' => $a2, 'b' => $b2],
+        ];
+    }
+}
diff --git a/phpseclib/Crypt/EC/BaseCurves/Montgomery.php b/phpseclib/Crypt/EC/BaseCurves/Montgomery.php
new file mode 100644
index 000000000..9909d621a
--- /dev/null
+++ b/phpseclib/Crypt/EC/BaseCurves/Montgomery.php
@@ -0,0 +1,281 @@
+<?php
+
+/**
+ * Curves over y^2 = x^3 + a*x + x
+ *
+ * Technically, a Montgomery curve has a coefficient for y^2 but for Curve25519 and Curve448 that
+ * coefficient is 1.
+ *
+ * Curve25519 and Curve448 do not make use of the y coordinate, which makes it unsuitable for use
+ * with ECDSA / EdDSA. A few other differences between Curve25519 and Ed25519 are discussed at
+ * https://crypto.stackexchange.com/a/43058/4520
+ *
+ * More info:
+ *
+ * https://en.wikipedia.org/wiki/Montgomery_curve
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2019 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\BaseCurves;
+
+use phpseclib3\Crypt\EC\Curves\Curve25519;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Math\PrimeField;
+use phpseclib3\Math\PrimeField\Integer as PrimeInteger;
+
+/**
+ * Curves over y^2 = x^3 + a*x + x
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class Montgomery extends Base
+{
+    /**
+     * Prime Field Integer factory
+     *
+     * @var PrimeField
+     */
+    protected $factory;
+
+    /**
+     * Cofficient for x
+     *
+     * @var object
+     */
+    protected $a;
+
+    /**
+     * Constant used for point doubling
+     *
+     * @var object
+     */
+    protected $a24;
+
+    /**
+     * The Number Zero
+     *
+     * @var object
+     */
+    protected $zero;
+
+    /**
+     * The Number One
+     *
+     * @var object
+     */
+    protected $one;
+
+    /**
+     * Base Point
+     *
+     * @var object
+     */
+    protected $p;
+
+    /**
+     * The modulo
+     *
+     * @var BigInteger
+     */
+    protected $modulo;
+
+    /**
+     * The Order
+     *
+     * @var BigInteger
+     */
+    protected $order;
+
+    /**
+     * Sets the modulo
+     */
+    public function setModulo(BigInteger $modulo): void
+    {
+        $this->modulo = $modulo;
+        $this->factory = new PrimeField($modulo);
+        $this->zero = $this->factory->newInteger(new BigInteger());
+        $this->one = $this->factory->newInteger(new BigInteger(1));
+    }
+
+    /**
+     * Set coefficients a
+     */
+    public function setCoefficients(BigInteger $a): void
+    {
+        if (!isset($this->factory)) {
+            throw new RuntimeException('setModulo needs to be called before this method');
+        }
+        $this->a = $this->factory->newInteger($a);
+        $two = $this->factory->newInteger(new BigInteger(2));
+        $four = $this->factory->newInteger(new BigInteger(4));
+        $this->a24 = $this->a->subtract($two)->divide($four);
+    }
+
+    /**
+     * Set x and y coordinates for the base point
+     *
+     * @param BigInteger|PrimeInteger $x
+     * @param BigInteger|PrimeInteger $y
+     * @return PrimeInteger[]
+     */
+    public function setBasePoint($x, $y): array
+    {
+        switch (true) {
+            case !$x instanceof BigInteger && !$x instanceof PrimeInteger:
+                throw new UnexpectedValueException('Argument 1 passed to Prime::setBasePoint() must be an instance of either BigInteger or PrimeField\Integer');
+            case !$y instanceof BigInteger && !$y instanceof PrimeInteger:
+                throw new UnexpectedValueException('Argument 2 passed to Prime::setBasePoint() must be an instance of either BigInteger or PrimeField\Integer');
+        }
+        if (!isset($this->factory)) {
+            throw new RuntimeException('setModulo needs to be called before this method');
+        }
+        $this->p = [
+            $x instanceof BigInteger ? $this->factory->newInteger($x) : $x,
+            $y instanceof BigInteger ? $this->factory->newInteger($y) : $y,
+        ];
+    }
+
+    /**
+     * Retrieve the base point as an array
+     *
+     * @return array
+     */
+    public function getBasePoint()
+    {
+        if (!isset($this->factory)) {
+            throw new RuntimeException('setModulo needs to be called before this method');
+        }
+        /*
+        if (!isset($this->p)) {
+            throw new \phpseclib3\Exception\RuntimeException('setBasePoint needs to be called before this method');
+        }
+        */
+        return $this->p;
+    }
+
+    /**
+     * Doubles and adds a point on a curve
+     *
+     * See https://tools.ietf.org/html/draft-ietf-tls-curve25519-01#appendix-A.1.3
+     *
+     * @return FiniteField[][]
+     */
+    private function doubleAndAddPoint(array $p, array $q, PrimeInteger $x1): array
+    {
+        if (!isset($this->factory)) {
+            throw new RuntimeException('setModulo needs to be called before this method');
+        }
+
+        if (!count($p) || !count($q)) {
+            return [];
+        }
+
+        if (!isset($p[1])) {
+            throw new RuntimeException('Affine coordinates need to be manually converted to XZ coordinates');
+        }
+
+        [$x2, $z2] = $p;
+        [$x3, $z3] = $q;
+
+        $a = $x2->add($z2);
+        $aa = $a->multiply($a);
+        $b = $x2->subtract($z2);
+        $bb = $b->multiply($b);
+        $e = $aa->subtract($bb);
+        $c = $x3->add($z3);
+        $d = $x3->subtract($z3);
+        $da = $d->multiply($a);
+        $cb = $c->multiply($b);
+        $temp = $da->add($cb);
+        $x5 = $temp->multiply($temp);
+        $temp = $da->subtract($cb);
+        $z5 = $x1->multiply($temp->multiply($temp));
+        $x4 = $aa->multiply($bb);
+        $temp = static::class == Curve25519::class ? $bb : $aa;
+        $z4 = $e->multiply($temp->add($this->a24->multiply($e)));
+
+        return [
+            [$x4, $z4],
+            [$x5, $z5],
+        ];
+    }
+
+    /**
+     * Multiply a point on the curve by a scalar
+     *
+     * Uses the montgomery ladder technique as described here:
+     *
+     * https://en.wikipedia.org/wiki/Elliptic_curve_point_multiplication#Montgomery_ladder
+     * https://github.com/phpecc/phpecc/issues/16#issuecomment-59176772
+     */
+    public function multiplyPoint(array $p, BigInteger $d): array
+    {
+        $p1 = [$this->one, $this->zero];
+        $alreadyInternal = isset($p[1]);
+        $p2 = $this->convertToInternal($p);
+        $x = $p[0];
+
+        $b = $d->toBits();
+        $b = str_pad($b, 256, '0', STR_PAD_LEFT);
+        for ($i = 0; $i < strlen($b); $i++) {
+            $b_i = (int) $b[$i];
+            if ($b_i) {
+                [$p2, $p1] = $this->doubleAndAddPoint($p2, $p1, $x);
+            } else {
+                [$p1, $p2] = $this->doubleAndAddPoint($p1, $p2, $x);
+            }
+        }
+
+        return $alreadyInternal ? $p1 : $this->convertToAffine($p1);
+    }
+
+    /**
+     * Converts an affine point to an XZ coordinate
+     *
+     * From https://hyperelliptic.org/EFD/g1p/auto-montgom-xz.html
+     *
+     * XZ coordinates represent x y as X Z satsfying the following equations:
+     *
+     *   x=X/Z
+     *
+     * @return PrimeInteger[]
+     */
+    public function convertToInternal(array $p): array
+    {
+        if (empty($p)) {
+            return [clone $this->zero, clone $this->one];
+        }
+
+        if (isset($p[1])) {
+            return $p;
+        }
+
+        $p[1] = clone $this->one;
+
+        return $p;
+    }
+
+    /**
+     * Returns the affine point
+     *
+     * @return PrimeInteger[]
+     */
+    public function convertToAffine(array $p): array
+    {
+        if (!isset($p[1])) {
+            return $p;
+        }
+        [$x, $z] = $p;
+        return [$x->divide($z)];
+    }
+}
diff --git a/phpseclib/Crypt/EC/BaseCurves/Prime.php b/phpseclib/Crypt/EC/BaseCurves/Prime.php
new file mode 100644
index 000000000..ebaad641a
--- /dev/null
+++ b/phpseclib/Crypt/EC/BaseCurves/Prime.php
@@ -0,0 +1,785 @@
+<?php
+
+/**
+ * Curves over y^2 = x^3 + a*x + b
+ *
+ * These are curves used in SEC 2 over prime fields: http://www.secg.org/SEC2-Ver-1.0.pdf
+ * The curve is a weierstrass curve with a[1], a[3] and a[2] set to 0.
+ *
+ * Uses Jacobian Coordinates for speed if able:
+ *
+ * https://en.wikipedia.org/wiki/Jacobian_curve
+ * https://en.wikibooks.org/wiki/Cryptography/Prime_Curve/Jacobian_Coordinates
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\BaseCurves;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Math\Common\FiniteField\Integer;
+use phpseclib3\Math\PrimeField;
+use phpseclib3\Math\PrimeField\Integer as PrimeInteger;
+use phpseclib3\Math\PrimeFields;
+
+/**
+ * Curves over y^2 = x^3 + a*x + b
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class Prime extends Base
+{
+    /**
+     * Prime Field Integer factory
+     *
+     * @var PrimeFields
+     */
+    protected $factory;
+
+    /**
+     * Cofficient for x^1
+     *
+     * @var object
+     */
+    protected $a;
+
+    /**
+     * Cofficient for x^0
+     *
+     * @var object
+     */
+    protected $b;
+
+    /**
+     * Base Point
+     *
+     * @var object
+     */
+    protected $p;
+
+    /**
+     * The number one over the specified finite field
+     *
+     * @var object
+     */
+    protected $one;
+
+    /**
+     * The number two over the specified finite field
+     *
+     * @var object
+     */
+    protected $two;
+
+    /**
+     * The number three over the specified finite field
+     *
+     * @var object
+     */
+    protected $three;
+
+    /**
+     * The number four over the specified finite field
+     *
+     * @var object
+     */
+    protected $four;
+
+    /**
+     * The number eight over the specified finite field
+     *
+     * @var object
+     */
+    protected $eight;
+
+    /**
+     * The modulo
+     *
+     * @var BigInteger
+     */
+    protected $modulo;
+
+    /**
+     * The Order
+     *
+     * @var BigInteger
+     */
+    protected $order;
+
+    /**
+     * Sets the modulo
+     */
+    public function setModulo(BigInteger $modulo): void
+    {
+        $this->modulo = $modulo;
+        $this->factory = new PrimeField($modulo);
+        $this->two = $this->factory->newInteger(new BigInteger(2));
+        $this->three = $this->factory->newInteger(new BigInteger(3));
+        // used by jacobian coordinates
+        $this->one = $this->factory->newInteger(new BigInteger(1));
+        $this->four = $this->factory->newInteger(new BigInteger(4));
+        $this->eight = $this->factory->newInteger(new BigInteger(8));
+    }
+
+    /**
+     * Set coefficients a and b
+     */
+    public function setCoefficients(BigInteger $a, BigInteger $b): void
+    {
+        if (!isset($this->factory)) {
+            throw new RuntimeException('setModulo needs to be called before this method');
+        }
+        $this->a = $this->factory->newInteger($a);
+        $this->b = $this->factory->newInteger($b);
+    }
+
+    /**
+     * Set x and y coordinates for the base point
+     *
+     * @param BigInteger|PrimeInteger $x
+     * @param BigInteger|PrimeInteger $y
+     */
+    public function setBasePoint($x, $y): void
+    {
+        switch (true) {
+            case !$x instanceof BigInteger && !$x instanceof PrimeInteger:
+                throw new UnexpectedValueException('Argument 1 passed to Prime::setBasePoint() must be an instance of either BigInteger or PrimeField\Integer');
+            case !$y instanceof BigInteger && !$y instanceof PrimeInteger:
+                throw new UnexpectedValueException('Argument 2 passed to Prime::setBasePoint() must be an instance of either BigInteger or PrimeField\Integer');
+        }
+        if (!isset($this->factory)) {
+            throw new RuntimeException('setModulo needs to be called before this method');
+        }
+        $this->p = [
+            $x instanceof BigInteger ? $this->factory->newInteger($x) : $x,
+            $y instanceof BigInteger ? $this->factory->newInteger($y) : $y,
+        ];
+    }
+
+    /**
+     * Retrieve the base point as an array
+     *
+     * @return array
+     */
+    public function getBasePoint()
+    {
+        if (!isset($this->factory)) {
+            throw new RuntimeException('setModulo needs to be called before this method');
+        }
+        /*
+        if (!isset($this->p)) {
+            throw new \phpseclib3\Exception\RuntimeException('setBasePoint needs to be called before this method');
+        }
+        */
+        return $this->p;
+    }
+
+    /**
+     * Adds two "fresh" jacobian form on the curve
+     *
+     * @return FiniteField[]
+     */
+    protected function jacobianAddPointMixedXY(array $p, array $q): array
+    {
+        [$u1, $s1] = $p;
+        [$u2, $s2] = $q;
+        if ($u1->equals($u2)) {
+            if (!$s1->equals($s2)) {
+                return [];
+            } else {
+                return $this->doublePoint($p);
+            }
+        }
+        $h = $u2->subtract($u1);
+        $r = $s2->subtract($s1);
+        $h2 = $h->multiply($h);
+        $h3 = $h2->multiply($h);
+        $v = $u1->multiply($h2);
+        $x3 = $r->multiply($r)->subtract($h3)->subtract($v->multiply($this->two));
+        $y3 = $r->multiply(
+            $v->subtract($x3)
+        )->subtract(
+            $s1->multiply($h3)
+        );
+        return [$x3, $y3, $h];
+    }
+
+    /**
+     * Adds one "fresh" jacobian form on the curve
+     *
+     * The second parameter should be the "fresh" one
+     *
+     * @return FiniteField[]
+     */
+    protected function jacobianAddPointMixedX(array $p, array $q): array
+    {
+        [$u1, $s1, $z1] = $p;
+        [$x2, $y2] = $q;
+
+        $z12 = $z1->multiply($z1);
+
+        $u2 = $x2->multiply($z12);
+        $s2 = $y2->multiply($z12->multiply($z1));
+        if ($u1->equals($u2)) {
+            if (!$s1->equals($s2)) {
+                return [];
+            } else {
+                return $this->doublePoint($p);
+            }
+        }
+        $h = $u2->subtract($u1);
+        $r = $s2->subtract($s1);
+        $h2 = $h->multiply($h);
+        $h3 = $h2->multiply($h);
+        $v = $u1->multiply($h2);
+        $x3 = $r->multiply($r)->subtract($h3)->subtract($v->multiply($this->two));
+        $y3 = $r->multiply(
+            $v->subtract($x3)
+        )->subtract(
+            $s1->multiply($h3)
+        );
+        $z3 = $h->multiply($z1);
+        return [$x3, $y3, $z3];
+    }
+
+    /**
+     * Adds two jacobian coordinates on the curve
+     *
+     * @return FiniteField[]
+     */
+    protected function jacobianAddPoint(array $p, array $q): array
+    {
+        [$x1, $y1, $z1] = $p;
+        [$x2, $y2, $z2] = $q;
+
+        $z12 = $z1->multiply($z1);
+        $z22 = $z2->multiply($z2);
+
+        $u1 = $x1->multiply($z22);
+        $u2 = $x2->multiply($z12);
+        $s1 = $y1->multiply($z22->multiply($z2));
+        $s2 = $y2->multiply($z12->multiply($z1));
+        if ($u1->equals($u2)) {
+            if (!$s1->equals($s2)) {
+                return [];
+            } else {
+                return $this->doublePoint($p);
+            }
+        }
+        $h = $u2->subtract($u1);
+        $r = $s2->subtract($s1);
+        $h2 = $h->multiply($h);
+        $h3 = $h2->multiply($h);
+        $v = $u1->multiply($h2);
+        $x3 = $r->multiply($r)->subtract($h3)->subtract($v->multiply($this->two));
+        $y3 = $r->multiply(
+            $v->subtract($x3)
+        )->subtract(
+            $s1->multiply($h3)
+        );
+        $z3 = $h->multiply($z1)->multiply($z2);
+        return [$x3, $y3, $z3];
+    }
+
+    /**
+     * Adds two points on the curve
+     *
+     * @return FiniteField[]
+     */
+    public function addPoint(array $p, array $q): array
+    {
+        if (!isset($this->factory)) {
+            throw new RuntimeException('setModulo needs to be called before this method');
+        }
+
+        if (!count($p) || !count($q)) {
+            if (count($q)) {
+                return $q;
+            }
+            if (count($p)) {
+                return $p;
+            }
+            return [];
+        }
+
+        // use jacobian coordinates
+        if (isset($p[2]) && isset($q[2])) {
+            if (isset($p['fresh']) && isset($q['fresh'])) {
+                return $this->jacobianAddPointMixedXY($p, $q);
+            }
+            if (isset($p['fresh'])) {
+                return $this->jacobianAddPointMixedX($q, $p);
+            }
+            if (isset($q['fresh'])) {
+                return $this->jacobianAddPointMixedX($p, $q);
+            }
+            return $this->jacobianAddPoint($p, $q);
+        }
+
+        if (isset($p[2]) || isset($q[2])) {
+            throw new RuntimeException('Affine coordinates need to be manually converted to Jacobi coordinates or vice versa');
+        }
+
+        if ($p[0]->equals($q[0])) {
+            if (!$p[1]->equals($q[1])) {
+                return [];
+            } else { // eg. doublePoint
+                [$numerator, $denominator] = $this->doublePointHelper($p);
+            }
+        } else {
+            $numerator = $q[1]->subtract($p[1]);
+            $denominator = $q[0]->subtract($p[0]);
+        }
+        $slope = $numerator->divide($denominator);
+        $x = $slope->multiply($slope)->subtract($p[0])->subtract($q[0]);
+        $y = $slope->multiply($p[0]->subtract($x))->subtract($p[1]);
+
+        return [$x, $y];
+    }
+
+    /**
+     * Returns the numerator and denominator of the slope
+     *
+     * @return FiniteField[]
+     */
+    protected function doublePointHelper(array $p): array
+    {
+        $numerator = $this->three->multiply($p[0])->multiply($p[0])->add($this->a);
+        $denominator = $this->two->multiply($p[1]);
+        return [$numerator, $denominator];
+    }
+
+    /**
+     * Doubles a jacobian coordinate on the curve
+     *
+     * @return FiniteField[]
+     */
+    protected function jacobianDoublePoint(array $p): array
+    {
+        [$x, $y, $z] = $p;
+        $x2 = $x->multiply($x);
+        $y2 = $y->multiply($y);
+        $z2 = $z->multiply($z);
+        $s = $this->four->multiply($x)->multiply($y2);
+        $m1 = $this->three->multiply($x2);
+        $m2 = $this->a->multiply($z2->multiply($z2));
+        $m = $m1->add($m2);
+        $x1 = $m->multiply($m)->subtract($this->two->multiply($s));
+        $y1 = $m->multiply($s->subtract($x1))->subtract(
+            $this->eight->multiply($y2->multiply($y2))
+        );
+        $z1 = $this->two->multiply($y)->multiply($z);
+        return [$x1, $y1, $z1];
+    }
+
+    /**
+     * Doubles a "fresh" jacobian coordinate on the curve
+     *
+     * @return FiniteField[]
+     */
+    protected function jacobianDoublePointMixed(array $p): array
+    {
+        [$x, $y] = $p;
+        $x2 = $x->multiply($x);
+        $y2 = $y->multiply($y);
+        $s = $this->four->multiply($x)->multiply($y2);
+        $m1 = $this->three->multiply($x2);
+        $m = $m1->add($this->a);
+        $x1 = $m->multiply($m)->subtract($this->two->multiply($s));
+        $y1 = $m->multiply($s->subtract($x1))->subtract(
+            $this->eight->multiply($y2->multiply($y2))
+        );
+        $z1 = $this->two->multiply($y);
+        return [$x1, $y1, $z1];
+    }
+
+    /**
+     * Doubles a point on a curve
+     *
+     * @return FiniteField[]
+     */
+    public function doublePoint(array $p): array
+    {
+        if (!isset($this->factory)) {
+            throw new RuntimeException('setModulo needs to be called before this method');
+        }
+
+        if (!count($p)) {
+            return [];
+        }
+
+        // use jacobian coordinates
+        if (isset($p[2])) {
+            if (isset($p['fresh'])) {
+                return $this->jacobianDoublePointMixed($p);
+            }
+            return $this->jacobianDoublePoint($p);
+        }
+
+        [$numerator, $denominator] = $this->doublePointHelper($p);
+
+        $slope = $numerator->divide($denominator);
+
+        $x = $slope->multiply($slope)->subtract($p[0])->subtract($p[0]);
+        $y = $slope->multiply($p[0]->subtract($x))->subtract($p[1]);
+
+        return [$x, $y];
+    }
+
+    /**
+     * Returns the X coordinate and the derived Y coordinate
+     */
+    public function derivePoint($m): array
+    {
+        $y = ord(Strings::shift($m));
+        $x = new BigInteger($m, 256);
+        $xp = $this->convertInteger($x);
+        switch ($y) {
+            case 2:
+                $ypn = false;
+                break;
+            case 3:
+                $ypn = true;
+                break;
+            default:
+                throw new RuntimeException('Coordinate not in recognized format');
+        }
+        $temp = $xp->multiply($this->a);
+        $temp = $xp->multiply($xp)->multiply($xp)->add($temp);
+        $temp = $temp->add($this->b);
+        $b = $temp->squareRoot();
+        if (!$b) {
+            throw new RuntimeException('Unable to derive Y coordinate');
+        }
+        $bn = $b->isOdd();
+        $yp = $ypn == $bn ? $b : $b->negate();
+        return [$xp, $yp];
+    }
+
+    /**
+     * Tests whether or not the x / y values satisfy the equation
+     *
+     * @return boolean
+     */
+    public function verifyPoint(array $p): bool
+    {
+        [$x, $y] = $p;
+        $lhs = $y->multiply($y);
+        $temp = $x->multiply($this->a);
+        $temp = $x->multiply($x)->multiply($x)->add($temp);
+        $rhs = $temp->add($this->b);
+
+        return $lhs->equals($rhs);
+    }
+
+    /**
+     * Returns the modulo
+     */
+    public function getModulo(): BigInteger
+    {
+        return $this->modulo;
+    }
+
+    /**
+     * Returns the a coefficient
+     *
+     * @return PrimeInteger
+     */
+    public function getA()
+    {
+        return $this->a;
+    }
+
+    /**
+     * Returns the a coefficient
+     *
+     * @return PrimeInteger
+     */
+    public function getB()
+    {
+        return $this->b;
+    }
+
+    /**
+     * Multiply and Add Points
+     *
+     * Adapted from:
+     * https://github.com/indutny/elliptic/blob/725bd91/lib/elliptic/curve/base.js#L125
+     *
+     * @return int[]
+     */
+    public function multiplyAddPoints(array $points, array $scalars): array
+    {
+        $length = count($points);
+
+        foreach ($points as &$point) {
+            $point = $this->convertToInternal($point);
+        }
+
+        $wnd = [$this->getNAFPoints($points[0], 7)];
+        $wndWidth = [$points[0]['nafwidth'] ?? 7];
+        for ($i = 1; $i < $length; $i++) {
+            $wnd[] = $this->getNAFPoints($points[$i], 1);
+            $wndWidth[] = $points[$i]['nafwidth'] ?? 1;
+        }
+
+        $naf = [];
+
+        // comb all window NAFs
+
+        $max = 0;
+        for ($i = $length - 1; $i >= 1; $i -= 2) {
+            $a = $i - 1;
+            $b = $i;
+            if ($wndWidth[$a] != 1 || $wndWidth[$b] != 1) {
+                $naf[$a] = $scalars[$a]->getNAF($wndWidth[$a]);
+                $naf[$b] = $scalars[$b]->getNAF($wndWidth[$b]);
+                $max = max(count($naf[$a]), count($naf[$b]), $max);
+                continue;
+            }
+
+            $comb = [
+                $points[$a], // 1
+                null,        // 3
+                null,        // 5
+                $points[$b],  // 7
+            ];
+
+            $comb[1] = $this->addPoint($points[$a], $points[$b]);
+            $comb[2] = $this->addPoint($points[$a], $this->negatePoint($points[$b]));
+
+            $index = [
+                -3, /* -1 -1 */
+                -1, /* -1  0 */
+                -5, /* -1  1 */
+                -7, /*  0 -1 */
+                 0, /*  0 -1 */
+                 7, /*  0  1 */
+                 5, /*  1 -1 */
+                 1, /*  1  0 */
+                 3,  /*  1  1 */
+            ];
+
+            $jsf = self::getJSFPoints($scalars[$a], $scalars[$b]);
+
+            $max = max(count($jsf[0]), $max);
+            if ($max > 0) {
+                $naf[$a] = array_fill(0, $max, 0);
+                $naf[$b] = array_fill(0, $max, 0);
+            } else {
+                $naf[$a] = [];
+                $naf[$b] = [];
+            }
+
+            for ($j = 0; $j < $max; $j++) {
+                $ja = $jsf[0][$j] ?? 0;
+                $jb = $jsf[1][$j] ?? 0;
+
+                $naf[$a][$j] = $index[3 * ($ja + 1) + $jb + 1];
+                $naf[$b][$j] = 0;
+                $wnd[$a] = $comb;
+            }
+        }
+
+        $acc = [];
+        $temp = [0, 0, 0, 0];
+        for ($i = $max; $i >= 0; $i--) {
+            $k = 0;
+            while ($i >= 0) {
+                $zero = true;
+                for ($j = 0; $j < $length; $j++) {
+                    $temp[$j] = $naf[$j][$i] ?? 0;
+                    if ($temp[$j] != 0) {
+                        $zero = false;
+                    }
+                }
+                if (!$zero) {
+                    break;
+                }
+                $k++;
+                $i--;
+            }
+
+            if ($i >= 0) {
+                $k++;
+            }
+            while ($k--) {
+                $acc = $this->doublePoint($acc);
+            }
+
+            if ($i < 0) {
+                break;
+            }
+
+            for ($j = 0; $j < $length; $j++) {
+                $z = $temp[$j];
+                $p = null;
+                if ($z == 0) {
+                    continue;
+                }
+                $p = $z > 0 ?
+                    $wnd[$j][($z - 1) >> 1] :
+                    $this->negatePoint($wnd[$j][(-$z - 1) >> 1]);
+                $acc = $this->addPoint($acc, $p);
+            }
+        }
+
+        return $this->convertToAffine($acc);
+    }
+
+    /**
+     * Precomputes NAF points
+     *
+     * Adapted from:
+     * https://github.com/indutny/elliptic/blob/725bd91/lib/elliptic/curve/base.js#L351
+     *
+     * @return list<array>
+     */
+    private function getNAFPoints(array $point, int $wnd): array
+    {
+        if (isset($point['naf'])) {
+            return $point['naf'];
+        }
+
+        $res = [$point];
+        $max = (1 << $wnd) - 1;
+        $dbl = $max == 1 ? null : $this->doublePoint($point);
+        for ($i = 1; $i < $max; $i++) {
+            $res[] = $this->addPoint($res[$i - 1], $dbl);
+        }
+
+        $point['naf'] = $res;
+
+        /*
+        $str = '';
+        foreach ($res as $re) {
+            $re[0] = bin2hex($re[0]->toBytes());
+            $re[1] = bin2hex($re[1]->toBytes());
+            $str.= "            ['$re[0]', '$re[1]'],\r\n";
+        }
+        file_put_contents('temp.txt', $str);
+        exit;
+        */
+
+        return $res;
+    }
+
+    /**
+     * Precomputes points in Joint Sparse Form
+     *
+     * Adapted from:
+     * https://github.com/indutny/elliptic/blob/725bd91/lib/elliptic/utils.js#L96
+     *
+     * @return int[]
+     */
+    private static function getJSFPoints(Integer $k1, Integer $k2): array
+    {
+        static $three;
+        if (!isset($three)) {
+            $three = new BigInteger(3);
+        }
+
+        $jsf = [[], []];
+        $k1 = $k1->toBigInteger();
+        $k2 = $k2->toBigInteger();
+        $d1 = 0;
+        $d2 = 0;
+
+        while ($k1->compare(new BigInteger(-$d1)) > 0 || $k2->compare(new BigInteger(-$d2)) > 0) {
+            // first phase
+            $m14 = $k1->testBit(0) + 2 * $k1->testBit(1);
+            $m14 += $d1;
+            $m14 &= 3;
+
+            $m24 = $k2->testBit(0) + 2 * $k2->testBit(1);
+            $m24 += $d2;
+            $m24 &= 3;
+
+            if ($m14 == 3) {
+                $m14 = -1;
+            }
+            if ($m24 == 3) {
+                $m24 = -1;
+            }
+
+            $u1 = 0;
+            if ($m14 & 1) { // if $m14 is odd
+                $m8 = $k1->testBit(0) + 2 * $k1->testBit(1) + 4 * $k1->testBit(2);
+                $m8 += $d1;
+                $m8 &= 7;
+                $u1 = ($m8 == 3 || $m8 == 5) && $m24 == 2 ? -$m14 : $m14;
+            }
+            $jsf[0][] = $u1;
+
+            $u2 = 0;
+            if ($m24 & 1) { // if $m24 is odd
+                $m8 = $k2->testBit(0) + 2 * $k2->testBit(1) + 4 * $k2->testBit(2);
+                $m8 += $d2;
+                $m8 &= 7;
+                $u2 = ($m8 == 3 || $m8 == 5) && $m14 == 2 ? -$m24 : $m24;
+            }
+            $jsf[1][] = $u2;
+
+            // second phase
+            if (2 * $d1 == $u1 + 1) {
+                $d1 = 1 - $d1;
+            }
+            if (2 * $d2 == $u2 + 1) {
+                $d2 = 1 - $d2;
+            }
+            $k1 = $k1->bitwise_rightShift(1);
+            $k2 = $k2->bitwise_rightShift(1);
+        }
+
+        return $jsf;
+    }
+
+    /**
+     * Returns the affine point
+     *
+     * A Jacobian Coordinate is of the form (x, y, z).
+     * To convert a Jacobian Coordinate to an Affine Point
+     * you do (x / z^2, y / z^3)
+     *
+     * @return PrimeInteger[]
+     */
+    public function convertToAffine(array $p): array
+    {
+        if (!isset($p[2])) {
+            return $p;
+        }
+        [$x, $y, $z] = $p;
+        $z = $this->one->divide($z);
+        $z2 = $z->multiply($z);
+        return [
+            $x->multiply($z2),
+            $y->multiply($z2)->multiply($z),
+        ];
+    }
+
+    /**
+     * Converts an affine point to a jacobian coordinate
+     *
+     * @return PrimeInteger[]
+     */
+    public function convertToInternal(array $p): array
+    {
+        if (isset($p[2])) {
+            return $p;
+        }
+
+        $p[2] = clone $this->one;
+        $p['fresh'] = true;
+        return $p;
+    }
+}
diff --git a/phpseclib/Crypt/EC/BaseCurves/TwistedEdwards.php b/phpseclib/Crypt/EC/BaseCurves/TwistedEdwards.php
new file mode 100644
index 000000000..0c79dba82
--- /dev/null
+++ b/phpseclib/Crypt/EC/BaseCurves/TwistedEdwards.php
@@ -0,0 +1,215 @@
+<?php
+
+/**
+ * Curves over a*x^2 + y^2 = 1 + d*x^2*y^2
+ *
+ * http://www.secg.org/SEC2-Ver-1.0.pdf provides for curves with custom parameters.
+ * ie. the coefficients can be arbitrary set through specially formatted keys, etc.
+ * As such, Prime.php is built very generically and it's not able to take full
+ * advantage of curves with 0 coefficients to produce simplified point doubling,
+ * point addition. Twisted Edwards curves, in contrast, do not have a way, currently,
+ * to customize them. As such, we can omit the super generic stuff from this class
+ * and let the named curves (Ed25519 and Ed448) define their own custom tailored
+ * point addition and point doubling methods.
+ *
+ * More info:
+ *
+ * https://en.wikipedia.org/wiki/Twisted_Edwards_curve
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\BaseCurves;
+
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Math\PrimeField;
+use phpseclib3\Math\PrimeField\Integer as PrimeInteger;
+
+/**
+ * Curves over a*x^2 + y^2 = 1 + d*x^2*y^2
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class TwistedEdwards extends Base
+{
+    /**
+     * The modulo
+     *
+     * @var BigInteger
+     */
+    protected $modulo;
+
+    /**
+     * Cofficient for x^2
+     *
+     * @var object
+     */
+    protected $a;
+
+    /**
+     * Cofficient for x^2*y^2
+     *
+     * @var object
+     */
+    protected $d;
+
+    /**
+     * Base Point
+     *
+     * @var object[]
+     */
+    protected $p;
+
+    /**
+     * The number zero over the specified finite field
+     *
+     * @var object
+     */
+    protected $zero;
+
+    /**
+     * The number one over the specified finite field
+     *
+     * @var object
+     */
+    protected $one;
+
+    /**
+     * The number two over the specified finite field
+     *
+     * @var object
+     */
+    protected $two;
+
+    /**
+     * Sets the modulo
+     */
+    public function setModulo(BigInteger $modulo): void
+    {
+        $this->modulo = $modulo;
+        $this->factory = new PrimeField($modulo);
+        $this->zero = $this->factory->newInteger(new BigInteger(0));
+        $this->one = $this->factory->newInteger(new BigInteger(1));
+        $this->two = $this->factory->newInteger(new BigInteger(2));
+    }
+
+    /**
+     * Set coefficients a and b
+     */
+    public function setCoefficients(BigInteger $a, BigInteger $d): void
+    {
+        if (!isset($this->factory)) {
+            throw new RuntimeException('setModulo needs to be called before this method');
+        }
+        $this->a = $this->factory->newInteger($a);
+        $this->d = $this->factory->newInteger($d);
+    }
+
+    /**
+     * Set x and y coordinates for the base point
+     */
+    public function setBasePoint($x, $y): void
+    {
+        switch (true) {
+            case !$x instanceof BigInteger && !$x instanceof PrimeInteger:
+                throw new UnexpectedValueException('Argument 1 passed to Prime::setBasePoint() must be an instance of either BigInteger or PrimeField\Integer');
+            case !$y instanceof BigInteger && !$y instanceof PrimeInteger:
+                throw new UnexpectedValueException('Argument 2 passed to Prime::setBasePoint() must be an instance of either BigInteger or PrimeField\Integer');
+        }
+        if (!isset($this->factory)) {
+            throw new RuntimeException('setModulo needs to be called before this method');
+        }
+        $this->p = [
+            $x instanceof BigInteger ? $this->factory->newInteger($x) : $x,
+            $y instanceof BigInteger ? $this->factory->newInteger($y) : $y,
+        ];
+    }
+
+    /**
+     * Returns the a coefficient
+     *
+     * @return PrimeInteger
+     */
+    public function getA()
+    {
+        return $this->a;
+    }
+
+    /**
+     * Returns the a coefficient
+     *
+     * @return PrimeInteger
+     */
+    public function getD()
+    {
+        return $this->d;
+    }
+
+    /**
+     * Retrieve the base point as an array
+     */
+    public function getBasePoint(): array
+    {
+        if (!isset($this->factory)) {
+            throw new RuntimeException('setModulo needs to be called before this method');
+        }
+        /*
+        if (!isset($this->p)) {
+            throw new \phpseclib3\Exception\RuntimeException('setBasePoint needs to be called before this method');
+        }
+        */
+        return $this->p;
+    }
+
+    /**
+     * Returns the affine point
+     *
+     * @return PrimeInteger[]
+     */
+    public function convertToAffine(array $p): array
+    {
+        if (!isset($p[2])) {
+            return $p;
+        }
+        [$x, $y, $z] = $p;
+        $z = $this->one->divide($z);
+        return [
+            $x->multiply($z),
+            $y->multiply($z),
+        ];
+    }
+
+    /**
+     * Returns the modulo
+     */
+    public function getModulo(): BigInteger
+    {
+        return $this->modulo;
+    }
+
+    /**
+     * Tests whether or not the x / y values satisfy the equation
+     *
+     * @return boolean
+     */
+    public function verifyPoint(array $p): bool
+    {
+        [$x, $y] = $p;
+        $x2 = $x->multiply($x);
+        $y2 = $y->multiply($y);
+
+        $lhs = $this->a->multiply($x2)->add($y2);
+        $rhs = $this->d->multiply($x2)->multiply($y2)->add($this->one);
+
+        return $lhs->equals($rhs);
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/Curve25519.php b/phpseclib/Crypt/EC/Curves/Curve25519.php
new file mode 100644
index 000000000..2413a06f4
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/Curve25519.php
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * Curve25519
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2019 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Montgomery;
+use phpseclib3\Exception\RangeException;
+use phpseclib3\Math\BigInteger;
+
+class Curve25519 extends Montgomery
+{
+    public function __construct()
+    {
+        // 2^255 - 19
+        $this->setModulo(new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFED', 16));
+        $this->a24 = $this->factory->newInteger(new BigInteger('121666'));
+        $this->p = [$this->factory->newInteger(new BigInteger(9))];
+        // 2^252 + 0x14def9dea2f79cd65812631a5cf5d3ed
+        $this->setOrder(new BigInteger('1000000000000000000000000000000014DEF9DEA2F79CD65812631A5CF5D3ED', 16));
+
+        /*
+        $this->setCoefficients(
+            new BigInteger('486662'), // a
+        );
+        $this->setBasePoint(
+            new BigInteger(9),
+            new BigInteger('14781619447589544791020593568409986887264606134616475288964881837755586237401')
+        );
+        */
+    }
+
+    /**
+     * Multiply a point on the curve by a scalar
+     *
+     * Modifies the scalar as described at https://tools.ietf.org/html/rfc7748#page-8
+     */
+    public function multiplyPoint(array $p, BigInteger $d): array
+    {
+        //$r = strrev(sodium_crypto_scalarmult($d->toBytes(), strrev($p[0]->toBytes())));
+        //return [$this->factory->newInteger(new BigInteger($r, 256))];
+
+        $d = $d->toBytes();
+        $d &= "\xF8" . str_repeat("\xFF", 30) . "\x7F";
+        $d = strrev($d);
+        $d |= "\x40";
+        $d = new BigInteger($d, -256);
+
+        return parent::multiplyPoint($p, $d);
+    }
+
+    /**
+     * Creates a random scalar multiplier
+     */
+    public function createRandomMultiplier(): BigInteger
+    {
+        return BigInteger::random(256);
+    }
+
+    /**
+     * Performs range check
+     */
+    public function rangeCheck(BigInteger $x): void
+    {
+        if ($x->getLength() > 256 || $x->isNegative()) {
+            throw new RangeException('x must be a positive integer less than 256 bytes in length');
+        }
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/Curve448.php b/phpseclib/Crypt/EC/Curves/Curve448.php
new file mode 100644
index 000000000..14e4aafe0
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/Curve448.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * Curve448
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2019 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Montgomery;
+use phpseclib3\Exception\RangeException;
+use phpseclib3\Math\BigInteger;
+
+class Curve448 extends Montgomery
+{
+    public function __construct()
+    {
+        // 2^448 - 2^224 - 1
+        $this->setModulo(new BigInteger(
+            'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE' .
+            'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF',
+            16
+        ));
+        $this->a24 = $this->factory->newInteger(new BigInteger('39081'));
+        $this->p = [$this->factory->newInteger(new BigInteger(5))];
+        // 2^446 - 0x8335dc163bb124b65129c96fde933d8d723a70aadc873d6d54a7bb0d
+        $this->setOrder(new BigInteger(
+            '3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF' .
+            '7CCA23E9C44EDB49AED63690216CC2728DC58F552378C292AB5844F3',
+            16
+        ));
+
+        /*
+        $this->setCoefficients(
+            new BigInteger('156326'), // a
+        );
+        $this->setBasePoint(
+            new BigInteger(5),
+            new BigInteger(
+                '355293926785568175264127502063783334808976399387714271831880898' .
+                '435169088786967410002932673765864550910142774147268105838985595290' .
+                '606362')
+        );
+        */
+    }
+
+    /**
+     * Multiply a point on the curve by a scalar
+     *
+     * Modifies the scalar as described at https://tools.ietf.org/html/rfc7748#page-8
+     */
+    public function multiplyPoint(array $p, BigInteger $d): array
+    {
+        //$r = strrev(sodium_crypto_scalarmult($d->toBytes(), strrev($p[0]->toBytes())));
+        //return [$this->factory->newInteger(new BigInteger($r, 256))];
+
+        $d = $d->toBytes();
+        $d[0] = $d[0] & "\xFC";
+        $d = strrev($d);
+        $d |= "\x80";
+        $d = new BigInteger($d, 256);
+
+        return parent::multiplyPoint($p, $d);
+    }
+
+    /**
+     * Creates a random scalar multiplier
+     */
+    public function createRandomMultiplier(): BigInteger
+    {
+        return BigInteger::random(446);
+    }
+
+    /**
+     * Performs range check
+     */
+    public function rangeCheck(BigInteger $x): void
+    {
+        if ($x->getLength() > 448 || $x->isNegative()) {
+            throw new RangeException('x must be a positive integer less than 446 bytes in length');
+        }
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/Ed25519.php b/phpseclib/Crypt/EC/Curves/Ed25519.php
new file mode 100644
index 000000000..308e2d4b1
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/Ed25519.php
@@ -0,0 +1,330 @@
+<?php
+
+/**
+ * Ed25519
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\TwistedEdwards;
+use phpseclib3\Crypt\Hash;
+use phpseclib3\Crypt\Random;
+use phpseclib3\Exception\LengthException;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Math\BigInteger;
+
+class Ed25519 extends TwistedEdwards
+{
+    public const HASH = 'sha512';
+    /*
+      Per https://tools.ietf.org/html/rfc8032#page-6 EdDSA has several parameters, one of which is b:
+
+      2.   An integer b with 2^(b-1) > p.  EdDSA public keys have exactly b
+           bits, and EdDSA signatures have exactly 2*b bits.  b is
+           recommended to be a multiple of 8, so public key and signature
+           lengths are an integral number of octets.
+
+      SIZE corresponds to b
+    */
+    public const SIZE = 32;
+
+    public function __construct()
+    {
+        // 2^255 - 19
+        $this->setModulo(new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFED', 16));
+        $this->setCoefficients(
+            // -1
+            new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEC', 16), // a
+            // -121665/121666
+            new BigInteger('52036CEE2B6FFE738CC740797779E89800700A4D4141D8AB75EB4DCA135978A3', 16)  // d
+        );
+        $this->setBasePoint(
+            new BigInteger('216936D3CD6E53FEC0A4E231FDD6DC5C692CC7609525A7B2C9562D608F25D51A', 16),
+            new BigInteger('6666666666666666666666666666666666666666666666666666666666666658', 16)
+        );
+        $this->setOrder(new BigInteger('1000000000000000000000000000000014DEF9DEA2F79CD65812631A5CF5D3ED', 16));
+        // algorithm 14.47 from http://cacr.uwaterloo.ca/hac/about/chap14.pdf#page=16
+        /*
+        $this->setReduction(function($x) {
+            $parts = $x->bitwise_split(255);
+            $className = $this->className;
+
+            if (count($parts) > 2) {
+                list(, $r) = $x->divide($className::$modulo);
+                return $r;
+            }
+
+            $zero = new BigInteger();
+            $c = new BigInteger(19);
+
+            switch (count($parts)) {
+                case 2:
+                    list($qi, $ri) = $parts;
+                    break;
+                case 1:
+                    $qi = $zero;
+                    list($ri) = $parts;
+                    break;
+                case 0:
+                    return $zero;
+            }
+            $r = $ri;
+
+            while ($qi->compare($zero) > 0) {
+                $temp = $qi->multiply($c)->bitwise_split(255);
+                if (count($temp) == 2) {
+                    list($qi, $ri) = $temp;
+                } else {
+                    $qi = $zero;
+                    list($ri) = $temp;
+                }
+                $r = $r->add($ri);
+            }
+
+            while ($r->compare($className::$modulo) > 0) {
+                $r = $r->subtract($className::$modulo);
+            }
+            return $r;
+        });
+        */
+    }
+
+    /**
+     * Recover X from Y
+     *
+     * Implements steps 2-4 at https://tools.ietf.org/html/rfc8032#section-5.1.3
+     *
+     * Used by EC\Keys\Common.php
+     *
+     * @param boolean $sign
+     * @return object[]
+     */
+    public function recoverX(BigInteger $y, bool $sign): array
+    {
+        $y = $this->factory->newInteger($y);
+
+        $y2 = $y->multiply($y);
+        $u = $y2->subtract($this->one);
+        $v = $this->d->multiply($y2)->add($this->one);
+        $x2 = $u->divide($v);
+        if ($x2->equals($this->zero)) {
+            if ($sign) {
+                throw new RuntimeException('Unable to recover X coordinate (x2 = 0)');
+            }
+            return clone $this->zero;
+        }
+        // find the square root
+        /* we don't do $x2->squareRoot() because, quoting from
+           https://tools.ietf.org/html/rfc8032#section-5.1.1:
+
+           "For point decoding or "decompression", square roots modulo p are
+            needed.  They can be computed using the Tonelli-Shanks algorithm or
+            the special case for p = 5 (mod 8).  To find a square root of a,
+            first compute the candidate root x = a^((p+3)/8) (mod p)."
+         */
+        $exp = $this->getModulo()->add(new BigInteger(3));
+        $exp = $exp->bitwise_rightShift(3);
+        $x = $x2->pow($exp);
+
+        // If v x^2 = -u (mod p), set x <-- x * 2^((p-1)/4), which is a square root.
+        if (!$x->multiply($x)->subtract($x2)->equals($this->zero)) {
+            $temp = $this->getModulo()->subtract(new BigInteger(1));
+            $temp = $temp->bitwise_rightShift(2);
+            $temp = $this->two->pow($temp);
+            $x = $x->multiply($temp);
+            if (!$x->multiply($x)->subtract($x2)->equals($this->zero)) {
+                throw new RuntimeException('Unable to recover X coordinate');
+            }
+        }
+        if ($x->isOdd() != $sign) {
+            $x = $x->negate();
+        }
+
+        return [$x, $y];
+    }
+
+    /**
+     * Extract Secret Scalar
+     *
+     * Implements steps 1-3 at https://tools.ietf.org/html/rfc8032#section-5.1.5
+     *
+     * Used by the various key handlers
+     *
+     * @return array
+     */
+    public function extractSecret(string $str)
+    {
+        if (strlen($str) != 32) {
+            throw new LengthException('Private Key should be 32-bytes long');
+        }
+        // 1.  Hash the 32-byte private key using SHA-512, storing the digest in
+        //     a 64-octet large buffer, denoted h.  Only the lower 32 bytes are
+        //     used for generating the public key.
+        $hash = new Hash('sha512');
+        $h = $hash->hash($str);
+        $h = substr($h, 0, 32);
+        // 2.  Prune the buffer: The lowest three bits of the first octet are
+        //     cleared, the highest bit of the last octet is cleared, and the
+        //     second highest bit of the last octet is set.
+        $h[0] = $h[0] & chr(0xF8);
+        $h = strrev($h);
+        $h[0] = ($h[0] & chr(0x3F)) | chr(0x40);
+        // 3.  Interpret the buffer as the little-endian integer, forming a
+        //     secret scalar s.
+        $dA = new BigInteger($h, 256);
+
+        return [
+            'dA' => $dA,
+            'secret' => $str,
+        ];
+    }
+
+    /**
+     * Encode a point as a string
+     */
+    public function encodePoint(array $point): string
+    {
+        [$x, $y] = $point;
+        $y = $y->toBytes();
+        $y[0] = $y[0] & chr(0x7F);
+        if ($x->isOdd()) {
+            $y[0] = $y[0] | chr(0x80);
+        }
+        $y = strrev($y);
+
+        return $y;
+    }
+
+    /**
+     * Creates a random scalar multiplier
+     */
+    public function createRandomMultiplier(): BigInteger
+    {
+        return $this->extractSecret(Random::string(32))['dA'];
+    }
+
+    /**
+     * Converts an affine point to an extended homogeneous coordinate
+     *
+     * From https://tools.ietf.org/html/rfc8032#section-5.1.4 :
+     *
+     * A point (x,y) is represented in extended homogeneous coordinates (X, Y, Z, T),
+     * with x = X/Z, y = Y/Z, x * y = T/Z.
+     *
+     * @return Integer[]
+     */
+    public function convertToInternal(array $p): array
+    {
+        if (empty($p)) {
+            return [clone $this->zero, clone $this->one, clone $this->one, clone $this->zero];
+        }
+
+        if (isset($p[2])) {
+            return $p;
+        }
+
+        $p[2] = clone $this->one;
+        $p[3] = $p[0]->multiply($p[1]);
+
+        return $p;
+    }
+
+    /**
+     * Doubles a point on a curve
+     *
+     * @return FiniteField[]
+     */
+    public function doublePoint(array $p): array
+    {
+        if (!isset($this->factory)) {
+            throw new RuntimeException('setModulo needs to be called before this method');
+        }
+
+        if (!count($p)) {
+            return [];
+        }
+
+        if (!isset($p[2])) {
+            throw new RuntimeException('Affine coordinates need to be manually converted to "Jacobi" coordinates or vice versa');
+        }
+
+        // from https://tools.ietf.org/html/rfc8032#page-12
+
+        [$x1, $y1, $z1, $t1] = $p;
+
+        $a = $x1->multiply($x1);
+        $b = $y1->multiply($y1);
+        $c = $this->two->multiply($z1)->multiply($z1);
+        $h = $a->add($b);
+        $temp = $x1->add($y1);
+        $e = $h->subtract($temp->multiply($temp));
+        $g = $a->subtract($b);
+        $f = $c->add($g);
+
+        $x3 = $e->multiply($f);
+        $y3 = $g->multiply($h);
+        $t3 = $e->multiply($h);
+        $z3 = $f->multiply($g);
+
+        return [$x3, $y3, $z3, $t3];
+    }
+
+    /**
+     * Adds two points on the curve
+     *
+     * @return FiniteField[]
+     */
+    public function addPoint(array $p, array $q): array
+    {
+        if (!isset($this->factory)) {
+            throw new RuntimeException('setModulo needs to be called before this method');
+        }
+
+        if (!count($p) || !count($q)) {
+            if (count($q)) {
+                return $q;
+            }
+            if (count($p)) {
+                return $p;
+            }
+            return [];
+        }
+
+        if (!isset($p[2]) || !isset($q[2])) {
+            throw new RuntimeException('Affine coordinates need to be manually converted to "Jacobi" coordinates or vice versa');
+        }
+
+        if ($p[0]->equals($q[0])) {
+            return !$p[1]->equals($q[1]) ? [] : $this->doublePoint($p);
+        }
+
+        // from https://tools.ietf.org/html/rfc8032#page-12
+
+        [$x1, $y1, $z1, $t1] = $p;
+        [$x2, $y2, $z2, $t2] = $q;
+
+        $a = $y1->subtract($x1)->multiply($y2->subtract($x2));
+        $b = $y1->add($x1)->multiply($y2->add($x2));
+        $c = $t1->multiply($this->two)->multiply($this->d)->multiply($t2);
+        $d = $z1->multiply($this->two)->multiply($z2);
+        $e = $b->subtract($a);
+        $f = $d->subtract($c);
+        $g = $d->add($c);
+        $h = $b->add($a);
+
+        $x3 = $e->multiply($f);
+        $y3 = $g->multiply($h);
+        $t3 = $e->multiply($h);
+        $z3 = $f->multiply($g);
+
+        return [$x3, $y3, $z3, $t3];
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/Ed448.php b/phpseclib/Crypt/EC/Curves/Ed448.php
new file mode 100644
index 000000000..7d9331fd2
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/Ed448.php
@@ -0,0 +1,268 @@
+<?php
+
+/**
+ * Ed448
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\TwistedEdwards;
+use phpseclib3\Crypt\Hash;
+use phpseclib3\Crypt\Random;
+use phpseclib3\Exception\LengthException;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Math\PrimeField\Integer;
+
+class Ed448 extends TwistedEdwards
+{
+    public const HASH = 'shake256-912';
+    public const SIZE = 57;
+
+    public function __construct()
+    {
+        // 2^448 - 2^224 - 1
+        $this->setModulo(new BigInteger(
+            'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE' .
+            'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF',
+            16
+        ));
+        $this->setCoefficients(
+            new BigInteger(1),
+            // -39081
+            new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE' .
+                           'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6756', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('4F1970C66BED0DED221D15A622BF36DA9E146570470F1767EA6DE324' .
+                           'A3D3A46412AE1AF72AB66511433B80E18B00938E2626A82BC70CC05E', 16),
+            new BigInteger('693F46716EB6BC248876203756C9C7624BEA73736CA3984087789C1E' .
+                           '05A0C2D73AD3FF1CE67C39C4FDBD132C4ED7C8AD9808795BF230FA14', 16)
+        );
+        $this->setOrder(new BigInteger(
+            '3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF' .
+            '7CCA23E9C44EDB49AED63690216CC2728DC58F552378C292AB5844F3',
+            16
+        ));
+    }
+
+    /**
+     * Recover X from Y
+     *
+     * Implements steps 2-4 at https://tools.ietf.org/html/rfc8032#section-5.2.3
+     *
+     * Used by EC\Keys\Common.php
+     *
+     * @param boolean $sign
+     * @return object[]
+     */
+    public function recoverX(BigInteger $y, bool $sign): array
+    {
+        $y = $this->factory->newInteger($y);
+
+        $y2 = $y->multiply($y);
+        $u = $y2->subtract($this->one);
+        $v = $this->d->multiply($y2)->subtract($this->one);
+        $x2 = $u->divide($v);
+        if ($x2->equals($this->zero)) {
+            if ($sign) {
+                throw new RuntimeException('Unable to recover X coordinate (x2 = 0)');
+            }
+            return clone $this->zero;
+        }
+        // find the square root
+        $exp = $this->getModulo()->add(new BigInteger(1));
+        $exp = $exp->bitwise_rightShift(2);
+        $x = $x2->pow($exp);
+
+        if (!$x->multiply($x)->subtract($x2)->equals($this->zero)) {
+            throw new RuntimeException('Unable to recover X coordinate');
+        }
+        if ($x->isOdd() != $sign) {
+            $x = $x->negate();
+        }
+
+        return [$x, $y];
+    }
+
+    /**
+     * Extract Secret Scalar
+     *
+     * Implements steps 1-3 at https://tools.ietf.org/html/rfc8032#section-5.2.5
+     *
+     * Used by the various key handlers
+     *
+     * @return array
+     */
+    public function extractSecret(string $str)
+    {
+        if (strlen($str) != 57) {
+            throw new LengthException('Private Key should be 57-bytes long');
+        }
+        // 1.  Hash the 57-byte private key using SHAKE256(x, 114), storing the
+        //     digest in a 114-octet large buffer, denoted h.  Only the lower 57
+        //     bytes are used for generating the public key.
+        $hash = new Hash('shake256-912');
+        $h = $hash->hash($str);
+        $h = substr($h, 0, 57);
+        // 2.  Prune the buffer: The two least significant bits of the first
+        //     octet are cleared, all eight bits the last octet are cleared, and
+        //     the highest bit of the second to last octet is set.
+        $h[0] = $h[0] & chr(0xFC);
+        $h = strrev($h);
+        $h[0] = "\0";
+        $h[1] = $h[1] | chr(0x80);
+        // 3.  Interpret the buffer as the little-endian integer, forming a
+        //     secret scalar s.
+        $dA = new BigInteger($h, 256);
+
+        return [
+            'dA' => $dA,
+            'secret' => $str,
+        ];
+    }
+
+    /**
+     * Encode a point as a string
+     */
+    public function encodePoint(array $point): string
+    {
+        [$x, $y] = $point;
+        $y = "\0" . $y->toBytes();
+        if ($x->isOdd()) {
+            $y[0] = $y[0] | chr(0x80);
+        }
+        $y = strrev($y);
+
+        return $y;
+    }
+
+    /**
+     * Creates a random scalar multiplier
+     */
+    public function createRandomMultiplier(): BigInteger
+    {
+        return $this->extractSecret(Random::string(57))['dA'];
+    }
+
+    /**
+     * Converts an affine point to an extended homogeneous coordinate
+     *
+     * From https://tools.ietf.org/html/rfc8032#section-5.2.4 :
+     *
+     * A point (x,y) is represented in extended homogeneous coordinates (X, Y, Z, T),
+     * with x = X/Z, y = Y/Z, x * y = T/Z.
+     *
+     * @return Integer[]
+     */
+    public function convertToInternal(array $p): array
+    {
+        if (empty($p)) {
+            return [clone $this->zero, clone $this->one, clone $this->one];
+        }
+
+        if (isset($p[2])) {
+            return $p;
+        }
+
+        $p[2] = clone $this->one;
+
+        return $p;
+    }
+
+    /**
+     * Doubles a point on a curve
+     *
+     * @return FiniteField[]
+     */
+    public function doublePoint(array $p): array
+    {
+        if (!isset($this->factory)) {
+            throw new RuntimeException('setModulo needs to be called before this method');
+        }
+
+        if (!count($p)) {
+            return [];
+        }
+
+        if (!isset($p[2])) {
+            throw new RuntimeException('Affine coordinates need to be manually converted to "Jacobi" coordinates or vice versa');
+        }
+
+        // from https://tools.ietf.org/html/rfc8032#page-18
+
+        [$x1, $y1, $z1] = $p;
+
+        $b = $x1->add($y1);
+        $b = $b->multiply($b);
+        $c = $x1->multiply($x1);
+        $d = $y1->multiply($y1);
+        $e = $c->add($d);
+        $h = $z1->multiply($z1);
+        $j = $e->subtract($this->two->multiply($h));
+
+        $x3 = $b->subtract($e)->multiply($j);
+        $y3 = $c->subtract($d)->multiply($e);
+        $z3 = $e->multiply($j);
+
+        return [$x3, $y3, $z3];
+    }
+
+    /**
+     * Adds two points on the curve
+     *
+     * @return FiniteField[]
+     */
+    public function addPoint(array $p, array $q): array
+    {
+        if (!isset($this->factory)) {
+            throw new RuntimeException('setModulo needs to be called before this method');
+        }
+
+        if (!count($p) || !count($q)) {
+            if (count($q)) {
+                return $q;
+            }
+            if (count($p)) {
+                return $p;
+            }
+            return [];
+        }
+
+        if (!isset($p[2]) || !isset($q[2])) {
+            throw new RuntimeException('Affine coordinates need to be manually converted to "Jacobi" coordinates or vice versa');
+        }
+
+        if ($p[0]->equals($q[0])) {
+            return !$p[1]->equals($q[1]) ? [] : $this->doublePoint($p);
+        }
+
+        // from https://tools.ietf.org/html/rfc8032#page-17
+
+        [$x1, $y1, $z1] = $p;
+        [$x2, $y2, $z2] = $q;
+
+        $a = $z1->multiply($z2);
+        $b = $a->multiply($a);
+        $c = $x1->multiply($x2);
+        $d = $y1->multiply($y2);
+        $e = $this->d->multiply($c)->multiply($d);
+        $f = $b->subtract($e);
+        $g = $b->add($e);
+        $h = $x1->add($y1)->multiply($x2->add($y2));
+
+        $x3 = $a->multiply($f)->multiply($h->subtract($c)->subtract($d));
+        $y3 = $a->multiply($g)->multiply($d->subtract($c));
+        $z3 = $f->multiply($g);
+
+        return [$x3, $y3, $z3];
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP160r1.php b/phpseclib/Crypt/EC/Curves/brainpoolP160r1.php
new file mode 100644
index 000000000..f4d7e6fec
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP160r1.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * brainpoolP160r1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class brainpoolP160r1 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('E95E4A5F737059DC60DFC7AD95B3D8139515620F', 16));
+        $this->setCoefficients(
+            new BigInteger('340E7BE2A280EB74E2BE61BADA745D97E8F7C300', 16),
+            new BigInteger('1E589A8595423412134FAA2DBDEC95C8D8675E58', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC3', 16),
+            new BigInteger('1667CB477A1A8EC338F94741669C976316DA6321', 16)
+        );
+        $this->setOrder(new BigInteger('E95E4A5F737059DC60DF5991D45029409E60FC09', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP160t1.php b/phpseclib/Crypt/EC/Curves/brainpoolP160t1.php
new file mode 100644
index 000000000..a87807bc7
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP160t1.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * brainpoolP160t1
+ *
+ * This curve is a twisted version of brainpoolP160r1 with A = -3. With brainpool,
+ * the curves ending in r1 are the "regular" curves and the curves ending in "t1"
+ * are the twisted version of the r1 curves. Per https://tools.ietf.org/html/rfc5639#page-7
+ * you can convert a point on an r1 curve to a point on a t1 curve thusly:
+ *
+ *     F(x,y) := (x*Z^2, y*Z^3)
+ *
+ * The advantage of A = -3 is that some of the point doubling and point addition can be
+ * slightly optimized. See http://hyperelliptic.org/EFD/g1p/auto-shortw-projective-3.html
+ * vs http://hyperelliptic.org/EFD/g1p/auto-shortw-projective.html for example.
+ *
+ * phpseclib does not currently take advantage of this optimization opportunity
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class brainpoolP160t1 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('E95E4A5F737059DC60DFC7AD95B3D8139515620F', 16));
+        $this->setCoefficients(
+            new BigInteger('E95E4A5F737059DC60DFC7AD95B3D8139515620C', 16), // eg. -3
+            new BigInteger('7A556B6DAE535B7B51ED2C4D7DAA7A0B5C55F380', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('B199B13B9B34EFC1397E64BAEB05ACC265FF2378', 16),
+            new BigInteger('ADD6718B7C7C1961F0991B842443772152C9E0AD', 16)
+        );
+        $this->setOrder(new BigInteger('E95E4A5F737059DC60DF5991D45029409E60FC09', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP192r1.php b/phpseclib/Crypt/EC/Curves/brainpoolP192r1.php
new file mode 100644
index 000000000..be90648e2
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP192r1.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * brainpoolP192r1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class brainpoolP192r1 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297', 16));
+        $this->setCoefficients(
+            new BigInteger('6A91174076B1E0E19C39C031FE8685C1CAE040E5C69A28EF', 16),
+            new BigInteger('469A28EF7C28CCA3DC721D044F4496BCCA7EF4146FBF25C9', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD6', 16),
+            new BigInteger('14B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F', 16)
+        );
+        $this->setOrder(new BigInteger('C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP192t1.php b/phpseclib/Crypt/EC/Curves/brainpoolP192t1.php
new file mode 100644
index 000000000..da2fb13ad
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP192t1.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * brainpoolP192t1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class brainpoolP192t1 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297', 16));
+        $this->setCoefficients(
+            new BigInteger('C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86294', 16), // eg. -3
+            new BigInteger('13D56FFAEC78681E68F9DEB43B35BEC2FB68542E27897B79', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('3AE9E58C82F63C30282E1FE7BBF43FA72C446AF6F4618129', 16),
+            new BigInteger('097E2C5667C2223A902AB5CA449D0084B7E5B3DE7CCC01C9', 16)
+        );
+        $this->setOrder(new BigInteger('C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP224r1.php b/phpseclib/Crypt/EC/Curves/brainpoolP224r1.php
new file mode 100644
index 000000000..fc146e5e8
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP224r1.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * brainpoolP224r1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class brainpoolP224r1 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF', 16));
+        $this->setCoefficients(
+            new BigInteger('68A5E62CA9CE6C1C299803A6C1530B514E182AD8B0042A59CAD29F43', 16),
+            new BigInteger('2580F63CCFE44138870713B1A92369E33E2135D266DBB372386C400B', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('0D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D', 16),
+            new BigInteger('58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD', 16)
+        );
+        $this->setOrder(new BigInteger('D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP224t1.php b/phpseclib/Crypt/EC/Curves/brainpoolP224t1.php
new file mode 100644
index 000000000..8460f8a48
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP224t1.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * brainpoolP224t1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class brainpoolP224t1 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF', 16));
+        $this->setCoefficients(
+            new BigInteger('D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FC', 16), // eg. -3
+            new BigInteger('4B337D934104CD7BEF271BF60CED1ED20DA14C08B3BB64F18A60888D', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('6AB1E344CE25FF3896424E7FFE14762ECB49F8928AC0C76029B4D580', 16),
+            new BigInteger('0374E9F5143E568CD23F3F4D7C0D4B1E41C8CC0D1C6ABD5F1A46DB4C', 16)
+        );
+        $this->setOrder(new BigInteger('D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP256r1.php b/phpseclib/Crypt/EC/Curves/brainpoolP256r1.php
new file mode 100644
index 000000000..7137ae92f
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP256r1.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * brainpoolP256r1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class brainpoolP256r1 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377', 16));
+        $this->setCoefficients(
+            new BigInteger('7D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9', 16),
+            new BigInteger('26DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B6', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('8BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262', 16),
+            new BigInteger('547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997', 16)
+        );
+        $this->setOrder(new BigInteger('A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP256t1.php b/phpseclib/Crypt/EC/Curves/brainpoolP256t1.php
new file mode 100644
index 000000000..dd671167f
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP256t1.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * brainpoolP256t1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class brainpoolP256t1 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377', 16));
+        $this->setCoefficients(
+            new BigInteger('A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5374', 16), // eg. -3
+            new BigInteger('662C61C430D84EA4FE66A7733D0B76B7BF93EBC4AF2F49256AE58101FEE92B04', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('A3E8EB3CC1CFE7B7732213B23A656149AFA142C47AAFBC2B79A191562E1305F4', 16),
+            new BigInteger('2D996C823439C56D7F7B22E14644417E69BCB6DE39D027001DABE8F35B25C9BE', 16)
+        );
+        $this->setOrder(new BigInteger('A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP320r1.php b/phpseclib/Crypt/EC/Curves/brainpoolP320r1.php
new file mode 100644
index 000000000..7d24665c1
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP320r1.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * brainpoolP320r1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class brainpoolP320r1 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F9' .
+                                        '2B9EC7893EC28FCD412B1F1B32E27', 16));
+        $this->setCoefficients(
+            new BigInteger('3EE30B568FBAB0F883CCEBD46D3F3BB8A2A73513F5EB79DA66190EB085FFA9F4' .
+                           '92F375A97D860EB4', 16),
+            new BigInteger('520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD88453981' .
+                           '6F5EB4AC8FB1F1A6', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('43BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C7' .
+                           '10AF8D0D39E20611', 16),
+            new BigInteger('14FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7' .
+                           'D35245D1692E8EE1', 16)
+        );
+        $this->setOrder(new BigInteger('D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D4' .
+                                       '82EC7EE8658E98691555B44C59311', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP320t1.php b/phpseclib/Crypt/EC/Curves/brainpoolP320t1.php
new file mode 100644
index 000000000..33a8939f5
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP320t1.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * brainpoolP320t1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class brainpoolP320t1 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F9' .
+                                        '2B9EC7893EC28FCD412B1F1B32E27', 16));
+        $this->setCoefficients(
+            new BigInteger('D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28' .
+                           'FCD412B1F1B32E24', 16), // eg. -3
+            new BigInteger('A7F561E038EB1ED560B3D147DB782013064C19F27ED27C6780AAF77FB8A547CE' .
+                           'B5B4FEF422340353', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('925BE9FB01AFC6FB4D3E7D4990010F813408AB106C4F09CB7EE07868CC136FFF' .
+                           '3357F624A21BED52', 16),
+            new BigInteger('63BA3A7A27483EBF6671DBEF7ABB30EBEE084E58A0B077AD42A5A0989D1EE71B' .
+                           '1B9BC0455FB0D2C3', 16)
+        );
+        $this->setOrder(new BigInteger('D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D4' .
+                                       '82EC7EE8658E98691555B44C59311', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP384r1.php b/phpseclib/Crypt/EC/Curves/brainpoolP384r1.php
new file mode 100644
index 000000000..98eb32a29
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP384r1.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * brainpoolP384r1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class brainpoolP384r1 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger(
+            '8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A7' .
+            '1874700133107EC53',
+            16
+        ));
+        $this->setCoefficients(
+            new BigInteger(
+                '7BC382C63D8C150C3C72080ACE05AFA0C2BEA28E4FB22787139165EFBA91F90F8AA5814A503' .
+                'AD4EB04A8C7DD22CE2826',
+                16
+            ),
+            new BigInteger(
+                '4A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62D57CB4390295DB' .
+                'C9943AB78696FA504C11',
+                16
+            )
+        );
+        $this->setBasePoint(
+            new BigInteger(
+                '1D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D' .
+                '646AAEF87B2E247D4AF1E',
+                16
+            ),
+            new BigInteger(
+                '8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E464621779' .
+                '1811142820341263C5315',
+                16
+            )
+        );
+        $this->setOrder(new BigInteger(
+            '8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC31' .
+            '03B883202E9046565',
+            16
+        ));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP384t1.php b/phpseclib/Crypt/EC/Curves/brainpoolP384t1.php
new file mode 100644
index 000000000..c9acbca60
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP384t1.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * brainpoolP384t1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class brainpoolP384t1 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger(
+            '8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A7' .
+            '1874700133107EC53',
+            16
+        ));
+        $this->setCoefficients(
+            new BigInteger(
+                '8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901' .
+                'D1A71874700133107EC50',
+                16
+            ), // eg. -3
+            new BigInteger(
+                '7F519EADA7BDA81BD826DBA647910F8C4B9346ED8CCDC64E4B1ABD11756DCE1D2074AA263B8' .
+                '8805CED70355A33B471EE',
+                16
+            )
+        );
+        $this->setBasePoint(
+            new BigInteger(
+                '18DE98B02DB9A306F2AFCD7235F72A819B80AB12EBD653172476FECD462AABFFC4FF191B946' .
+                'A5F54D8D0AA2F418808CC',
+                16
+            ),
+            new BigInteger(
+                '25AB056962D30651A114AFD2755AD336747F93475B7A1FCA3B88F2B6A208CCFE469408584DC' .
+                '2B2912675BF5B9E582928',
+                16
+            )
+        );
+        $this->setOrder(new BigInteger(
+            '8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC31' .
+            '03B883202E9046565',
+            16
+        ));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP512r1.php b/phpseclib/Crypt/EC/Curves/brainpoolP512r1.php
new file mode 100644
index 000000000..475ddfd49
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP512r1.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * brainpoolP512r1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class brainpoolP512r1 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger(
+            'AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC' .
+            '66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3',
+            16
+        ));
+        $this->setCoefficients(
+            new BigInteger(
+                '7830A3318B603B89E2327145AC234CC594CBDD8D3DF91610A83441CAEA9863BC2DED5D5AA82' .
+                '53AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CA',
+                16
+            ),
+            new BigInteger(
+                '3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C' .
+                '1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723',
+                16
+            )
+        );
+        $this->setBasePoint(
+            new BigInteger(
+                '81AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D' .
+                '0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F822',
+                16
+            ),
+            new BigInteger(
+                '7DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5' .
+                'F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892',
+                16
+            )
+        );
+        $this->setOrder(new BigInteger(
+            'AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA' .
+            '92619418661197FAC10471DB1D381085DDADDB58796829CA90069',
+            16
+        ));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP512t1.php b/phpseclib/Crypt/EC/Curves/brainpoolP512t1.php
new file mode 100644
index 000000000..e9db26bdc
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP512t1.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * brainpoolP512t1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class brainpoolP512t1 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger(
+            'AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC' .
+            '66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3',
+            16
+        ));
+        $this->setCoefficients(
+            new BigInteger(
+                'AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC' .
+                '66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F0',
+                16
+            ), // eg. -3
+            new BigInteger(
+                '7CBBBCF9441CFAB76E1890E46884EAE321F70C0BCB4981527897504BEC3E36A62BCDFA23049' .
+                '76540F6450085F2DAE145C22553B465763689180EA2571867423E',
+                16
+            )
+        );
+        $this->setBasePoint(
+            new BigInteger(
+                '640ECE5C12788717B9C1BA06CBC2A6FEBA85842458C56DDE9DB1758D39C0313D82BA51735CD' .
+                'B3EA499AA77A7D6943A64F7A3F25FE26F06B51BAA2696FA9035DA',
+                16
+            ),
+            new BigInteger(
+                '5B534BD595F5AF0FA2C892376C84ACE1BB4E3019B71634C01131159CAE03CEE9D9932184BEE' .
+                'F216BD71DF2DADF86A627306ECFF96DBB8BACE198B61E00F8B332',
+                16
+            )
+        );
+        $this->setOrder(new BigInteger(
+            'AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA' .
+            '92619418661197FAC10471DB1D381085DDADDB58796829CA90069',
+            16
+        ));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/nistb233.php b/phpseclib/Crypt/EC/Curves/nistb233.php
new file mode 100644
index 000000000..7182336a0
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/nistb233.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * nistb233
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+final class nistb233 extends sect233r1
+{
+}
diff --git a/phpseclib/Crypt/EC/Curves/nistb409.php b/phpseclib/Crypt/EC/Curves/nistb409.php
new file mode 100644
index 000000000..e6eadbc38
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/nistb409.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * nistb409
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+final class nistb409 extends sect409r1
+{
+}
diff --git a/phpseclib/Crypt/EC/Curves/nistk163.php b/phpseclib/Crypt/EC/Curves/nistk163.php
new file mode 100644
index 000000000..ae06c5f53
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/nistk163.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * nistk163
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+final class nistk163 extends sect163k1
+{
+}
diff --git a/phpseclib/Crypt/EC/Curves/nistk233.php b/phpseclib/Crypt/EC/Curves/nistk233.php
new file mode 100644
index 000000000..22f4de02f
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/nistk233.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * nistk233
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+final class nistk233 extends sect233k1
+{
+}
diff --git a/phpseclib/Crypt/EC/Curves/nistk283.php b/phpseclib/Crypt/EC/Curves/nistk283.php
new file mode 100644
index 000000000..3515fe619
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/nistk283.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * sect283k1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+final class nistk283 extends sect283k1
+{
+}
diff --git a/phpseclib/Crypt/EC/Curves/nistk409.php b/phpseclib/Crypt/EC/Curves/nistk409.php
new file mode 100644
index 000000000..c33e11c6d
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/nistk409.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * nistk409
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+final class nistk409 extends sect409k1
+{
+}
diff --git a/phpseclib/Crypt/EC/Curves/nistp192.php b/phpseclib/Crypt/EC/Curves/nistp192.php
new file mode 100644
index 000000000..0999dd8ad
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/nistp192.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * nistp192
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+final class nistp192 extends secp192r1
+{
+}
diff --git a/phpseclib/Crypt/EC/Curves/nistp224.php b/phpseclib/Crypt/EC/Curves/nistp224.php
new file mode 100644
index 000000000..732ed6c36
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/nistp224.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * nistp224
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+final class nistp224 extends secp224r1
+{
+}
diff --git a/phpseclib/Crypt/EC/Curves/nistp256.php b/phpseclib/Crypt/EC/Curves/nistp256.php
new file mode 100644
index 000000000..b63cebf07
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/nistp256.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * nistp256
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+final class nistp256 extends secp256r1
+{
+}
diff --git a/phpseclib/Crypt/EC/Curves/nistp384.php b/phpseclib/Crypt/EC/Curves/nistp384.php
new file mode 100644
index 000000000..0c48d9f99
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/nistp384.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * nistp384
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+final class nistp384 extends secp384r1
+{
+}
diff --git a/phpseclib/Crypt/EC/Curves/nistp521.php b/phpseclib/Crypt/EC/Curves/nistp521.php
new file mode 100644
index 000000000..f6b7fc8e9
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/nistp521.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * nistp521
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+final class nistp521 extends secp521r1
+{
+}
diff --git a/phpseclib/Crypt/EC/Curves/nistt571.php b/phpseclib/Crypt/EC/Curves/nistt571.php
new file mode 100644
index 000000000..eec6570fa
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/nistt571.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * nistt571
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+final class nistt571 extends sect571k1
+{
+}
diff --git a/phpseclib/Crypt/EC/Curves/prime192v1.php b/phpseclib/Crypt/EC/Curves/prime192v1.php
new file mode 100644
index 000000000..c60477cff
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/prime192v1.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * prime192v1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+final class prime192v1 extends secp192r1
+{
+}
diff --git a/phpseclib/Crypt/EC/Curves/prime192v2.php b/phpseclib/Crypt/EC/Curves/prime192v2.php
new file mode 100644
index 000000000..1f94ace0d
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/prime192v2.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * prime192v2
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class prime192v2 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF', 16));
+        $this->setCoefficients(
+            new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC', 16),
+            new BigInteger('CC22D6DFB95C6B25E49C0D6364A4E5980C393AA21668D953', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('EEA2BAE7E1497842F2DE7769CFE9C989C072AD696F48034A', 16),
+            new BigInteger('6574D11D69B6EC7A672BB82A083DF2F2B0847DE970B2DE15', 16)
+        );
+        $this->setOrder(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFE5FB1A724DC80418648D8DD31', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/prime192v3.php b/phpseclib/Crypt/EC/Curves/prime192v3.php
new file mode 100644
index 000000000..b5ba45753
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/prime192v3.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * prime192v3
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class prime192v3 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF', 16));
+        $this->setCoefficients(
+            new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC', 16),
+            new BigInteger('22123DC2395A05CAA7423DAECCC94760A7D462256BD56916', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('7D29778100C65A1DA1783716588DCE2B8B4AEE8E228F1896', 16),
+            new BigInteger('38A90F22637337334B49DCB66A6DC8F9978ACA7648A943B0', 16)
+        );
+        $this->setOrder(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFF7A62D031C83F4294F640EC13', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/prime239v1.php b/phpseclib/Crypt/EC/Curves/prime239v1.php
new file mode 100644
index 000000000..73b8acbc0
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/prime239v1.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * prime239v1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class prime239v1 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF', 16));
+        $this->setCoefficients(
+            new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC', 16),
+            new BigInteger('6B016C3BDCF18941D0D654921475CA71A9DB2FB27D1D37796185C2942C0A', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('0FFA963CDCA8816CCC33B8642BEDF905C3D358573D3F27FBBD3B3CB9AAAF', 16),
+            new BigInteger('7DEBE8E4E90A5DAE6E4054CA530BA04654B36818CE226B39FCCB7B02F1AE', 16)
+        );
+        $this->setOrder(new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF9E5E9A9F5D9071FBD1522688909D0B', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/prime239v2.php b/phpseclib/Crypt/EC/Curves/prime239v2.php
new file mode 100644
index 000000000..cf5ab8dfd
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/prime239v2.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * prime239v2
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class prime239v2 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF', 16));
+        $this->setCoefficients(
+            new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC', 16),
+            new BigInteger('617FAB6832576CBBFED50D99F0249C3FEE58B94BA0038C7AE84C8C832F2C', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('38AF09D98727705120C921BB5E9E26296A3CDCF2F35757A0EAFD87B830E7', 16),
+            new BigInteger('5B0125E4DBEA0EC7206DA0FC01D9B081329FB555DE6EF460237DFF8BE4BA', 16)
+        );
+        $this->setOrder(new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFF800000CFA7E8594377D414C03821BC582063', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/prime239v3.php b/phpseclib/Crypt/EC/Curves/prime239v3.php
new file mode 100644
index 000000000..8ce2095e6
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/prime239v3.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * prime239v3
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class prime239v3 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF', 16));
+        $this->setCoefficients(
+            new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC', 16),
+            new BigInteger('255705FA2A306654B1F4CB03D6A750A30C250102D4988717D9BA15AB6D3E', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('6768AE8E18BB92CFCF005C949AA2C6D94853D0E660BBF854B1C9505FE95A', 16),
+            new BigInteger('1607E6898F390C06BC1D552BAD226F3B6FCFE48B6E818499AF18E3ED6CF3', 16)
+        );
+        $this->setOrder(new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF975DEB41B3A6057C3C432146526551', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/prime256v1.php b/phpseclib/Crypt/EC/Curves/prime256v1.php
new file mode 100644
index 000000000..905c18eb9
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/prime256v1.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * prime256v1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+final class prime256v1 extends secp256r1
+{
+}
diff --git a/phpseclib/Crypt/EC/Curves/secp112r1.php b/phpseclib/Crypt/EC/Curves/secp112r1.php
new file mode 100644
index 000000000..686c2dcac
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/secp112r1.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * secp112r1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class secp112r1 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('DB7C2ABF62E35E668076BEAD208B', 16));
+        $this->setCoefficients(
+            new BigInteger('DB7C2ABF62E35E668076BEAD2088', 16),
+            new BigInteger('659EF8BA043916EEDE8911702B22', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('09487239995A5EE76B55F9C2F098', 16),
+            new BigInteger('A89CE5AF8724C0A23E0E0FF77500', 16)
+        );
+        $this->setOrder(new BigInteger('DB7C2ABF62E35E7628DFAC6561C5', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/secp112r2.php b/phpseclib/Crypt/EC/Curves/secp112r2.php
new file mode 100644
index 000000000..104dbcff9
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/secp112r2.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * secp112r2
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class secp112r2 extends Prime
+{
+    public function __construct()
+    {
+        // same modulo as secp112r1
+        $this->setModulo(new BigInteger('DB7C2ABF62E35E668076BEAD208B', 16));
+        $this->setCoefficients(
+            new BigInteger('6127C24C05F38A0AAAF65C0EF02C', 16),
+            new BigInteger('51DEF1815DB5ED74FCC34C85D709', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('4BA30AB5E892B4E1649DD0928643', 16),
+            new BigInteger('ADCD46F5882E3747DEF36E956E97', 16)
+        );
+        $this->setOrder(new BigInteger('36DF0AAFD8B8D7597CA10520D04B', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/secp128r1.php b/phpseclib/Crypt/EC/Curves/secp128r1.php
new file mode 100644
index 000000000..7866ad472
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/secp128r1.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * secp128r1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class secp128r1 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF', 16));
+        $this->setCoefficients(
+            new BigInteger('FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC', 16),
+            new BigInteger('E87579C11079F43DD824993C2CEE5ED3', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('161FF7528B899B2D0C28607CA52C5B86', 16),
+            new BigInteger('CF5AC8395BAFEB13C02DA292DDED7A83', 16)
+        );
+        $this->setOrder(new BigInteger('FFFFFFFE0000000075A30D1B9038A115', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/secp128r2.php b/phpseclib/Crypt/EC/Curves/secp128r2.php
new file mode 100644
index 000000000..cf88530cf
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/secp128r2.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * secp128r2
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class secp128r2 extends Prime
+{
+    public function __construct()
+    {
+        // same as secp128r1
+        $this->setModulo(new BigInteger('FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF', 16));
+        $this->setCoefficients(
+            new BigInteger('D6031998D1B3BBFEBF59CC9BBFF9AEE1', 16),
+            new BigInteger('5EEEFCA380D02919DC2C6558BB6D8A5D', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('7B6AA5D85E572983E6FB32A7CDEBC140', 16),
+            new BigInteger('27B6916A894D3AEE7106FE805FC34B44', 16)
+        );
+        $this->setOrder(new BigInteger('3FFFFFFF7FFFFFFFBE0024720613B5A3', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/secp160k1.php b/phpseclib/Crypt/EC/Curves/secp160k1.php
new file mode 100644
index 000000000..f86aa1a47
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/secp160k1.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * secp160k1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\KoblitzPrime;
+use phpseclib3\Math\BigInteger;
+
+class secp160k1 extends KoblitzPrime
+{
+    public function __construct()
+    {
+        // same as secp160r2
+        $this->setModulo(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73', 16));
+        $this->setCoefficients(
+            new BigInteger('0000000000000000000000000000000000000000', 16),
+            new BigInteger('0000000000000000000000000000000000000007', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('3B4C382CE37AA192A4019E763036F4F5DD4D7EBB', 16),
+            new BigInteger('938CF935318FDCED6BC28286531733C3F03C4FEE', 16)
+        );
+        $this->setOrder(new BigInteger('0100000000000000000001B8FA16DFAB9ACA16B6B3', 16));
+
+        $this->basis = [];
+        $this->basis[] = [
+            'a' => new BigInteger('0096341F1138933BC2F505', -16),
+            'b' => new BigInteger('FF6E9D0418C67BB8D5F562', -16),
+        ];
+        $this->basis[] = [
+            'a' => new BigInteger('01BDCB3A09AAAABEAFF4A8', -16),
+            'b' => new BigInteger('04D12329FF0EF498EA67', -16),
+        ];
+        $this->beta = $this->factory->newInteger(new BigInteger('645B7345A143464942CC46D7CF4D5D1E1E6CBB68', -16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/secp160r1.php b/phpseclib/Crypt/EC/Curves/secp160r1.php
new file mode 100644
index 000000000..7b84e0d08
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/secp160r1.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * secp160r1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class secp160r1 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF', 16));
+        $this->setCoefficients(
+            new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC', 16),
+            new BigInteger('1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('4A96B5688EF573284664698968C38BB913CBFC82', 16),
+            new BigInteger('23A628553168947D59DCC912042351377AC5FB32', 16)
+        );
+        $this->setOrder(new BigInteger('0100000000000000000001F4C8F927AED3CA752257', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/secp160r2.php b/phpseclib/Crypt/EC/Curves/secp160r2.php
new file mode 100644
index 000000000..6cab3cd9f
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/secp160r2.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * secp160r2
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class secp160r2 extends Prime
+{
+    public function __construct()
+    {
+        // same as secp160k1
+        $this->setModulo(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73', 16));
+        $this->setCoefficients(
+            new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70', 16),
+            new BigInteger('B4E134D3FB59EB8BAB57274904664D5AF50388BA', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('52DCB034293A117E1F4FF11B30F7199D3144CE6D', 16),
+            new BigInteger('FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E', 16)
+        );
+        $this->setOrder(new BigInteger('0100000000000000000000351EE786A818F3A1A16B', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/secp192k1.php b/phpseclib/Crypt/EC/Curves/secp192k1.php
new file mode 100644
index 000000000..0515e0b51
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/secp192k1.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * secp192k1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\KoblitzPrime;
+use phpseclib3\Math\BigInteger;
+
+class secp192k1 extends KoblitzPrime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37', 16));
+        $this->setCoefficients(
+            new BigInteger('000000000000000000000000000000000000000000000000', 16),
+            new BigInteger('000000000000000000000000000000000000000000000003', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D', 16),
+            new BigInteger('9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D', 16)
+        );
+        $this->setOrder(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D', 16));
+
+        $this->basis = [];
+        $this->basis[] = [
+            'a' => new BigInteger('00B3FB3400DEC5C4ADCEB8655C', -16),
+            'b' => new BigInteger('8EE96418CCF4CFC7124FDA0F', -16),
+        ];
+        $this->basis[] = [
+            'a' => new BigInteger('01D90D03E8F096B9948B20F0A9', -16),
+            'b' => new BigInteger('42E49819ABBA9474E1083F6B', -16),
+        ];
+        $this->beta = $this->factory->newInteger(new BigInteger('447A96E6C647963E2F7809FEAAB46947F34B0AA3CA0BBA74', -16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/secp192r1.php b/phpseclib/Crypt/EC/Curves/secp192r1.php
new file mode 100644
index 000000000..5dc8edb78
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/secp192r1.php
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * secp192r1
+ *
+ * This is the NIST P-192 curve
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class secp192r1 extends Prime
+{
+    public function __construct()
+    {
+        $modulo = new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF', 16);
+        $this->setModulo($modulo);
+
+        // algorithm 2.27 from http://diamond.boisestate.edu/~liljanab/MATH308/GuideToECC.pdf#page=66
+        /* in theory this should be faster than regular modular reductions save for one small issue.
+           to convert to / from base-2**8 with BCMath you have to call bcmul() and bcdiv() a lot.
+           to convert to / from base-2**8 with PHP64 you have to call base256_rshift() a lot.
+           in short, converting to / from base-2**8 is pretty expensive and that expense is
+           enough to offset whatever else might be gained by a simplified reduction algorithm.
+           now, if PHP supported unsigned integers things might be different. no bit-shifting
+           would be required for the PHP engine and it'd be a lot faster. but as is, BigInteger
+           uses base-2**31 or base-2**26 depending on whether or not the system is has a 32-bit
+           or a 64-bit OS.
+        */
+        /*
+        $m_length = $this->getLengthInBytes();
+        $this->setReduction(function($c) use ($m_length) {
+            $cBytes = $c->toBytes();
+            $className = $this->className;
+
+            if (strlen($cBytes) > 2 * $m_length) {
+                list(, $r) = $c->divide($className::$modulo);
+                return $r;
+            }
+
+            $c = str_pad($cBytes, 48, "\0", STR_PAD_LEFT);
+            $c = array_reverse(str_split($c, 8));
+
+            $null = "\0\0\0\0\0\0\0\0";
+            $s1 = new BigInteger($c[2] . $c[1] . $c[0], 256);
+            $s2 = new BigInteger($null . $c[3] . $c[3], 256);
+            $s3 = new BigInteger($c[4] . $c[4] . $null, 256);
+            $s4 = new BigInteger($c[5] . $c[5] . $c[5], 256);
+
+            $r = $s1->add($s2)->add($s3)->add($s4);
+            while ($r->compare($className::$modulo) >= 0) {
+                $r = $r->subtract($className::$modulo);
+            }
+
+            return $r;
+        });
+        */
+
+        $this->setCoefficients(
+            new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC', 16),
+            new BigInteger('64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012', 16),
+            new BigInteger('07192B95FFC8DA78631011ED6B24CDD573F977A11E794811', 16)
+        );
+        $this->setOrder(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/secp224k1.php b/phpseclib/Crypt/EC/Curves/secp224k1.php
new file mode 100644
index 000000000..4796a5681
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/secp224k1.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * secp224k1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\KoblitzPrime;
+use phpseclib3\Math\BigInteger;
+
+class secp224k1 extends KoblitzPrime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D', 16));
+        $this->setCoefficients(
+            new BigInteger('00000000000000000000000000000000000000000000000000000000', 16),
+            new BigInteger('00000000000000000000000000000000000000000000000000000005', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C', 16),
+            new BigInteger('7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5', 16)
+        );
+        $this->setOrder(new BigInteger('010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7', 16));
+
+        $this->basis = [];
+        $this->basis[] = [
+            'a' => new BigInteger('00B8ADF1378A6EB73409FA6C9C637D', -16),
+            'b' => new BigInteger('94730F82B358A3776A826298FA6F', -16),
+        ];
+        $this->basis[] = [
+            'a' => new BigInteger('01DCE8D2EC6184CAF0A972769FCC8B', -16),
+            'b' => new BigInteger('4D2100BA3DC75AAB747CCF355DEC', -16),
+        ];
+        $this->beta = $this->factory->newInteger(new BigInteger('01F178FFA4B17C89E6F73AECE2AAD57AF4C0A748B63C830947B27E04', -16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/secp224r1.php b/phpseclib/Crypt/EC/Curves/secp224r1.php
new file mode 100644
index 000000000..278ced443
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/secp224r1.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * secp224r1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class secp224r1 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001', 16));
+        $this->setCoefficients(
+            new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE', 16),
+            new BigInteger('B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21', 16),
+            new BigInteger('BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34', 16)
+        );
+        $this->setOrder(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/secp256k1.php b/phpseclib/Crypt/EC/Curves/secp256k1.php
new file mode 100644
index 000000000..8ec9e3ac1
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/secp256k1.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * secp256k1
+ *
+ * This is the curve used in Bitcoin
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+//use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Crypt\EC\BaseCurves\KoblitzPrime;
+use phpseclib3\Math\BigInteger;
+
+//class secp256k1 extends Prime
+class secp256k1 extends KoblitzPrime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F', 16));
+        $this->setCoefficients(
+            new BigInteger('0000000000000000000000000000000000000000000000000000000000000000', 16),
+            new BigInteger('0000000000000000000000000000000000000000000000000000000000000007', 16)
+        );
+        $this->setOrder(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141', 16));
+        $this->setBasePoint(
+            new BigInteger('79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798', 16),
+            new BigInteger('483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8', 16)
+        );
+
+        $this->basis = [];
+        $this->basis[] = [
+            'a' => new BigInteger('3086D221A7D46BCDE86C90E49284EB15', -16),
+            'b' => new BigInteger('FF1BBC8129FEF177D790AB8056F5401B3D', -16),
+        ];
+        $this->basis[] = [
+            'a' => new BigInteger('114CA50F7A8E2F3F657C1108D9D44CFD8', -16),
+            'b' => new BigInteger('3086D221A7D46BCDE86C90E49284EB15', -16),
+        ];
+        $this->beta = $this->factory->newInteger(new BigInteger('7AE96A2B657C07106E64479EAC3434E99CF0497512F58995C1396C28719501EE', -16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/secp256r1.php b/phpseclib/Crypt/EC/Curves/secp256r1.php
new file mode 100644
index 000000000..ddd6b071d
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/secp256r1.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * secp256r1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class secp256r1 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF', 16));
+        $this->setCoefficients(
+            new BigInteger('FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC', 16),
+            new BigInteger('5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296', 16),
+            new BigInteger('4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5', 16)
+        );
+        $this->setOrder(new BigInteger('FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/secp384r1.php b/phpseclib/Crypt/EC/Curves/secp384r1.php
new file mode 100644
index 000000000..abf748aa4
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/secp384r1.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * secp384r1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class secp384r1 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger(
+            'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFF',
+            16
+        ));
+        $this->setCoefficients(
+            new BigInteger(
+                'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFC',
+                16
+            ),
+            new BigInteger(
+                'B3312FA7E23EE7E4988E056BE3F82D19181D9C6EFE8141120314088F5013875AC656398D8A2ED19D2A85C8EDD3EC2AEF',
+                16
+            )
+        );
+        $this->setBasePoint(
+            new BigInteger(
+                'AA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B9859F741E082542A385502F25DBF55296C3A545E3872760AB7',
+                16
+            ),
+            new BigInteger(
+                '3617DE4A96262C6F5D9E98BF9292DC29F8F41DBD289A147CE9DA3113B5F0B8C00A60B1CE1D7E819D7A431D7C90EA0E5F',
+                16
+            )
+        );
+        $this->setOrder(new BigInteger(
+            'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC7634D81F4372DDF581A0DB248B0A77AECEC196ACCC52973',
+            16
+        ));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/secp521r1.php b/phpseclib/Crypt/EC/Curves/secp521r1.php
new file mode 100644
index 000000000..9de3a837e
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/secp521r1.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * secp521r1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Prime;
+use phpseclib3\Math\BigInteger;
+
+class secp521r1 extends Prime
+{
+    public function __construct()
+    {
+        $this->setModulo(new BigInteger('01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF' .
+                                        'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF' .
+                                        'FFFF', 16));
+        $this->setCoefficients(
+            new BigInteger('01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF' .
+                           'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF' .
+                           'FFFC', 16),
+            new BigInteger('0051953EB9618E1C9A1F929A21A0B68540EEA2DA725B99B315F3B8B489918EF1' .
+                           '09E156193951EC7E937B1652C0BD3BB1BF073573DF883D2C34F1EF451FD46B50' .
+                           '3F00', 16)
+        );
+        $this->setBasePoint(
+            new BigInteger('00C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D' .
+                           '3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5' .
+                           'BD66', 16),
+            new BigInteger('011839296A789A3BC0045C8A5FB42C7D1BD998F54449579B446817AFBD17273E' .
+                           '662C97EE72995EF42640C550B9013FAD0761353C7086A272C24088BE94769FD1' .
+                           '6650', 16)
+        );
+        $this->setOrder(new BigInteger('01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF' .
+                                       'FFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E9138' .
+                                       '6409', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/sect113r1.php b/phpseclib/Crypt/EC/Curves/sect113r1.php
new file mode 100644
index 000000000..b2f5f2776
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/sect113r1.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * sect113r1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Binary;
+use phpseclib3\Math\BigInteger;
+
+class sect113r1 extends Binary
+{
+    public function __construct()
+    {
+        $this->setModulo(113, 9, 0);
+        $this->setCoefficients(
+            '003088250CA6E7C7FE649CE85820F7',
+            '00E8BEE4D3E2260744188BE0E9C723'
+        );
+        $this->setBasePoint(
+            '009D73616F35F4AB1407D73562C10F',
+            '00A52830277958EE84D1315ED31886'
+        );
+        $this->setOrder(new BigInteger('0100000000000000D9CCEC8A39E56F', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/sect113r2.php b/phpseclib/Crypt/EC/Curves/sect113r2.php
new file mode 100644
index 000000000..531ccd694
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/sect113r2.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * sect113r2
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Binary;
+use phpseclib3\Math\BigInteger;
+
+class sect113r2 extends Binary
+{
+    public function __construct()
+    {
+        $this->setModulo(113, 9, 0);
+        $this->setCoefficients(
+            '00689918DBEC7E5A0DD6DFC0AA55C7',
+            '0095E9A9EC9B297BD4BF36E059184F'
+        );
+        $this->setBasePoint(
+            '01A57A6A7B26CA5EF52FCDB8164797',
+            '00B3ADC94ED1FE674C06E695BABA1D'
+        );
+        $this->setOrder(new BigInteger('010000000000000108789B2496AF93', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/sect131r1.php b/phpseclib/Crypt/EC/Curves/sect131r1.php
new file mode 100644
index 000000000..e6d2f4f8a
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/sect131r1.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * sect131r1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Binary;
+use phpseclib3\Math\BigInteger;
+
+class sect131r1 extends Binary
+{
+    public function __construct()
+    {
+        $this->setModulo(131, 8, 3, 2, 0);
+        $this->setCoefficients(
+            '07A11B09A76B562144418FF3FF8C2570B8',
+            '0217C05610884B63B9C6C7291678F9D341'
+        );
+        $this->setBasePoint(
+            '0081BAF91FDF9833C40F9C181343638399',
+            '078C6E7EA38C001F73C8134B1B4EF9E150'
+        );
+        $this->setOrder(new BigInteger('0400000000000000023123953A9464B54D', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/sect131r2.php b/phpseclib/Crypt/EC/Curves/sect131r2.php
new file mode 100644
index 000000000..6c8da6aa1
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/sect131r2.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * sect131r2
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Binary;
+use phpseclib3\Math\BigInteger;
+
+class sect131r2 extends Binary
+{
+    public function __construct()
+    {
+        $this->setModulo(131, 8, 3, 2, 0);
+        $this->setCoefficients(
+            '03E5A88919D7CAFCBF415F07C2176573B2',
+            '04B8266A46C55657AC734CE38F018F2192'
+        );
+        $this->setBasePoint(
+            '0356DCD8F2F95031AD652D23951BB366A8',
+            '0648F06D867940A5366D9E265DE9EB240F'
+        );
+        $this->setOrder(new BigInteger('0400000000000000016954A233049BA98F', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/sect163k1.php b/phpseclib/Crypt/EC/Curves/sect163k1.php
new file mode 100644
index 000000000..95b5ad37d
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/sect163k1.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * sect163k1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Binary;
+use phpseclib3\Math\BigInteger;
+
+class sect163k1 extends Binary
+{
+    public function __construct()
+    {
+        $this->setModulo(163, 7, 6, 3, 0);
+        $this->setCoefficients(
+            '000000000000000000000000000000000000000001',
+            '000000000000000000000000000000000000000001'
+        );
+        $this->setBasePoint(
+            '02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8',
+            '0289070FB05D38FF58321F2E800536D538CCDAA3D9'
+        );
+        $this->setOrder(new BigInteger('04000000000000000000020108A2E0CC0D99F8A5EF', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/sect163r1.php b/phpseclib/Crypt/EC/Curves/sect163r1.php
new file mode 100644
index 000000000..a73e2b394
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/sect163r1.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * sect163r1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Binary;
+use phpseclib3\Math\BigInteger;
+
+class sect163r1 extends Binary
+{
+    public function __construct()
+    {
+        $this->setModulo(163, 7, 6, 3, 0);
+        $this->setCoefficients(
+            '07B6882CAAEFA84F9554FF8428BD88E246D2782AE2',
+            '0713612DCDDCB40AAB946BDA29CA91F73AF958AFD9'
+        );
+        $this->setBasePoint(
+            '0369979697AB43897789566789567F787A7876A654',
+            '00435EDB42EFAFB2989D51FEFCE3C80988F41FF883'
+        );
+        $this->setOrder(new BigInteger('03FFFFFFFFFFFFFFFFFFFF48AAB689C29CA710279B', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/sect163r2.php b/phpseclib/Crypt/EC/Curves/sect163r2.php
new file mode 100644
index 000000000..3c09aae8a
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/sect163r2.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * sect163r2
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Binary;
+use phpseclib3\Math\BigInteger;
+
+class sect163r2 extends Binary
+{
+    public function __construct()
+    {
+        $this->setModulo(163, 7, 6, 3, 0);
+        $this->setCoefficients(
+            '000000000000000000000000000000000000000001',
+            '020A601907B8C953CA1481EB10512F78744A3205FD'
+        );
+        $this->setBasePoint(
+            '03F0EBA16286A2D57EA0991168D4994637E8343E36',
+            '00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1'
+        );
+        $this->setOrder(new BigInteger('040000000000000000000292FE77E70C12A4234C33', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/sect193r1.php b/phpseclib/Crypt/EC/Curves/sect193r1.php
new file mode 100644
index 000000000..3ae056aea
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/sect193r1.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * sect193r1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Binary;
+use phpseclib3\Math\BigInteger;
+
+class sect193r1 extends Binary
+{
+    public function __construct()
+    {
+        $this->setModulo(193, 15, 0);
+        $this->setCoefficients(
+            '0017858FEB7A98975169E171F77B4087DE098AC8A911DF7B01',
+            '00FDFB49BFE6C3A89FACADAA7A1E5BBC7CC1C2E5D831478814'
+        );
+        $this->setBasePoint(
+            '01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1',
+            '0025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05'
+        );
+        $this->setOrder(new BigInteger('01000000000000000000000000C7F34A778F443ACC920EBA49', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/sect193r2.php b/phpseclib/Crypt/EC/Curves/sect193r2.php
new file mode 100644
index 000000000..6625f1690
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/sect193r2.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * sect193r2
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Binary;
+use phpseclib3\Math\BigInteger;
+
+class sect193r2 extends Binary
+{
+    public function __construct()
+    {
+        $this->setModulo(193, 15, 0);
+        $this->setCoefficients(
+            '0163F35A5137C2CE3EA6ED8667190B0BC43ECD69977702709B',
+            '00C9BB9E8927D4D64C377E2AB2856A5B16E3EFB7F61D4316AE'
+        );
+        $this->setBasePoint(
+            '00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F',
+            '01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C'
+        );
+        $this->setOrder(new BigInteger('010000000000000000000000015AAB561B005413CCD4EE99D5', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/sect233k1.php b/phpseclib/Crypt/EC/Curves/sect233k1.php
new file mode 100644
index 000000000..f2f5035d7
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/sect233k1.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * sect233k1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Binary;
+use phpseclib3\Math\BigInteger;
+
+class sect233k1 extends Binary
+{
+    public function __construct()
+    {
+        $this->setModulo(233, 74, 0);
+        $this->setCoefficients(
+            '000000000000000000000000000000000000000000000000000000000000',
+            '000000000000000000000000000000000000000000000000000000000001'
+        );
+        $this->setBasePoint(
+            '017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126',
+            '01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3'
+        );
+        $this->setOrder(new BigInteger('8000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/sect233r1.php b/phpseclib/Crypt/EC/Curves/sect233r1.php
new file mode 100644
index 000000000..459a4778c
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/sect233r1.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * sect233r1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Binary;
+use phpseclib3\Math\BigInteger;
+
+class sect233r1 extends Binary
+{
+    public function __construct()
+    {
+        $this->setModulo(233, 74, 0);
+        $this->setCoefficients(
+            '000000000000000000000000000000000000000000000000000000000001',
+            '0066647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD'
+        );
+        $this->setBasePoint(
+            '00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B',
+            '01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052'
+        );
+        $this->setOrder(new BigInteger('01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/sect239k1.php b/phpseclib/Crypt/EC/Curves/sect239k1.php
new file mode 100644
index 000000000..f7c1ce677
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/sect239k1.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * sect239k1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wiggint  on <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Binary;
+use phpseclib3\Math\BigInteger;
+
+class sect239k1 extends Binary
+{
+    public function __construct()
+    {
+        $this->setModulo(239, 158, 0);
+        $this->setCoefficients(
+            '000000000000000000000000000000000000000000000000000000000000',
+            '000000000000000000000000000000000000000000000000000000000001'
+        );
+        $this->setBasePoint(
+            '29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC',
+            '76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA'
+        );
+        $this->setOrder(new BigInteger('2000000000000000000000000000005A79FEC67CB6E91F1C1DA800E478A5', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/sect283k1.php b/phpseclib/Crypt/EC/Curves/sect283k1.php
new file mode 100644
index 000000000..f9dac72fb
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/sect283k1.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * sect283k1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wiggint  on <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Binary;
+use phpseclib3\Math\BigInteger;
+
+class sect283k1 extends Binary
+{
+    public function __construct()
+    {
+        $this->setModulo(283, 12, 7, 5, 0);
+        $this->setCoefficients(
+            '000000000000000000000000000000000000000000000000000000000000000000000000',
+            '000000000000000000000000000000000000000000000000000000000000000000000001'
+        );
+        $this->setBasePoint(
+            '0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836',
+            '01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259'
+        );
+        $this->setOrder(new BigInteger('01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163C61', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/sect283r1.php b/phpseclib/Crypt/EC/Curves/sect283r1.php
new file mode 100644
index 000000000..a22d46020
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/sect283r1.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * sect283r1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wiggint  on <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Binary;
+use phpseclib3\Math\BigInteger;
+
+class sect283r1 extends Binary
+{
+    public function __construct()
+    {
+        $this->setModulo(283, 12, 7, 5, 0);
+        $this->setCoefficients(
+            '000000000000000000000000000000000000000000000000000000000000000000000001',
+            '027B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A2F5'
+        );
+        $this->setBasePoint(
+            '05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053',
+            '03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4'
+        );
+        $this->setOrder(new BigInteger('03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB307', 16));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/sect409k1.php b/phpseclib/Crypt/EC/Curves/sect409k1.php
new file mode 100644
index 000000000..abb3bb258
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/sect409k1.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * sect409k1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wiggint  on <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Binary;
+use phpseclib3\Math\BigInteger;
+
+class sect409k1 extends Binary
+{
+    public function __construct()
+    {
+        $this->setModulo(409, 87, 0);
+        $this->setCoefficients(
+            '00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
+            '00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001'
+        );
+        $this->setBasePoint(
+            '0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746',
+            '01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B'
+        );
+        $this->setOrder(new BigInteger(
+            '7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F' .
+            '83B2D4EA20400EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF',
+            16
+        ));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/sect409r1.php b/phpseclib/Crypt/EC/Curves/sect409r1.php
new file mode 100644
index 000000000..03a92db18
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/sect409r1.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * sect409r1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wiggint  on <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Binary;
+use phpseclib3\Math\BigInteger;
+
+class sect409r1 extends Binary
+{
+    public function __construct()
+    {
+        $this->setModulo(409, 87, 0);
+        $this->setCoefficients(
+            '00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001',
+            '0021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422EF1F3DD674761FA99D6AC27C8A9A197B272822F6CD57A55AA4F50AE317B13545F'
+        );
+        $this->setBasePoint(
+            '015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7',
+            '0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706'
+        );
+        $this->setOrder(new BigInteger(
+            '010000000000000000000000000000000000000000000000000001E2' .
+            'AAD6A612F33307BE5FA47C3C9E052F838164CD37D9A21173',
+            16
+        ));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/sect571k1.php b/phpseclib/Crypt/EC/Curves/sect571k1.php
new file mode 100644
index 000000000..06901bbbe
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/sect571k1.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * sect571k1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wiggint  on <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Binary;
+use phpseclib3\Math\BigInteger;
+
+class sect571k1 extends Binary
+{
+    public function __construct()
+    {
+        $this->setModulo(571, 10, 5, 2, 0);
+        $this->setCoefficients(
+            '000000000000000000000000000000000000000000000000000000000000000000000000' .
+            '000000000000000000000000000000000000000000000000000000000000000000000000',
+            '000000000000000000000000000000000000000000000000000000000000000000000000' .
+            '000000000000000000000000000000000000000000000000000000000000000000000001'
+        );
+        $this->setBasePoint(
+            '026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA443709584' .
+            '93B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972',
+            '0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0' .
+            'AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3'
+        );
+        $this->setOrder(new BigInteger(
+            '020000000000000000000000000000000000000000000000000000000000000000000000' .
+            '131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F637C1001',
+            16
+        ));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Curves/sect571r1.php b/phpseclib/Crypt/EC/Curves/sect571r1.php
new file mode 100644
index 000000000..3d79f9e23
--- /dev/null
+++ b/phpseclib/Crypt/EC/Curves/sect571r1.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * sect571r1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wiggint  on <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Curves;
+
+use phpseclib3\Crypt\EC\BaseCurves\Binary;
+use phpseclib3\Math\BigInteger;
+
+class sect571r1 extends Binary
+{
+    public function __construct()
+    {
+        $this->setModulo(571, 10, 5, 2, 0);
+        $this->setCoefficients(
+            '000000000000000000000000000000000000000000000000000000000000000000000000' .
+            '000000000000000000000000000000000000000000000000000000000000000000000001',
+            '02F40E7E2221F295DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD84FFABBD' .
+            '8EFA59332BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C7FFEFF7F2955727A'
+        );
+        $this->setBasePoint(
+            '0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950' .
+            'F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19',
+            '037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43' .
+            'BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B'
+        );
+        $this->setOrder(new BigInteger(
+            '03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF' .
+            'E661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2FE84E47',
+            16
+        ));
+    }
+}
diff --git a/phpseclib/Crypt/EC/Formats/Keys/Common.php b/phpseclib/Crypt/EC/Formats/Keys/Common.php
new file mode 100644
index 000000000..4695a1466
--- /dev/null
+++ b/phpseclib/Crypt/EC/Formats/Keys/Common.php
@@ -0,0 +1,547 @@
+<?php
+
+/**
+ * Generic EC Key Parsing Helper functions
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Formats\Keys;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\EC\BaseCurves\Base as BaseCurve;
+use phpseclib3\Crypt\EC\BaseCurves\Binary as BinaryCurve;
+use phpseclib3\Crypt\EC\BaseCurves\Prime as PrimeCurve;
+use phpseclib3\Crypt\EC\BaseCurves\TwistedEdwards as TwistedEdwardsCurve;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\Exception\UnsupportedCurveException;
+use phpseclib3\File\ASN1;
+use phpseclib3\File\ASN1\Maps;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * Generic EC Key Parsing Helper functions
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+trait Common
+{
+    /**
+     * Curve OIDs
+     *
+     * @var array
+     */
+    private static $curveOIDs = [];
+
+    /**
+     * Child OIDs loaded
+     *
+     * @var bool
+     */
+    protected static $childOIDsLoaded = false;
+
+    /**
+     * Use Named Curves
+     *
+     * @var bool
+     */
+    private static $useNamedCurves = true;
+
+    /**
+     * Initialize static variables
+     */
+    private static function initialize_static_variables(): void
+    {
+        if (empty(self::$curveOIDs)) {
+            // the sec* curves are from the standards for efficient cryptography group
+            // sect* curves are curves over binary finite fields
+            // secp* curves are curves over prime finite fields
+            // sec*r* curves are regular curves; sec*k* curves are koblitz curves
+            // brainpool*r* curves are regular prime finite field curves
+            // brainpool*t* curves are twisted versions of the brainpool*r* curves
+            self::$curveOIDs = [
+                'prime192v1' => '1.2.840.10045.3.1.1', // J.5.1, example 1 (aka secp192r1)
+                'prime192v2' => '1.2.840.10045.3.1.2', // J.5.1, example 2
+                'prime192v3' => '1.2.840.10045.3.1.3', // J.5.1, example 3
+                'prime239v1' => '1.2.840.10045.3.1.4', // J.5.2, example 1
+                'prime239v2' => '1.2.840.10045.3.1.5', // J.5.2, example 2
+                'prime239v3' => '1.2.840.10045.3.1.6', // J.5.2, example 3
+                'prime256v1' => '1.2.840.10045.3.1.7', // J.5.3, example 1 (aka secp256r1)
+
+                // https://tools.ietf.org/html/rfc5656#section-10
+                'nistp256' => '1.2.840.10045.3.1.7', // aka secp256r1
+                'nistp384' => '1.3.132.0.34', // aka secp384r1
+                'nistp521' => '1.3.132.0.35', // aka secp521r1
+
+                'nistk163' => '1.3.132.0.1', // aka sect163k1
+                'nistp192' => '1.2.840.10045.3.1.1', // aka secp192r1
+                'nistp224' => '1.3.132.0.33', // aka secp224r1
+                'nistk233' => '1.3.132.0.26', // aka sect233k1
+                'nistb233' => '1.3.132.0.27', // aka sect233r1
+                'nistk283' => '1.3.132.0.16', // aka sect283k1
+                'nistk409' => '1.3.132.0.36', // aka sect409k1
+                'nistb409' => '1.3.132.0.37', // aka sect409r1
+                'nistt571' => '1.3.132.0.38', // aka sect571k1
+
+                // from https://tools.ietf.org/html/rfc5915
+                'secp192r1' => '1.2.840.10045.3.1.1', // aka prime192v1
+                'sect163k1' => '1.3.132.0.1',
+                'sect163r2' => '1.3.132.0.15',
+                'secp224r1' => '1.3.132.0.33',
+                'sect233k1' => '1.3.132.0.26',
+                'sect233r1' => '1.3.132.0.27',
+                'secp256r1' => '1.2.840.10045.3.1.7', // aka prime256v1
+                'sect283k1' => '1.3.132.0.16',
+                'sect283r1' => '1.3.132.0.17',
+                'secp384r1' => '1.3.132.0.34',
+                'sect409k1' => '1.3.132.0.36',
+                'sect409r1' => '1.3.132.0.37',
+                'secp521r1' => '1.3.132.0.35',
+                'sect571k1' => '1.3.132.0.38',
+                'sect571r1' => '1.3.132.0.39',
+                // from http://www.secg.org/SEC2-Ver-1.0.pdf
+                'secp112r1' => '1.3.132.0.6',
+                'secp112r2' => '1.3.132.0.7',
+                'secp128r1' => '1.3.132.0.28',
+                'secp128r2' => '1.3.132.0.29',
+                'secp160k1' => '1.3.132.0.9',
+                'secp160r1' => '1.3.132.0.8',
+                'secp160r2' => '1.3.132.0.30',
+                'secp192k1' => '1.3.132.0.31',
+                'secp224k1' => '1.3.132.0.32',
+                'secp256k1' => '1.3.132.0.10',
+
+                'sect113r1' => '1.3.132.0.4',
+                'sect113r2' => '1.3.132.0.5',
+                'sect131r1' => '1.3.132.0.22',
+                'sect131r2' => '1.3.132.0.23',
+                'sect163r1' => '1.3.132.0.2',
+                'sect193r1' => '1.3.132.0.24',
+                'sect193r2' => '1.3.132.0.25',
+                'sect239k1' => '1.3.132.0.3',
+
+                // from http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.202.2977&rep=rep1&type=pdf#page=36
+                /*
+                'c2pnb163v1' => '1.2.840.10045.3.0.1', // J.4.1, example 1
+                'c2pnb163v2' => '1.2.840.10045.3.0.2', // J.4.1, example 2
+                'c2pnb163v3' => '1.2.840.10045.3.0.3', // J.4.1, example 3
+                'c2pnb172w1' => '1.2.840.10045.3.0.4', // J.4.2, example 1
+                'c2tnb191v1' => '1.2.840.10045.3.0.5', // J.4.3, example 1
+                'c2tnb191v2' => '1.2.840.10045.3.0.6', // J.4.3, example 2
+                'c2tnb191v3' => '1.2.840.10045.3.0.7', // J.4.3, example 3
+                'c2onb191v4' => '1.2.840.10045.3.0.8', // J.4.3, example 4
+                'c2onb191v5' => '1.2.840.10045.3.0.9', // J.4.3, example 5
+                'c2pnb208w1' => '1.2.840.10045.3.0.10', // J.4.4, example 1
+                'c2tnb239v1' => '1.2.840.10045.3.0.11', // J.4.5, example 1
+                'c2tnb239v2' => '1.2.840.10045.3.0.12', // J.4.5, example 2
+                'c2tnb239v3' => '1.2.840.10045.3.0.13', // J.4.5, example 3
+                'c2onb239v4' => '1.2.840.10045.3.0.14', // J.4.5, example 4
+                'c2onb239v5' => '1.2.840.10045.3.0.15', // J.4.5, example 5
+                'c2pnb272w1' => '1.2.840.10045.3.0.16', // J.4.6, example 1
+                'c2pnb304w1' => '1.2.840.10045.3.0.17', // J.4.7, example 1
+                'c2tnb359v1' => '1.2.840.10045.3.0.18', // J.4.8, example 1
+                'c2pnb368w1' => '1.2.840.10045.3.0.19', // J.4.9, example 1
+                'c2tnb431r1' => '1.2.840.10045.3.0.20', // J.4.10, example 1
+                */
+
+                // http://www.ecc-brainpool.org/download/Domain-parameters.pdf
+                // https://tools.ietf.org/html/rfc5639
+                'brainpoolP160r1' => '1.3.36.3.3.2.8.1.1.1',
+                'brainpoolP160t1' => '1.3.36.3.3.2.8.1.1.2',
+                'brainpoolP192r1' => '1.3.36.3.3.2.8.1.1.3',
+                'brainpoolP192t1' => '1.3.36.3.3.2.8.1.1.4',
+                'brainpoolP224r1' => '1.3.36.3.3.2.8.1.1.5',
+                'brainpoolP224t1' => '1.3.36.3.3.2.8.1.1.6',
+                'brainpoolP256r1' => '1.3.36.3.3.2.8.1.1.7',
+                'brainpoolP256t1' => '1.3.36.3.3.2.8.1.1.8',
+                'brainpoolP320r1' => '1.3.36.3.3.2.8.1.1.9',
+                'brainpoolP320t1' => '1.3.36.3.3.2.8.1.1.10',
+                'brainpoolP384r1' => '1.3.36.3.3.2.8.1.1.11',
+                'brainpoolP384t1' => '1.3.36.3.3.2.8.1.1.12',
+                'brainpoolP512r1' => '1.3.36.3.3.2.8.1.1.13',
+                'brainpoolP512t1' => '1.3.36.3.3.2.8.1.1.14',
+            ];
+            ASN1::loadOIDs([
+                'prime-field' => '1.2.840.10045.1.1',
+                'characteristic-two-field' => '1.2.840.10045.1.2',
+                'characteristic-two-basis' => '1.2.840.10045.1.2.3',
+                // per http://www.secg.org/SEC1-Ver-1.0.pdf#page=84, gnBasis "not used here"
+                'gnBasis' => '1.2.840.10045.1.2.3.1', // NULL
+                'tpBasis' => '1.2.840.10045.1.2.3.2', // Trinomial
+                'ppBasis' => '1.2.840.10045.1.2.3.3',  // Pentanomial
+            ] + self::$curveOIDs);
+        }
+    }
+
+    /**
+     * Explicitly set the curve
+     *
+     * If the key contains an implicit curve phpseclib needs the curve
+     * to be explicitly provided
+     */
+    public static function setImplicitCurve(BaseCurve $curve): void
+    {
+        self::$implicitCurve = $curve;
+    }
+
+    /**
+     * Returns an instance of \phpseclib3\Crypt\EC\BaseCurves\Base based
+     * on the curve parameters
+     *
+     * @return BaseCurve|false
+     */
+    protected static function loadCurveByParam(array $params)
+    {
+        if (count($params) > 1) {
+            throw new RuntimeException('No parameters are present');
+        }
+        if (isset($params['namedCurve'])) {
+            $curve = '\phpseclib3\Crypt\EC\Curves\\' . $params['namedCurve'];
+            if (!class_exists($curve)) {
+                throw new UnsupportedCurveException('Named Curve of ' . $params['namedCurve'] . ' is not supported');
+            }
+            return new $curve();
+        }
+        if (isset($params['implicitCurve'])) {
+            if (!isset(self::$implicitCurve)) {
+                throw new RuntimeException('Implicit curves can be provided by calling setImplicitCurve');
+            }
+            return self::$implicitCurve;
+        }
+        if (isset($params['specifiedCurve'])) {
+            $data = $params['specifiedCurve'];
+            switch ($data['fieldID']['fieldType']) {
+                case 'prime-field':
+                    $curve = new PrimeCurve();
+                    $curve->setModulo($data['fieldID']['parameters']);
+                    $curve->setCoefficients(
+                        new BigInteger($data['curve']['a'], 256),
+                        new BigInteger($data['curve']['b'], 256)
+                    );
+                    $point = self::extractPoint("\0" . $data['base'], $curve);
+                    $curve->setBasePoint(...$point);
+                    $curve->setOrder($data['order']);
+                    return $curve;
+                case 'characteristic-two-field':
+                    $curve = new BinaryCurve();
+                    $params = ASN1::decodeBER($data['fieldID']['parameters']);
+                    $params = ASN1::asn1map($params[0], Maps\Characteristic_two::MAP);
+                    $modulo = [(int) $params['m']->toString()];
+                    switch ($params['basis']) {
+                        case 'tpBasis':
+                            $modulo[] = (int) $params['parameters']->toString();
+                            break;
+                        case 'ppBasis':
+                            $temp = ASN1::decodeBER($params['parameters']);
+                            $temp = ASN1::asn1map($temp[0], Maps\Pentanomial::MAP);
+                            $modulo[] = (int) $temp['k3']->toString();
+                            $modulo[] = (int) $temp['k2']->toString();
+                            $modulo[] = (int) $temp['k1']->toString();
+                    }
+                    $modulo[] = 0;
+                    $curve->setModulo(...$modulo);
+                    $len = ceil($modulo[0] / 8);
+                    $curve->setCoefficients(
+                        Strings::bin2hex($data['curve']['a']),
+                        Strings::bin2hex($data['curve']['b'])
+                    );
+                    $point = self::extractPoint("\0" . $data['base'], $curve);
+                    $curve->setBasePoint(...$point);
+                    $curve->setOrder($data['order']);
+                    return $curve;
+                default:
+                    throw new UnsupportedCurveException('Field Type of ' . $data['fieldID']['fieldType'] . ' is not supported');
+            }
+        }
+        throw new RuntimeException('No valid parameters are present');
+    }
+
+    /**
+     * Extract points from a string
+     *
+     * Supports both compressed and uncompressed points
+     *
+     * @return object[]
+     */
+    public static function extractPoint(string $str, BaseCurve $curve): array
+    {
+        if ($curve instanceof TwistedEdwardsCurve) {
+            // first step of point deciding as discussed at the following URL's:
+            // https://tools.ietf.org/html/rfc8032#section-5.1.3
+            // https://tools.ietf.org/html/rfc8032#section-5.2.3
+            $y = $str;
+            $y = strrev($y);
+            $sign = (bool) (ord($y[0]) & 0x80);
+            $y[0] = $y[0] & chr(0x7F);
+            $y = new BigInteger($y, 256);
+            if ($y->compare($curve->getModulo()) >= 0) {
+                throw new RuntimeException('The Y coordinate should not be >= the modulo');
+            }
+            $point = $curve->recoverX($y, $sign);
+            if (!$curve->verifyPoint($point)) {
+                throw new RuntimeException('Unable to verify that point exists on curve');
+            }
+            return $point;
+        }
+
+        // the first byte of a bit string represents the number of bits in the last byte that are to be ignored but,
+        // currently, bit strings wanting a non-zero amount of bits trimmed are not supported
+        if (($val = Strings::shift($str)) != "\0") {
+            throw new UnexpectedValueException('extractPoint expects the first byte to be null - not ' . Strings::bin2hex($val));
+        }
+        if ($str == "\0") {
+            return [];
+        }
+
+        $keylen = strlen($str);
+        $order = $curve->getLengthInBytes();
+        // point compression is being used
+        if ($keylen == $order + 1) {
+            return $curve->derivePoint($str);
+        }
+
+        // point compression is not being used
+        if ($keylen == 2 * $order + 1) {
+            preg_match("#(.)(.{{$order}})(.{{$order}})#s", $str, $matches);
+            [, $w, $x, $y] = $matches;
+            if ($w != "\4") {
+                throw new UnexpectedValueException('The first byte of an uncompressed point should be 04 - not ' . Strings::bin2hex($val));
+            }
+            $point = [
+                $curve->convertInteger(new BigInteger($x, 256)),
+                $curve->convertInteger(new BigInteger($y, 256)),
+            ];
+
+            if (!$curve->verifyPoint($point)) {
+                throw new RuntimeException('Unable to verify that point exists on curve');
+            }
+
+            return $point;
+        }
+
+        throw new UnexpectedValueException('The string representation of the points is not of an appropriate length');
+    }
+
+    /**
+     * Encode Parameters
+     *
+     * @param bool $returnArray optional
+     * @param array $options optional
+     * @return string|false
+     * @todo Maybe at some point this could be moved to __toString() for each of the curves?
+     */
+    private static function encodeParameters(BaseCurve $curve, bool $returnArray = false, array $options = [])
+    {
+        $useNamedCurves = $options['namedCurve'] ?? self::$useNamedCurves;
+
+        $reflect = new \ReflectionClass($curve);
+        $name = $reflect->getShortName();
+        if ($useNamedCurves) {
+            if (isset(self::$curveOIDs[$name])) {
+                if ($reflect->isFinal()) {
+                    $reflect = $reflect->getParentClass();
+                    $name = $reflect->getShortName();
+                }
+                return $returnArray ?
+                    ['namedCurve' => $name] :
+                    ASN1::encodeDER(['namedCurve' => $name], Maps\ECParameters::MAP);
+            }
+            foreach (new \DirectoryIterator(__DIR__ . '/../../Curves/') as $file) {
+                if ($file->getExtension() != 'php') {
+                    continue;
+                }
+                $testName = $file->getBasename('.php');
+                $class = 'phpseclib3\Crypt\EC\Curves\\' . $testName;
+                $reflect = new \ReflectionClass($class);
+                if ($reflect->isFinal()) {
+                    continue;
+                }
+                $candidate = new $class();
+                switch ($name) {
+                    case 'Prime':
+                        if (!$candidate instanceof PrimeCurve) {
+                            break;
+                        }
+                        if (!$candidate->getModulo()->equals($curve->getModulo())) {
+                            break;
+                        }
+                        if ($candidate->getA()->toBytes() != $curve->getA()->toBytes()) {
+                            break;
+                        }
+                        if ($candidate->getB()->toBytes() != $curve->getB()->toBytes()) {
+                            break;
+                        }
+
+                        [$candidateX, $candidateY] = $candidate->getBasePoint();
+                        [$curveX, $curveY] = $curve->getBasePoint();
+                        if ($candidateX->toBytes() != $curveX->toBytes()) {
+                            break;
+                        }
+                        if ($candidateY->toBytes() != $curveY->toBytes()) {
+                            break;
+                        }
+
+                        return $returnArray ?
+                            ['namedCurve' => $testName] :
+                            ASN1::encodeDER(['namedCurve' => $testName], Maps\ECParameters::MAP);
+                    case 'Binary':
+                        if (!$candidate instanceof BinaryCurve) {
+                            break;
+                        }
+                        if ($candidate->getModulo() != $curve->getModulo()) {
+                            break;
+                        }
+                        if ($candidate->getA()->toBytes() != $curve->getA()->toBytes()) {
+                            break;
+                        }
+                        if ($candidate->getB()->toBytes() != $curve->getB()->toBytes()) {
+                            break;
+                        }
+
+                        [$candidateX, $candidateY] = $candidate->getBasePoint();
+                        [$curveX, $curveY] = $curve->getBasePoint();
+                        if ($candidateX->toBytes() != $curveX->toBytes()) {
+                            break;
+                        }
+                        if ($candidateY->toBytes() != $curveY->toBytes()) {
+                            break;
+                        }
+
+                        return $returnArray ?
+                            ['namedCurve' => $testName] :
+                            ASN1::encodeDER(['namedCurve' => $testName], Maps\ECParameters::MAP);
+                }
+            }
+        }
+
+        $order = $curve->getOrder();
+        // we could try to calculate the order thusly:
+        // https://crypto.stackexchange.com/a/27914/4520
+        // https://en.wikipedia.org/wiki/Schoof%E2%80%93Elkies%E2%80%93Atkin_algorithm
+        if (!$order) {
+            throw new RuntimeException('Specified Curves need the order to be specified');
+        }
+        $point = $curve->getBasePoint();
+        $x = $point[0]->toBytes();
+        $y = $point[1]->toBytes();
+
+        if ($curve instanceof PrimeCurve) {
+            /*
+             * valid versions are:
+             *
+             * ecdpVer1:
+             *   - neither the curve or the base point are generated verifiably randomly.
+             * ecdpVer2:
+             *   - curve and base point are generated verifiably at random and curve.seed is present
+             * ecdpVer3:
+             *   - base point is generated verifiably at random but curve is not. curve.seed is present
+             */
+            // other (optional) parameters can be calculated using the methods discused at
+            // https://crypto.stackexchange.com/q/28947/4520
+            $data = [
+                'version' => 'ecdpVer1',
+                'fieldID' => [
+                    'fieldType' => 'prime-field',
+                    'parameters' => $curve->getModulo(),
+                ],
+                'curve' => [
+                    'a' => $curve->getA()->toBytes(),
+                    'b' => $curve->getB()->toBytes(),
+                ],
+                'base' => "\4" . $x . $y,
+                'order' => $order,
+            ];
+
+            return $returnArray ?
+                ['specifiedCurve' => $data] :
+                ASN1::encodeDER(['specifiedCurve' => $data], Maps\ECParameters::MAP);
+        }
+        if ($curve instanceof BinaryCurve) {
+            $modulo = $curve->getModulo();
+            $basis = count($modulo);
+            $m = array_shift($modulo);
+            array_pop($modulo); // the last parameter should always be 0
+            //rsort($modulo);
+            switch ($basis) {
+                case 3:
+                    $basis = 'tpBasis';
+                    $modulo = new BigInteger($modulo[0]);
+                    break;
+                case 5:
+                    $basis = 'ppBasis';
+                    // these should be in strictly ascending order (hence the commented out rsort above)
+                    $modulo = [
+                        'k1' => new BigInteger($modulo[2]),
+                        'k2' => new BigInteger($modulo[1]),
+                        'k3' => new BigInteger($modulo[0]),
+                    ];
+                    $modulo = ASN1::encodeDER($modulo, Maps\Pentanomial::MAP);
+                    $modulo = new ASN1\Element($modulo);
+            }
+            $params = ASN1::encodeDER([
+                'm' => new BigInteger($m),
+                'basis' => $basis,
+                'parameters' => $modulo,
+            ], Maps\Characteristic_two::MAP);
+            $params = new ASN1\Element($params);
+            $a = ltrim($curve->getA()->toBytes(), "\0");
+            if (!strlen($a)) {
+                $a = "\0";
+            }
+            $b = ltrim($curve->getB()->toBytes(), "\0");
+            if (!strlen($b)) {
+                $b = "\0";
+            }
+            $data = [
+                'version' => 'ecdpVer1',
+                'fieldID' => [
+                    'fieldType' => 'characteristic-two-field',
+                    'parameters' => $params,
+                ],
+                'curve' => [
+                    'a' => $a,
+                    'b' => $b,
+                ],
+                'base' => "\4" . $x . $y,
+                'order' => $order,
+            ];
+
+            return $returnArray ?
+                ['specifiedCurve' => $data] :
+                ASN1::encodeDER(['specifiedCurve' => $data], Maps\ECParameters::MAP);
+        }
+
+        throw new UnsupportedCurveException('Curve cannot be serialized');
+    }
+
+    /**
+     * Use Specified Curve
+     *
+     * A specified curve has all the coefficients, the base points, etc, explicitely included.
+     * A specified curve is a more verbose way of representing a curve
+     */
+    public static function useSpecifiedCurve(): void
+    {
+        self::$useNamedCurves = false;
+    }
+
+    /**
+     * Use Named Curve
+     *
+     * A named curve does not include any parameters. It is up to the EC parameters to
+     * know what the coefficients, the base points, etc, are from the name of the curve.
+     * A named curve is a more concise way of representing a curve
+     */
+    public static function useNamedCurve(): void
+    {
+        self::$useNamedCurves = true;
+    }
+}
diff --git a/phpseclib/Crypt/EC/Formats/Keys/JWK.php b/phpseclib/Crypt/EC/Formats/Keys/JWK.php
new file mode 100644
index 000000000..601aee64d
--- /dev/null
+++ b/phpseclib/Crypt/EC/Formats/Keys/JWK.php
@@ -0,0 +1,184 @@
+<?php
+
+/**
+ * JSON Web Key (RFC7517 / RFC8037) Formatted EC Handler
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Formats\Keys;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Common\Formats\Keys\JWK as Progenitor;
+use phpseclib3\Crypt\EC\BaseCurves\Base as BaseCurve;
+use phpseclib3\Crypt\EC\BaseCurves\TwistedEdwards as TwistedEdwardsCurve;
+use phpseclib3\Crypt\EC\Curves\Ed25519;
+use phpseclib3\Crypt\EC\Curves\secp256k1;
+use phpseclib3\Crypt\EC\Curves\secp256r1;
+use phpseclib3\Crypt\EC\Curves\secp384r1;
+use phpseclib3\Crypt\EC\Curves\secp521r1;
+use phpseclib3\Exception\UnsupportedCurveException;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * JWK Formatted EC Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class JWK extends Progenitor
+{
+    use Common;
+
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param string|array $key
+     */
+    public static function load($key, ?string $password = null): array
+    {
+        $key = parent::loadHelper($key);
+
+        switch ($key->kty) {
+            case 'EC':
+                switch ($key->crv) {
+                    case 'P-256':
+                    case 'P-384':
+                    case 'P-521':
+                    case 'secp256k1':
+                        break;
+                    default:
+                        throw new UnsupportedCurveException('Only P-256, P-384, P-521 and secp256k1 curves are accepted (' . $key->crv . ' provided)');
+                }
+                break;
+            case 'OKP':
+                switch ($key->crv) {
+                    case 'Ed25519':
+                    case 'Ed448':
+                        break;
+                    default:
+                        throw new UnsupportedCurveException('Only Ed25519 and Ed448 curves are accepted (' . $key->crv . ' provided)');
+                }
+                break;
+            default:
+                throw new \Exception('Only EC and OKP JWK keys are supported');
+        }
+
+        $curve = '\phpseclib3\Crypt\EC\Curves\\' . str_replace('P-', 'nistp', $key->crv);
+        $curve = new $curve();
+
+        if ($curve instanceof TwistedEdwardsCurve) {
+            $QA = self::extractPoint(Strings::base64url_decode($key->x), $curve);
+            if (!isset($key->d)) {
+                return compact('curve', 'QA');
+            }
+            $arr = $curve->extractSecret(Strings::base64url_decode($key->d));
+            return compact('curve', 'QA') + $arr;
+        }
+
+        $QA = [
+            $curve->convertInteger(new BigInteger(Strings::base64url_decode($key->x), 256)),
+            $curve->convertInteger(new BigInteger(Strings::base64url_decode($key->y), 256)),
+        ];
+
+        if (!$curve->verifyPoint($QA)) {
+            throw new \RuntimeException('Unable to verify that point exists on curve');
+        }
+
+        if (!isset($key->d)) {
+            return compact('curve', 'QA');
+        }
+
+        $dA = new BigInteger(Strings::base64url_decode($key->d), 256);
+
+        $curve->rangeCheck($dA);
+
+        return compact('curve', 'dA', 'QA');
+    }
+
+    /**
+     * Returns the alias that corresponds to a curve
+     *
+     * @return string
+     */
+    private static function getAlias(BaseCurve $curve)
+    {
+        switch (true) {
+            case $curve instanceof secp256r1:
+                return 'P-256';
+            case $curve instanceof secp384r1:
+                return 'P-384';
+            case $curve instanceof secp521r1:
+                return 'P-521';
+            case $curve instanceof secp256k1:
+                return 'secp256k1';
+        }
+
+        $reflect = new \ReflectionClass($curve);
+        $curveName = $reflect->isFinal() ?
+            $reflect->getParentClass()->getShortName() :
+            $reflect->getShortName();
+        throw new UnsupportedCurveException("$curveName is not a supported curve");
+    }
+
+    /**
+     * Return the array superstructure for an EC public key
+     *
+     * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
+     */
+    private static function savePublicKeyHelper(BaseCurve $curve, array $publicKey): array
+    {
+        if ($curve instanceof TwistedEdwardsCurve) {
+            return [
+                'kty' => 'OKP',
+                'crv' => $curve instanceof Ed25519 ? 'Ed25519' : 'Ed448',
+                'x' => Strings::base64url_encode($curve->encodePoint($publicKey)),
+            ];
+        }
+
+        return [
+            'kty' => 'EC',
+            'crv' => self::getAlias($curve),
+            'x' => Strings::base64url_encode($publicKey[0]->toBytes()),
+            'y' => Strings::base64url_encode($publicKey[1]->toBytes()),
+        ];
+    }
+
+    /**
+     * Convert an EC public key to the appropriate format
+     *
+     * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
+     */
+    public static function savePublicKey(BaseCurve $curve, array $publicKey, array $options = []): string
+    {
+        $key = self::savePublicKeyHelper($curve, $publicKey);
+
+        return self::wrapKey($key, $options);
+    }
+
+    /**
+     * Convert a private key to the appropriate format.
+     *
+     * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
+     */
+    public static function savePrivateKey(
+        BigInteger $privateKey,
+        BaseCurve $curve,
+        array $publicKey,
+        ?string $secret = null,
+        ?string $password = null,
+        array $options = []
+    ): string {
+        $key = self::savePublicKeyHelper($curve, $publicKey);
+        $key['d'] = $curve instanceof TwistedEdwardsCurve ? $secret : $privateKey->toBytes();
+        $key['d'] = Strings::base64url_encode($key['d']);
+
+        return self::wrapKey($key, $options);
+    }
+}
diff --git a/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPrivate.php b/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPrivate.php
new file mode 100644
index 000000000..dedaa25e3
--- /dev/null
+++ b/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPrivate.php
@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * Montgomery Private Key Handler
+ *
+ * "Naked" Curve25519 private keys can pretty much be any sequence of random 32x bytes so unless
+ * we have a "hidden" key handler pretty much every 32 byte string will be loaded as a curve25519
+ * private key even if it probably isn't one by PublicKeyLoader.
+ *
+ * "Naked" Curve25519 public keys also a string of 32 bytes so distinguishing between a "naked"
+ * curve25519 private key and a public key is nigh impossible, hence separate plugins for each
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Formats\Keys;
+
+use phpseclib3\Crypt\EC\BaseCurves\Montgomery as MontgomeryCurve;
+use phpseclib3\Crypt\EC\Curves\Curve25519;
+use phpseclib3\Crypt\EC\Curves\Curve448;
+use phpseclib3\Exception\LengthException;
+use phpseclib3\Exception\UnsupportedFormatException;
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Math\Common\FiniteField\Integer;
+
+/**
+ * Montgomery Curve Private Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class MontgomeryPrivate
+{
+    /**
+     * Is invisible flag
+     */
+    public const IS_INVISIBLE = true;
+
+    /**
+     * Break a public or private key down into its constituent components
+     */
+    public static function load(string $key, ?string $password = null): array
+    {
+        switch (strlen($key)) {
+            case 32:
+                $curve = new Curve25519();
+                break;
+            case 56:
+                $curve = new Curve448();
+                break;
+            default:
+                throw new LengthException('The only supported lengths are 32 and 56');
+        }
+
+        $components = ['curve' => $curve];
+        $components['dA'] = new BigInteger($key, 256);
+        $curve->rangeCheck($components['dA']);
+        // note that EC::getEncodedCoordinates does some additional "magic" (it does strrev on the result)
+        $components['QA'] = $components['curve']->multiplyPoint($components['curve']->getBasePoint(), $components['dA']);
+
+        return $components;
+    }
+
+    /**
+     * Convert an EC public key to the appropriate format
+     *
+     * @param Integer[] $publicKey
+     */
+    public static function savePublicKey(MontgomeryCurve $curve, array $publicKey): string
+    {
+        return strrev($publicKey[0]->toBytes());
+    }
+
+    /**
+     * Convert a private key to the appropriate format.
+     *
+     * @param Integer[] $publicKey
+     */
+    public static function savePrivateKey(BigInteger $privateKey, MontgomeryCurve $curve, array $publicKey, ?string $password = null): string
+    {
+        if (!empty($password) && is_string($password)) {
+            throw new UnsupportedFormatException('MontgomeryPrivate private keys do not support encryption');
+        }
+
+        return $privateKey->toBytes();
+    }
+}
diff --git a/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPublic.php b/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPublic.php
new file mode 100644
index 000000000..5d2afd1a3
--- /dev/null
+++ b/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPublic.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * Montgomery Public Key Handler
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Formats\Keys;
+
+use phpseclib3\Crypt\EC\BaseCurves\Montgomery as MontgomeryCurve;
+use phpseclib3\Crypt\EC\Curves\Curve25519;
+use phpseclib3\Crypt\EC\Curves\Curve448;
+use phpseclib3\Exception\LengthException;
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Math\Common\FiniteField\Integer;
+
+/**
+ * Montgomery Public Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class MontgomeryPublic
+{
+    /**
+     * Is invisible flag
+     */
+    public const IS_INVISIBLE = true;
+
+    /**
+     * Break a public or private key down into its constituent components
+     */
+    public static function load(string $key, ?string $password = null): array
+    {
+        switch (strlen($key)) {
+            case 32:
+                $curve = new Curve25519();
+                break;
+            case 56:
+                $curve = new Curve448();
+                break;
+            default:
+                throw new LengthException('The only supported lengths are 32 and 56');
+        }
+
+        $components = ['curve' => $curve];
+        $components['QA'] = [$components['curve']->convertInteger(new BigInteger(strrev($key), 256))];
+
+        return $components;
+    }
+
+    /**
+     * Convert an EC public key to the appropriate format
+     *
+     * @param Integer[] $publicKey
+     */
+    public static function savePublicKey(MontgomeryCurve $curve, array $publicKey): string
+    {
+        return strrev($publicKey[0]->toBytes());
+    }
+}
diff --git a/phpseclib/Crypt/EC/Formats/Keys/OpenSSH.php b/phpseclib/Crypt/EC/Formats/Keys/OpenSSH.php
new file mode 100644
index 000000000..4de4e5b34
--- /dev/null
+++ b/phpseclib/Crypt/EC/Formats/Keys/OpenSSH.php
@@ -0,0 +1,208 @@
+<?php
+
+/**
+ * OpenSSH Formatted EC Key Handler
+ *
+ * PHP version 5
+ *
+ * Place in $HOME/.ssh/authorized_keys
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Formats\Keys;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Common\Formats\Keys\OpenSSH as Progenitor;
+use phpseclib3\Crypt\EC\BaseCurves\Base as BaseCurve;
+use phpseclib3\Crypt\EC\Curves\Ed25519;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Exception\UnsupportedCurveException;
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Math\Common\FiniteField\Integer;
+
+/**
+ * OpenSSH Formatted EC Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class OpenSSH extends Progenitor
+{
+    use Common;
+
+    /**
+     * Supported Key Types
+     *
+     * @var array
+     */
+    protected static $types = [
+        'ecdsa-sha2-nistp256',
+        'ecdsa-sha2-nistp384',
+        'ecdsa-sha2-nistp521',
+        'ssh-ed25519',
+    ];
+
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param string|array $key
+     */
+    public static function load($key, ?string $password = null): array
+    {
+        $parsed = parent::load($key, $password);
+
+        if (isset($parsed['paddedKey'])) {
+            $paddedKey = $parsed['paddedKey'];
+            [$type] = Strings::unpackSSH2('s', $paddedKey);
+            if ($type != $parsed['type']) {
+                throw new RuntimeException("The public and private keys are not of the same type ($type vs $parsed[type])");
+            }
+            if ($type == 'ssh-ed25519') {
+                [, $key, $comment] = Strings::unpackSSH2('sss', $paddedKey);
+                $key = libsodium::load($key);
+                $key['comment'] = $comment;
+                return $key;
+            }
+            [$curveName, $publicKey, $privateKey, $comment] = Strings::unpackSSH2('ssis', $paddedKey);
+            $curve = self::loadCurveByParam(['namedCurve' => $curveName]);
+            $curve->rangeCheck($privateKey);
+            return [
+                'curve' => $curve,
+                'dA' => $privateKey,
+                'QA' => self::extractPoint("\0$publicKey", $curve),
+                'comment' => $comment,
+            ];
+        }
+
+        if ($parsed['type'] == 'ssh-ed25519') {
+            if (Strings::shift($parsed['publicKey'], 4) != "\0\0\0\x20") {
+                throw new RuntimeException('Length of ssh-ed25519 key should be 32');
+            }
+
+            $curve = new Ed25519();
+            $qa = self::extractPoint($parsed['publicKey'], $curve);
+        } else {
+            [$curveName, $publicKey] = Strings::unpackSSH2('ss', $parsed['publicKey']);
+            $curveName = '\phpseclib3\Crypt\EC\Curves\\' . $curveName;
+            $curve = new $curveName();
+
+            $qa = self::extractPoint("\0" . $publicKey, $curve);
+        }
+
+        return [
+            'curve' => $curve,
+            'QA' => $qa,
+            'comment' => $parsed['comment'],
+        ];
+    }
+
+    /**
+     * Returns the alias that corresponds to a curve
+     */
+    private static function getAlias(BaseCurve $curve): string
+    {
+        self::initialize_static_variables();
+
+        $reflect = new \ReflectionClass($curve);
+        $name = $reflect->getShortName();
+
+        $oid = self::$curveOIDs[$name];
+        $aliases = array_filter(self::$curveOIDs, fn ($v) => $v == $oid);
+        $aliases = array_keys($aliases);
+
+        for ($i = 0; $i < count($aliases); $i++) {
+            if (in_array('ecdsa-sha2-' . $aliases[$i], self::$types)) {
+                $alias = $aliases[$i];
+                break;
+            }
+        }
+
+        if (!isset($alias)) {
+            throw new UnsupportedCurveException($name . ' is not a curve that the OpenSSH plugin supports');
+        }
+
+        return $alias;
+    }
+
+    /**
+     * Convert an EC public key to the appropriate format
+     *
+     * @param Integer[] $publicKey
+     * @param array $options optional
+     */
+    public static function savePublicKey(BaseCurve $curve, array $publicKey, array $options = []): string
+    {
+        $comment = $options['comment'] ?? self::$comment;
+
+        if ($curve instanceof Ed25519) {
+            $key = Strings::packSSH2('ss', 'ssh-ed25519', $curve->encodePoint($publicKey));
+
+            if ($options['binary'] ?? self::$binary) {
+                return $key;
+            }
+
+            $key = 'ssh-ed25519 ' . base64_encode($key) . ' ' . $comment;
+            return $key;
+        }
+
+        $alias = self::getAlias($curve);
+
+        $points = "\4" . $publicKey[0]->toBytes() . $publicKey[1]->toBytes();
+        $key = Strings::packSSH2('sss', 'ecdsa-sha2-' . $alias, $alias, $points);
+
+        if ($options['binary'] ?? self::$binary) {
+            return $key;
+        }
+
+        $key = 'ecdsa-sha2-' . $alias . ' ' . base64_encode($key) . ' ' . $comment;
+
+        return $key;
+    }
+
+    /**
+     * Convert a private key to the appropriate format.
+     *
+     * @param Ed25519 $curve
+     * @param Integer[] $publicKey
+     * @param string|false $password
+     * @param array $options optional
+     */
+    public static function savePrivateKey(
+        BigInteger $privateKey,
+        BaseCurve $curve,
+        array $publicKey,
+        ?string $secret = null,
+        ?string $password = null,
+        array $options = []
+    ): string {
+        if ($curve instanceof Ed25519) {
+            if (!isset($secret)) {
+                throw new RuntimeException('Private Key does not have a secret set');
+            }
+            if (strlen($secret) != 32) {
+                throw new RuntimeException('Private Key secret is not of the correct length');
+            }
+
+            $pubKey = $curve->encodePoint($publicKey);
+
+            $publicKey = Strings::packSSH2('ss', 'ssh-ed25519', $pubKey);
+            $privateKey = Strings::packSSH2('sss', 'ssh-ed25519', $pubKey, $secret . $pubKey);
+
+            return self::wrapPrivateKey($publicKey, $privateKey, $password, $options);
+        }
+
+        $alias = self::getAlias($curve);
+
+        $points = "\4" . $publicKey[0]->toBytes() . $publicKey[1]->toBytes();
+        $publicKey = self::savePublicKey($curve, $publicKey, ['binary' => true]);
+
+        $privateKey = Strings::packSSH2('sssi', 'ecdsa-sha2-' . $alias, $alias, $points, $privateKey);
+
+        return self::wrapPrivateKey($publicKey, $privateKey, $password, $options);
+    }
+}
diff --git a/phpseclib/Crypt/EC/Formats/Keys/PKCS1.php b/phpseclib/Crypt/EC/Formats/Keys/PKCS1.php
new file mode 100644
index 000000000..eeb91d8aa
--- /dev/null
+++ b/phpseclib/Crypt/EC/Formats/Keys/PKCS1.php
@@ -0,0 +1,189 @@
+<?php
+
+/**
+ * "PKCS1" (RFC5915) Formatted EC Key Handler
+ *
+ * PHP version 5
+ *
+ * Used by File/X509.php
+ *
+ * Processes keys with the following headers:
+ *
+ * -----BEGIN EC PRIVATE KEY-----
+ * -----BEGIN EC PARAMETERS-----
+ *
+ * Technically, PKCS1 is for RSA keys, only, but we're using PKCS1 to describe
+ * DSA, whose format isn't really formally described anywhere, so might as well
+ * use it to describe this, too. PKCS1 is easier to remember than RFC5915, after
+ * all. I suppose this could also be named IETF but idk
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Formats\Keys;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Common\Formats\Keys\PKCS1 as Progenitor;
+use phpseclib3\Crypt\EC\BaseCurves\Base as BaseCurve;
+use phpseclib3\Crypt\EC\BaseCurves\Montgomery as MontgomeryCurve;
+use phpseclib3\Crypt\EC\BaseCurves\TwistedEdwards as TwistedEdwardsCurve;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\Exception\UnsupportedCurveException;
+use phpseclib3\File\ASN1;
+use phpseclib3\File\ASN1\Maps;
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Math\Common\FiniteField\Integer;
+
+/**
+ * "PKCS1" (RFC5915) Formatted EC Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PKCS1 extends Progenitor
+{
+    use Common;
+
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param string|array $key
+     */
+    public static function load($key, ?string $password = null): array
+    {
+        self::initialize_static_variables();
+
+        if (!Strings::is_stringable($key)) {
+            throw new UnexpectedValueException('Key should be a string - not a ' . gettype($key));
+        }
+
+        if (strpos($key, 'BEGIN EC PARAMETERS') && strpos($key, 'BEGIN EC PRIVATE KEY')) {
+            $components = [];
+
+            preg_match('#-*BEGIN EC PRIVATE KEY-*[^-]*-*END EC PRIVATE KEY-*#s', $key, $matches);
+            $decoded = parent::load($matches[0], $password);
+            $decoded = ASN1::decodeBER($decoded);
+            if (!$decoded) {
+                throw new RuntimeException('Unable to decode BER');
+            }
+
+            $ecPrivate = ASN1::asn1map($decoded[0], Maps\ECPrivateKey::MAP);
+            if (!is_array($ecPrivate)) {
+                throw new RuntimeException('Unable to perform ASN1 mapping');
+            }
+
+            if (isset($ecPrivate['parameters'])) {
+                $components['curve'] = self::loadCurveByParam($ecPrivate['parameters']);
+            }
+
+            preg_match('#-*BEGIN EC PARAMETERS-*[^-]*-*END EC PARAMETERS-*#s', $key, $matches);
+            $decoded = parent::load($matches[0], '');
+            $decoded = ASN1::decodeBER($decoded);
+            if (!$decoded) {
+                throw new RuntimeException('Unable to decode BER');
+            }
+            $ecParams = ASN1::asn1map($decoded[0], Maps\ECParameters::MAP);
+            if (!is_array($ecParams)) {
+                throw new RuntimeException('Unable to perform ASN1 mapping');
+            }
+            $ecParams = self::loadCurveByParam($ecParams);
+
+            // comparing $ecParams and $components['curve'] directly won't work because they'll have different Math\Common\FiniteField classes
+            // even if the modulo is the same
+            if (isset($components['curve']) && self::encodeParameters($ecParams, false, []) != self::encodeParameters($components['curve'], false, [])) {
+                throw new RuntimeException('EC PARAMETERS does not correspond to EC PRIVATE KEY');
+            }
+
+            if (!isset($components['curve'])) {
+                $components['curve'] = $ecParams;
+            }
+
+            $components['dA'] = new BigInteger($ecPrivate['privateKey'], 256);
+            $components['curve']->rangeCheck($components['dA']);
+            $components['QA'] = isset($ecPrivate['publicKey']) ?
+                self::extractPoint($ecPrivate['publicKey'], $components['curve']) :
+                $components['curve']->multiplyPoint($components['curve']->getBasePoint(), $components['dA']);
+
+            return $components;
+        }
+
+        $key = parent::load($key, $password);
+
+        $decoded = ASN1::decodeBER($key);
+        if (!$decoded) {
+            throw new RuntimeException('Unable to decode BER');
+        }
+
+        $key = ASN1::asn1map($decoded[0], Maps\ECParameters::MAP);
+        if (is_array($key)) {
+            return ['curve' => self::loadCurveByParam($key)];
+        }
+
+        $key = ASN1::asn1map($decoded[0], Maps\ECPrivateKey::MAP);
+        if (!is_array($key)) {
+            throw new RuntimeException('Unable to perform ASN1 mapping');
+        }
+        if (!isset($key['parameters'])) {
+            throw new RuntimeException('Key cannot be loaded without parameters');
+        }
+
+        $components = [];
+        $components['curve'] = self::loadCurveByParam($key['parameters']);
+        $components['dA'] = new BigInteger($key['privateKey'], 256);
+        $components['QA'] = isset($ecPrivate['publicKey']) ?
+            self::extractPoint($ecPrivate['publicKey'], $components['curve']) :
+            $components['curve']->multiplyPoint($components['curve']->getBasePoint(), $components['dA']);
+
+        return $components;
+    }
+
+    /**
+     * Convert EC parameters to the appropriate format
+     */
+    public static function saveParameters(BaseCurve $curve, array $options = []): string
+    {
+        self::initialize_static_variables();
+
+        if ($curve instanceof TwistedEdwardsCurve || $curve instanceof MontgomeryCurve) {
+            throw new UnsupportedCurveException('TwistedEdwards and Montgomery Curves are not supported');
+        }
+
+        $key = self::encodeParameters($curve, false, $options);
+
+        return "-----BEGIN EC PARAMETERS-----\r\n" .
+               chunk_split(Strings::base64_encode($key), 64) .
+               "-----END EC PARAMETERS-----\r\n";
+    }
+
+    /**
+     * Convert a private key to the appropriate format.
+     *
+     * @param Integer[] $publicKey
+     */
+    public static function savePrivateKey(BigInteger $privateKey, BaseCurve $curve, array $publicKey, ?string $secret = null, ?string $password = null, array $options = []): string
+    {
+        self::initialize_static_variables();
+
+        if ($curve instanceof TwistedEdwardsCurve  || $curve instanceof MontgomeryCurve) {
+            throw new UnsupportedCurveException('TwistedEdwards Curves are not supported');
+        }
+
+        $publicKey = "\4" . $publicKey[0]->toBytes() . $publicKey[1]->toBytes();
+
+        $key = [
+            'version' => 'ecPrivkeyVer1',
+            'privateKey' => $privateKey->toBytes(),
+            'parameters' => new ASN1\Element(self::encodeParameters($curve)),
+            'publicKey' => "\0" . $publicKey,
+        ];
+
+        $key = ASN1::encodeDER($key, Maps\ECPrivateKey::MAP);
+
+        return self::wrapPrivateKey($key, 'EC', $password, $options);
+    }
+}
diff --git a/phpseclib/Crypt/EC/Formats/Keys/PKCS8.php b/phpseclib/Crypt/EC/Formats/Keys/PKCS8.php
new file mode 100644
index 000000000..a9fb924b4
--- /dev/null
+++ b/phpseclib/Crypt/EC/Formats/Keys/PKCS8.php
@@ -0,0 +1,229 @@
+<?php
+
+/**
+ * PKCS#8 Formatted EC Key Handler
+ *
+ * PHP version 5
+ *
+ * Processes keys with the following headers:
+ *
+ * -----BEGIN ENCRYPTED PRIVATE KEY-----
+ * -----BEGIN PRIVATE KEY-----
+ * -----BEGIN PUBLIC KEY-----
+ *
+ * Analogous to ssh-keygen's pkcs8 format (as specified by -m). Although PKCS8
+ * is specific to private keys it's basically creating a DER-encoded wrapper
+ * for keys. This just extends that same concept to public keys (much like ssh-keygen)
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Formats\Keys;
+
+use phpseclib3\Crypt\Common\Formats\Keys\PKCS8 as Progenitor;
+use phpseclib3\Crypt\EC\BaseCurves\Base as BaseCurve;
+use phpseclib3\Crypt\EC\BaseCurves\Montgomery as MontgomeryCurve;
+use phpseclib3\Crypt\EC\BaseCurves\TwistedEdwards as TwistedEdwardsCurve;
+use phpseclib3\Crypt\EC\Curves\Ed25519;
+use phpseclib3\Crypt\EC\Curves\Ed448;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Exception\UnsupportedCurveException;
+use phpseclib3\File\ASN1;
+use phpseclib3\File\ASN1\Maps;
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Math\Common\FiniteField\Integer;
+
+/**
+ * PKCS#8 Formatted EC Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PKCS8 extends Progenitor
+{
+    use Common;
+
+    /**
+     * OID Name
+     *
+     * @var array
+     */
+    public const OID_NAME = ['id-ecPublicKey', 'id-Ed25519', 'id-Ed448'];
+
+    /**
+     * OID Value
+     *
+     * @var string
+     */
+    public const OID_VALUE = ['1.2.840.10045.2.1', '1.3.101.112', '1.3.101.113'];
+
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param string|array $key
+     */
+    public static function load($key, ?string $password = null): array
+    {
+        // initialize_static_variables() is defined in both the trait and the parent class
+        // when it's defined in two places it's the traits one that's called
+        // the parent one is needed, as well, but the parent one is called by other methods
+        // in the parent class as needed and in the context of the parent it's the parent
+        // one that's called
+        self::initialize_static_variables();
+
+        $key = parent::load($key, $password);
+
+        $type = isset($key['privateKey']) ? 'privateKey' : 'publicKey';
+
+        switch ($key[$type . 'Algorithm']['algorithm']) {
+            case 'id-Ed25519':
+            case 'id-Ed448':
+                return self::loadEdDSA($key);
+        }
+
+        $decoded = ASN1::decodeBER($key[$type . 'Algorithm']['parameters']->element);
+        if (!$decoded) {
+            throw new RuntimeException('Unable to decode BER');
+        }
+        $params = ASN1::asn1map($decoded[0], Maps\ECParameters::MAP);
+        if (!$params) {
+            throw new RuntimeException('Unable to decode the parameters using Maps\ECParameters');
+        }
+
+        $components = [];
+        $components['curve'] = self::loadCurveByParam($params);
+
+        if ($type == 'publicKey') {
+            $components['QA'] = self::extractPoint("\0" . $key['publicKey'], $components['curve']);
+
+            return $components;
+        }
+
+        $decoded = ASN1::decodeBER($key['privateKey']);
+        if (!$decoded) {
+            throw new RuntimeException('Unable to decode BER');
+        }
+        $key = ASN1::asn1map($decoded[0], Maps\ECPrivateKey::MAP);
+        if (isset($key['parameters']) && $params != $key['parameters']) {
+            throw new RuntimeException('The PKCS8 parameter field does not match the private key parameter field');
+        }
+
+        $components['dA'] = new BigInteger($key['privateKey'], 256);
+        $components['curve']->rangeCheck($components['dA']);
+        $components['QA'] = isset($key['publicKey']) ?
+            self::extractPoint($key['publicKey'], $components['curve']) :
+            $components['curve']->multiplyPoint($components['curve']->getBasePoint(), $components['dA']);
+
+        return $components;
+    }
+
+    /**
+     * Break a public or private EdDSA key down into its constituent components
+     */
+    private static function loadEdDSA(array $key): array
+    {
+        $components = [];
+
+        if (isset($key['privateKey'])) {
+            $components['curve'] = $key['privateKeyAlgorithm']['algorithm'] == 'id-Ed25519' ? new Ed25519() : new Ed448();
+            $expected = chr(ASN1::TYPE_OCTET_STRING) . ASN1::encodeLength($components['curve']::SIZE);
+            if (substr($key['privateKey'], 0, 2) != $expected) {
+                throw new RuntimeException(
+                    'The first two bytes of the ' .
+                    $key['privateKeyAlgorithm']['algorithm'] .
+                    ' private key field should be 0x' . bin2hex($expected)
+                );
+            }
+            $arr = $components['curve']->extractSecret(substr($key['privateKey'], 2));
+            $components['dA'] = $arr['dA'];
+            $components['secret'] = $arr['secret'];
+        }
+
+        if (isset($key['publicKey'])) {
+            if (!isset($components['curve'])) {
+                $components['curve'] = $key['publicKeyAlgorithm']['algorithm'] == 'id-Ed25519' ? new Ed25519() : new Ed448();
+            }
+
+            $components['QA'] = self::extractPoint($key['publicKey'], $components['curve']);
+        }
+
+        if (isset($key['privateKey']) && !isset($components['QA'])) {
+            $components['QA'] = $components['curve']->multiplyPoint($components['curve']->getBasePoint(), $components['dA']);
+        }
+
+        return $components;
+    }
+
+    /**
+     * Convert an EC public key to the appropriate format
+     *
+     * @param Integer[] $publicKey
+     * @param array $options optional
+     */
+    public static function savePublicKey(BaseCurve $curve, array $publicKey, array $options = []): string
+    {
+        self::initialize_static_variables();
+
+        if ($curve instanceof MontgomeryCurve) {
+            throw new UnsupportedCurveException('Montgomery Curves are not supported');
+        }
+
+        if ($curve instanceof TwistedEdwardsCurve) {
+            return self::wrapPublicKey(
+                $curve->encodePoint($publicKey),
+                null,
+                $curve instanceof Ed25519 ? 'id-Ed25519' : 'id-Ed448',
+                $options
+            );
+        }
+
+        $params = new ASN1\Element(self::encodeParameters($curve, false, $options));
+
+        $key = "\4" . $publicKey[0]->toBytes() . $publicKey[1]->toBytes();
+
+        return self::wrapPublicKey($key, $params, 'id-ecPublicKey', $options);
+    }
+
+    /**
+     * Convert a private key to the appropriate format.
+     *
+     * @param Integer[] $publicKey
+     */
+    public static function savePrivateKey(BigInteger $privateKey, BaseCurve $curve, array $publicKey, ?string $secret = null, ?string $password = null, array $options = []): string
+    {
+        self::initialize_static_variables();
+
+        if ($curve instanceof MontgomeryCurve) {
+            throw new UnsupportedCurveException('Montgomery Curves are not supported');
+        }
+
+        if ($curve instanceof TwistedEdwardsCurve) {
+            return self::wrapPrivateKey(
+                chr(ASN1::TYPE_OCTET_STRING) . ASN1::encodeLength($curve::SIZE) . $secret,
+                [],
+                null,
+                $password,
+                $curve instanceof Ed25519 ? 'id-Ed25519' : 'id-Ed448'
+            );
+        }
+
+        $publicKey = "\4" . $publicKey[0]->toBytes() . $publicKey[1]->toBytes();
+
+        $params = new ASN1\Element(self::encodeParameters($curve, false, $options));
+
+        $key = [
+            'version' => 'ecPrivkeyVer1',
+            'privateKey' => $privateKey->toBytes(),
+            //'parameters' => $params,
+            'publicKey' => "\0" . $publicKey,
+        ];
+
+        $key = ASN1::encodeDER($key, Maps\ECPrivateKey::MAP);
+
+        return self::wrapPrivateKey($key, [], $params, $password, 'id-ecPublicKey', '', $options);
+    }
+}
diff --git a/phpseclib/Crypt/EC/Formats/Keys/PuTTY.php b/phpseclib/Crypt/EC/Formats/Keys/PuTTY.php
new file mode 100644
index 000000000..88d3e1aa7
--- /dev/null
+++ b/phpseclib/Crypt/EC/Formats/Keys/PuTTY.php
@@ -0,0 +1,135 @@
+<?php
+
+/**
+ * PuTTY Formatted EC Key Handler
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Formats\Keys;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Common\Formats\Keys\PuTTY as Progenitor;
+use phpseclib3\Crypt\EC\BaseCurves\Base as BaseCurve;
+use phpseclib3\Crypt\EC\BaseCurves\TwistedEdwards as TwistedEdwardsCurve;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Math\Common\FiniteField;
+use phpseclib3\Math\Common\FiniteField\Integer;
+
+/**
+ * PuTTY Formatted EC Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PuTTY extends Progenitor
+{
+    use Common;
+
+    /**
+     * Public Handler
+     *
+     * @var string
+     */
+    public const PUBLIC_HANDLER = 'phpseclib3\Crypt\EC\Formats\Keys\OpenSSH';
+
+    /**
+     * Supported Key Types
+     *
+     * @var array
+     */
+    protected static $types = [
+        'ecdsa-sha2-nistp256',
+        'ecdsa-sha2-nistp384',
+        'ecdsa-sha2-nistp521',
+        'ssh-ed25519',
+    ];
+
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param string|array $key
+     * @param string|false $password
+     * @return array|false
+     */
+    public static function load($key, $password)
+    {
+        $components = parent::load($key, $password);
+        if (!isset($components['private'])) {
+            return $components;
+        }
+
+        $private = $components['private'];
+
+        $temp = Strings::base64_encode(Strings::packSSH2('s', $components['type']) . $components['public']);
+        $components = OpenSSH::load($components['type'] . ' ' . $temp . ' ' . $components['comment']);
+
+        if ($components['curve'] instanceof TwistedEdwardsCurve) {
+            if (Strings::shift($private, 4) != "\0\0\0\x20") {
+                throw new RuntimeException('Length of ssh-ed25519 key should be 32');
+            }
+            $arr = $components['curve']->extractSecret($private);
+            $components['dA'] = $arr['dA'];
+            $components['secret'] = $arr['secret'];
+        } else {
+            [$components['dA']] = Strings::unpackSSH2('i', $private);
+            $components['curve']->rangeCheck($components['dA']);
+        }
+
+        return $components;
+    }
+
+    /**
+     * Convert a private key to the appropriate format.
+     *
+     * @param Integer[] $publicKey
+     */
+    public static function savePrivateKey(BigInteger $privateKey, BaseCurve $curve, array $publicKey, ?string $secret = null, ?string $password = null, array $options = []): string
+    {
+        self::initialize_static_variables();
+
+        $public = explode(' ', OpenSSH::savePublicKey($curve, $publicKey));
+        $name = $public[0];
+        $public = Strings::base64_decode($public[1]);
+        [, $length] = unpack('N', Strings::shift($public, 4));
+        Strings::shift($public, $length);
+
+        // PuTTY pads private keys with a null byte per the following:
+        // https://github.com/github/putty/blob/a3d14d77f566a41fc61dfdc5c2e0e384c9e6ae8b/sshecc.c#L1926
+        if (!$curve instanceof TwistedEdwardsCurve) {
+            $private = $privateKey->toBytes();
+            if (!(strlen($privateKey->toBits()) & 7)) {
+                $private = "\0$private";
+            }
+        }
+
+        $private = $curve instanceof TwistedEdwardsCurve ?
+            Strings::packSSH2('s', $secret) :
+            Strings::packSSH2('s', $private);
+
+        return self::wrapPrivateKey($public, $private, $name, $password, $options);
+    }
+
+    /**
+     * Convert an EC public key to the appropriate format
+     *
+     * @param FiniteField[] $publicKey
+     */
+    public static function savePublicKey(BaseCurve $curve, array $publicKey): string
+    {
+        $public = explode(' ', OpenSSH::savePublicKey($curve, $publicKey));
+        $type = $public[0];
+        $public = Strings::base64_decode($public[1]);
+        [, $length] = unpack('N', Strings::shift($public, 4));
+        Strings::shift($public, $length);
+
+        return self::wrapPublicKey($public, $type);
+    }
+}
diff --git a/phpseclib/Crypt/EC/Formats/Keys/XML.php b/phpseclib/Crypt/EC/Formats/Keys/XML.php
new file mode 100644
index 000000000..0152e495c
--- /dev/null
+++ b/phpseclib/Crypt/EC/Formats/Keys/XML.php
@@ -0,0 +1,471 @@
+<?php
+
+/**
+ * XML Formatted EC Key Handler
+ *
+ * More info:
+ *
+ * https://www.w3.org/TR/xmldsig-core/#sec-ECKeyValue
+ * http://en.wikipedia.org/wiki/XML_Signature
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Formats\Keys;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\EC\BaseCurves\Base as BaseCurve;
+use phpseclib3\Crypt\EC\BaseCurves\Montgomery as MontgomeryCurve;
+use phpseclib3\Crypt\EC\BaseCurves\Prime as PrimeCurve;
+use phpseclib3\Crypt\EC\BaseCurves\TwistedEdwards as TwistedEdwardsCurve;
+use phpseclib3\Exception\BadConfigurationException;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\Exception\UnsupportedCurveException;
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Math\Common\FiniteField\Integer;
+
+/**
+ * XML Formatted EC Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class XML
+{
+    use Common;
+
+    /**
+     * Default namespace
+     *
+     * @var string
+     */
+    private static $namespace;
+
+    /**
+     * Flag for using RFC4050 syntax
+     *
+     * @var bool
+     */
+    private static $rfc4050 = false;
+
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param string|array $key
+     */
+    public static function load($key, ?string $password = null): array
+    {
+        self::initialize_static_variables();
+
+        if (!Strings::is_stringable($key)) {
+            throw new UnexpectedValueException('Key should be a string - not a ' . gettype($key));
+        }
+
+        if (!class_exists('DOMDocument')) {
+            throw new BadConfigurationException('The dom extension is not setup correctly on this system');
+        }
+
+        $use_errors = libxml_use_internal_errors(true);
+
+        $temp = self::isolateNamespace($key, 'http://www.w3.org/2009/xmldsig11#');
+        if ($temp) {
+            $key = $temp;
+        }
+
+        $temp = self::isolateNamespace($key, 'http://www.w3.org/2001/04/xmldsig-more#');
+        if ($temp) {
+            $key = $temp;
+        }
+
+        $dom = new \DOMDocument();
+        if (substr($key, 0, 5) != '<?xml') {
+            $key = '<xml>' . $key . '</xml>';
+        }
+
+        if (!$dom->loadXML($key)) {
+            libxml_use_internal_errors($use_errors);
+            throw new UnexpectedValueException('Key does not appear to contain XML');
+        }
+        $xpath = new \DOMXPath($dom);
+        libxml_use_internal_errors($use_errors);
+        $curve = self::loadCurveByParam($xpath);
+
+        $pubkey = self::query($xpath, 'publickey', 'Public Key is not present');
+
+        $QA = self::query($xpath, 'ecdsakeyvalue')->length ?
+            self::extractPointRFC4050($xpath, $curve) :
+            self::extractPoint("\0" . $pubkey, $curve);
+
+        libxml_use_internal_errors($use_errors);
+
+        return compact('curve', 'QA');
+    }
+
+    /**
+     * Case-insensitive xpath query
+     *
+     * @param string|null $error optional
+     * @param bool $decode optional
+     * @return \DOMNodeList|string
+     */
+    private static function query(\DOMXPath $xpath, string $name, ?string $error = null, bool $decode = true)
+    {
+        $query = '/';
+        $names = explode('/', $name);
+        foreach ($names as $name) {
+            $query .= "/*[translate(local-name(), 'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz')='$name']";
+        }
+        $result = $xpath->query($query);
+        if (!isset($error)) {
+            return $result;
+        }
+
+        if (!$result->length) {
+            throw new RuntimeException($error);
+        }
+        return $decode ? self::decodeValue($result->item(0)->textContent) : $result->item(0)->textContent;
+    }
+
+    /**
+     * Finds the first element in the relevant namespace, strips the namespacing and returns the XML for that element.
+     */
+    private static function isolateNamespace(string $xml, string $ns)
+    {
+        $dom = new \DOMDocument();
+        if (!$dom->loadXML($xml)) {
+            return false;
+        }
+        $xpath = new \DOMXPath($dom);
+        $nodes = $xpath->query("//*[namespace::*[.='$ns'] and not(../namespace::*[.='$ns'])]");
+        if (!$nodes->length) {
+            return false;
+        }
+        $node = $nodes->item(0);
+        $ns_name = $node->lookupPrefix($ns);
+        if ($ns_name) {
+            $node->removeAttributeNS($ns, $ns_name);
+        }
+        return $dom->saveXML($node);
+    }
+
+    /**
+     * Decodes the value
+     */
+    private static function decodeValue(string $value): string
+    {
+        return Strings::base64_decode(str_replace(["\r", "\n", ' ', "\t"], '', $value));
+    }
+
+    /**
+     * Extract points from an XML document
+     *
+     * @return object[]
+     */
+    private static function extractPointRFC4050(\DOMXPath $xpath, BaseCurve $curve): array
+    {
+        $x = self::query($xpath, 'publickey/x');
+        $y = self::query($xpath, 'publickey/y');
+        if (!$x->length || !$x->item(0)->hasAttribute('Value')) {
+            throw new RuntimeException('Public Key / X coordinate not found');
+        }
+        if (!$y->length || !$y->item(0)->hasAttribute('Value')) {
+            throw new RuntimeException('Public Key / Y coordinate not found');
+        }
+        $point = [
+            $curve->convertInteger(new BigInteger($x->item(0)->getAttribute('Value'))),
+            $curve->convertInteger(new BigInteger($y->item(0)->getAttribute('Value'))),
+        ];
+        if (!$curve->verifyPoint($point)) {
+            throw new RuntimeException('Unable to verify that point exists on curve');
+        }
+        return $point;
+    }
+
+    /**
+     * Returns an instance of \phpseclib3\Crypt\EC\BaseCurves\Base based
+     * on the curve parameters
+     *
+     * @return BaseCurve|false
+     */
+    private static function loadCurveByParam(\DOMXPath $xpath)
+    {
+        $namedCurve = self::query($xpath, 'namedcurve');
+        if ($namedCurve->length == 1) {
+            $oid = $namedCurve->item(0)->getAttribute('URN');
+            $oid = preg_replace('#[^\d.]#', '', $oid);
+            $name = array_search($oid, self::$curveOIDs);
+            if ($name === false) {
+                throw new UnsupportedCurveException('Curve with OID of ' . $oid . ' is not supported');
+            }
+
+            $curve = '\phpseclib3\Crypt\EC\Curves\\' . $name;
+            if (!class_exists($curve)) {
+                throw new UnsupportedCurveException('Named Curve of ' . $name . ' is not supported');
+            }
+            return new $curve();
+        }
+
+        $params = self::query($xpath, 'explicitparams');
+        if ($params->length) {
+            return self::loadCurveByParamRFC4050($xpath);
+        }
+
+        $params = self::query($xpath, 'ecparameters');
+        if (!$params->length) {
+            throw new RuntimeException('No parameters are present');
+        }
+
+        $fieldTypes = [
+            'prime-field' => ['fieldid/prime/p'],
+            'gnb' => ['fieldid/gnb/m'],
+            'tnb' => ['fieldid/tnb/k'],
+            'pnb' => ['fieldid/pnb/k1', 'fieldid/pnb/k2', 'fieldid/pnb/k3'],
+            'unknown' => [],
+        ];
+
+        foreach ($fieldTypes as $type => $queries) {
+            foreach ($queries as $query) {
+                $result = self::query($xpath, $query);
+                if (!$result->length) {
+                    continue 2;
+                }
+                $param = preg_replace('#.*/#', '', $query);
+                $$param = self::decodeValue($result->item(0)->textContent);
+            }
+            break;
+        }
+
+        $a = self::query($xpath, 'curve/a', 'A coefficient is not present');
+        $b = self::query($xpath, 'curve/b', 'B coefficient is not present');
+        $base = self::query($xpath, 'base', 'Base point is not present');
+        $order = self::query($xpath, 'order', 'Order is not present');
+
+        switch ($type) {
+            case 'prime-field':
+                $curve = new PrimeCurve();
+                $curve->setModulo(new BigInteger($p, 256));
+                $curve->setCoefficients(
+                    new BigInteger($a, 256),
+                    new BigInteger($b, 256)
+                );
+                $point = self::extractPoint("\0" . $base, $curve);
+                $curve->setBasePoint(...$point);
+                $curve->setOrder(new BigInteger($order, 256));
+                return $curve;
+            case 'gnb':
+            case 'tnb':
+            case 'pnb':
+            default:
+                throw new UnsupportedCurveException('Field Type of ' . $type . ' is not supported');
+        }
+    }
+
+    /**
+     * Returns an instance of \phpseclib3\Crypt\EC\BaseCurves\Base based
+     * on the curve parameters
+     *
+     * @return BaseCurve|false
+     */
+    private static function loadCurveByParamRFC4050(\DOMXPath $xpath)
+    {
+        $fieldTypes = [
+            'prime-field' => ['primefieldparamstype/p'],
+            'unknown' => [],
+        ];
+
+        foreach ($fieldTypes as $type => $queries) {
+            foreach ($queries as $query) {
+                $result = self::query($xpath, $query);
+                if (!$result->length) {
+                    continue 2;
+                }
+                $param = preg_replace('#.*/#', '', $query);
+                $$param = $result->item(0)->textContent;
+            }
+            break;
+        }
+
+        $a = self::query($xpath, 'curveparamstype/a', 'A coefficient is not present', false);
+        $b = self::query($xpath, 'curveparamstype/b', 'B coefficient is not present', false);
+        $x = self::query($xpath, 'basepointparams/basepoint/ecpointtype/x', 'Base Point X is not present', false);
+        $y = self::query($xpath, 'basepointparams/basepoint/ecpointtype/y', 'Base Point Y is not present', false);
+        $order = self::query($xpath, 'order', 'Order is not present', false);
+
+        switch ($type) {
+            case 'prime-field':
+                $curve = new PrimeCurve();
+
+                $p = str_replace(["\r", "\n", ' ', "\t"], '', $p);
+                $curve->setModulo(new BigInteger($p));
+
+                $a = str_replace(["\r", "\n", ' ', "\t"], '', $a);
+                $b = str_replace(["\r", "\n", ' ', "\t"], '', $b);
+                $curve->setCoefficients(
+                    new BigInteger($a),
+                    new BigInteger($b)
+                );
+
+                $x = str_replace(["\r", "\n", ' ', "\t"], '', $x);
+                $y = str_replace(["\r", "\n", ' ', "\t"], '', $y);
+                $curve->setBasePoint(
+                    new BigInteger($x),
+                    new BigInteger($y)
+                );
+
+                $order = str_replace(["\r", "\n", ' ', "\t"], '', $order);
+                $curve->setOrder(new BigInteger($order));
+                return $curve;
+            default:
+                throw new UnsupportedCurveException('Field Type of ' . $type . ' is not supported');
+        }
+    }
+
+    /**
+     * Sets the namespace. dsig11 is the most common one.
+     *
+     * Set to null to unset. Used only for creating public keys.
+     */
+    public static function setNamespace(string $namespace): void
+    {
+        self::$namespace = $namespace;
+    }
+
+    /**
+     * Uses the XML syntax specified in https://tools.ietf.org/html/rfc4050
+     */
+    public static function enableRFC4050Syntax(): void
+    {
+        self::$rfc4050 = true;
+    }
+
+    /**
+     * Uses the XML syntax specified in https://www.w3.org/TR/xmldsig-core/#sec-ECParameters
+     */
+    public static function disableRFC4050Syntax(): void
+    {
+        self::$rfc4050 = false;
+    }
+
+    /**
+     * Convert a public key to the appropriate format
+     *
+     * @param Integer[] $publicKey
+     * @param array $options optional
+     */
+    public static function savePublicKey(BaseCurve $curve, array $publicKey, array $options = []): string
+    {
+        self::initialize_static_variables();
+
+        if ($curve instanceof TwistedEdwardsCurve || $curve instanceof MontgomeryCurve) {
+            throw new UnsupportedCurveException('TwistedEdwards and Montgomery Curves are not supported');
+        }
+
+        if (empty(static::$namespace)) {
+            $pre = $post = '';
+        } else {
+            $pre = static::$namespace . ':';
+            $post = ':' . static::$namespace;
+        }
+
+        if (self::$rfc4050) {
+            return '<' . $pre . 'ECDSAKeyValue xmlns' . $post . '="http://www.w3.org/2001/04/xmldsig-more#">' . "\r\n" .
+                   self::encodeXMLParameters($curve, $pre, $options) . "\r\n" .
+                   '<' . $pre . 'PublicKey>' . "\r\n" .
+                   '<' . $pre . 'X Value="' . $publicKey[0] . '" />' . "\r\n" .
+                   '<' . $pre . 'Y Value="' . $publicKey[1] . '" />' . "\r\n" .
+                   '</' . $pre . 'PublicKey>' . "\r\n" .
+                   '</' . $pre . 'ECDSAKeyValue>';
+        }
+
+        $publicKey = "\4" . $publicKey[0]->toBytes() . $publicKey[1]->toBytes();
+
+        return '<' . $pre . 'ECDSAKeyValue xmlns' . $post . '="http://www.w3.org/2009/xmldsig11#">' . "\r\n" .
+               self::encodeXMLParameters($curve, $pre, $options) . "\r\n" .
+               '<' . $pre . 'PublicKey>' . Strings::base64_encode($publicKey) . '</' . $pre . 'PublicKey>' . "\r\n" .
+               '</' . $pre . 'ECDSAKeyValue>';
+    }
+
+    /**
+     * Encode Parameters
+     *
+     * @param array $options optional
+     * @return string|false
+     */
+    private static function encodeXMLParameters(BaseCurve $curve, string $pre, array $options = [])
+    {
+        $result = self::encodeParameters($curve, true, $options);
+
+        if (isset($result['namedCurve'])) {
+            $namedCurve = '<' . $pre . 'NamedCurve URI="urn:oid:' . self::$curveOIDs[$result['namedCurve']] . '" />';
+            return self::$rfc4050 ?
+                '<DomainParameters>' . str_replace('URI', 'URN', $namedCurve) . '</DomainParameters>' :
+                $namedCurve;
+        }
+
+        if (self::$rfc4050) {
+            $xml = '<' . $pre . 'ExplicitParams>' . "\r\n" .
+                  '<' . $pre . 'FieldParams>' . "\r\n";
+            $temp = $result['specifiedCurve'];
+            switch ($temp['fieldID']['fieldType']) {
+                case 'prime-field':
+                    $xml .= '<' . $pre . 'PrimeFieldParamsType>' . "\r\n" .
+                           '<' . $pre . 'P>' . $temp['fieldID']['parameters'] . '</' . $pre . 'P>' . "\r\n" .
+                           '</' . $pre . 'PrimeFieldParamsType>' . "\r\n";
+                    $a = $curve->getA();
+                    $b = $curve->getB();
+                    [$x, $y] = $curve->getBasePoint();
+                    break;
+                default:
+                    throw new UnsupportedCurveException('Field Type of ' . $temp['fieldID']['fieldType'] . ' is not supported');
+            }
+            $xml .= '</' . $pre . 'FieldParams>' . "\r\n" .
+                   '<' . $pre . 'CurveParamsType>' . "\r\n" .
+                   '<' . $pre . 'A>' . $a . '</' . $pre . 'A>' . "\r\n" .
+                   '<' . $pre . 'B>' . $b . '</' . $pre . 'B>' . "\r\n" .
+                   '</' . $pre . 'CurveParamsType>' . "\r\n" .
+                   '<' . $pre . 'BasePointParams>' . "\r\n" .
+                   '<' . $pre . 'BasePoint>' . "\r\n" .
+                   '<' . $pre . 'ECPointType>' . "\r\n" .
+                   '<' . $pre . 'X>' . $x . '</' . $pre . 'X>' . "\r\n" .
+                   '<' . $pre . 'Y>' . $y . '</' . $pre . 'Y>' . "\r\n" .
+                   '</' . $pre . 'ECPointType>' . "\r\n" .
+                   '</' . $pre . 'BasePoint>' . "\r\n" .
+                   '<' . $pre . 'Order>' . $curve->getOrder() . '</' . $pre . 'Order>' . "\r\n" .
+                   '</' . $pre . 'BasePointParams>' . "\r\n" .
+                   '</' . $pre . 'ExplicitParams>' . "\r\n";
+
+            return $xml;
+        }
+
+        if (isset($result['specifiedCurve'])) {
+            $xml = '<' . $pre . 'ECParameters>' . "\r\n" .
+                   '<' . $pre . 'FieldID>' . "\r\n";
+            $temp = $result['specifiedCurve'];
+            switch ($temp['fieldID']['fieldType']) {
+                case 'prime-field':
+                    $xml .= '<' . $pre . 'Prime>' . "\r\n" .
+                           '<' . $pre . 'P>' . Strings::base64_encode($temp['fieldID']['parameters']->toBytes()) . '</' . $pre . 'P>' . "\r\n" .
+                           '</' . $pre . 'Prime>' . "\r\n" ;
+                    break;
+                default:
+                    throw new UnsupportedCurveException('Field Type of ' . $temp['fieldID']['fieldType'] . ' is not supported');
+            }
+            $xml .= '</' . $pre . 'FieldID>' . "\r\n" .
+                   '<' . $pre . 'Curve>' . "\r\n" .
+                   '<' . $pre . 'A>' . Strings::base64_encode($temp['curve']['a']) . '</' . $pre . 'A>' . "\r\n" .
+                   '<' . $pre . 'B>' . Strings::base64_encode($temp['curve']['b']) . '</' . $pre . 'B>' . "\r\n" .
+                   '</' . $pre . 'Curve>' . "\r\n" .
+                   '<' . $pre . 'Base>' . Strings::base64_encode($temp['base']) . '</' . $pre . 'Base>' . "\r\n" .
+                   '<' . $pre . 'Order>' . Strings::base64_encode($temp['order']) . '</' . $pre . 'Order>' . "\r\n" .
+                   '</' . $pre . 'ECParameters>';
+            return $xml;
+        }
+    }
+}
diff --git a/phpseclib/Crypt/EC/Formats/Keys/libsodium.php b/phpseclib/Crypt/EC/Formats/Keys/libsodium.php
new file mode 100644
index 000000000..d4cd52938
--- /dev/null
+++ b/phpseclib/Crypt/EC/Formats/Keys/libsodium.php
@@ -0,0 +1,108 @@
+<?php
+
+/**
+ * libsodium Key Handler
+ *
+ * Different NaCl implementations store the key differently.
+ * https://blog.mozilla.org/warner/2011/11/29/ed25519-keys/ elaborates.
+ * libsodium appears to use the same format as SUPERCOP.
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Formats\Keys;
+
+use phpseclib3\Crypt\EC\Curves\Ed25519;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Exception\UnsupportedFormatException;
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Math\Common\FiniteField\Integer;
+
+/**
+ * libsodium Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class libsodium
+{
+    use Common;
+
+    /**
+     * Is invisible flag
+     */
+    public const IS_INVISIBLE = true;
+
+    /**
+     * Break a public or private key down into its constituent components
+     */
+    public static function load(string $key, ?string $password = null): array
+    {
+        switch (strlen($key)) {
+            case 32:
+                $public = $key;
+                break;
+            case 64:
+                $private = substr($key, 0, 32);
+                $public = substr($key, -32);
+                break;
+            case 96:
+                $public = substr($key, -32);
+                if (substr($key, 32, 32) != $public) {
+                    throw new RuntimeException('Keys with 96 bytes should have the 2nd and 3rd set of 32 bytes match');
+                }
+                $private = substr($key, 0, 32);
+                break;
+            default:
+                throw new RuntimeException('libsodium keys need to either be 32 bytes long, 64 bytes long or 96 bytes long');
+        }
+
+        $curve = new Ed25519();
+        $components = ['curve' => $curve];
+        if (isset($private)) {
+            $arr = $curve->extractSecret($private);
+            $components['dA'] = $arr['dA'];
+            $components['secret'] = $arr['secret'];
+        }
+        $components['QA'] = isset($public) ?
+            self::extractPoint($public, $curve) :
+            $curve->multiplyPoint($curve->getBasePoint(), $components['dA']);
+
+        return $components;
+    }
+
+    /**
+     * Convert an EC public key to the appropriate format
+     *
+     * @param Integer[] $publicKey
+     */
+    public static function savePublicKey(Ed25519 $curve, array $publicKey): string
+    {
+        return $curve->encodePoint($publicKey);
+    }
+
+    /**
+     * Convert a private key to the appropriate format.
+     *
+     * @param Integer[] $publicKey
+     */
+    public static function savePrivateKey(BigInteger $privateKey, Ed25519 $curve, array $publicKey, ?string $secret = null, ?string $password = null): string
+    {
+        if (!isset($secret)) {
+            throw new RuntimeException('Private Key does not have a secret set');
+        }
+        if (strlen($secret) != 32) {
+            throw new RuntimeException('Private Key secret is not of the correct length');
+        }
+        if (!empty($password) && is_string($password)) {
+            throw new UnsupportedFormatException('libsodium private keys do not support encryption');
+        }
+        return $secret . $curve->encodePoint($publicKey);
+    }
+}
diff --git a/phpseclib/Crypt/EC/Formats/Signature/ASN1.php b/phpseclib/Crypt/EC/Formats/Signature/ASN1.php
new file mode 100644
index 000000000..288d00450
--- /dev/null
+++ b/phpseclib/Crypt/EC/Formats/Signature/ASN1.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * ASN1 Signature Handler
+ *
+ * PHP version 5
+ *
+ * Handles signatures in the format described in
+ * https://tools.ietf.org/html/rfc3279#section-2.2.3
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Formats\Signature;
+
+use phpseclib3\File\ASN1 as Encoder;
+use phpseclib3\File\ASN1\Maps\EcdsaSigValue;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * ASN1 Signature Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class ASN1
+{
+    /**
+     * Loads a signature
+     *
+     * @return array
+     */
+    public static function load(string $sig)
+    {
+        if (!is_string($sig)) {
+            return false;
+        }
+
+        $decoded = Encoder::decodeBER($sig);
+        if (empty($decoded)) {
+            return false;
+        }
+        $components = Encoder::asn1map($decoded[0], EcdsaSigValue::MAP);
+
+        return $components;
+    }
+
+    /**
+     * Returns a signature in the appropriate format
+     */
+    public static function save(BigInteger $r, BigInteger $s): string
+    {
+        return Encoder::encodeDER(compact('r', 's'), EcdsaSigValue::MAP);
+    }
+}
diff --git a/phpseclib/Crypt/EC/Formats/Signature/IEEE.php b/phpseclib/Crypt/EC/Formats/Signature/IEEE.php
new file mode 100644
index 000000000..ae1c648ab
--- /dev/null
+++ b/phpseclib/Crypt/EC/Formats/Signature/IEEE.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * IEEE P1363 Signature Handler
+ *
+ * PHP version 5
+ *
+ * Handles signatures in the format described in
+ * https://standards.ieee.org/ieee/1363/2049/ and
+ * https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/sign#ecdsa
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Formats\Signature;
+
+use phpseclib3\Math\BigInteger;
+
+/**
+ * ASN1 Signature Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class IEEE
+{
+    /**
+     * Loads a signature
+     *
+     * @param string $sig
+     * @return array
+     */
+    public static function load($sig)
+    {
+        if (!is_string($sig)) {
+            return false;
+        }
+
+        $len = strlen($sig);
+        if ($len & 1) {
+            return false;
+        }
+
+        $r = new BigInteger(substr($sig, 0, $len >> 1), 256);
+        $s = new BigInteger(substr($sig, $len >> 1), 256);
+
+        return compact('r', 's');
+    }
+
+    /**
+     * Returns a signature in the appropriate format
+     */
+    public static function save(BigInteger $r, BigInteger $s, string $curve, int $length): string
+    {
+        $r = $r->toBytes();
+        $s = $s->toBytes();
+        $length = (int) ceil($length / 8);
+        return str_pad($r, $length, "\0", STR_PAD_LEFT) . str_pad($s, $length, "\0", STR_PAD_LEFT);
+    }
+}
diff --git a/phpseclib/Crypt/EC/Formats/Signature/Raw.php b/phpseclib/Crypt/EC/Formats/Signature/Raw.php
new file mode 100644
index 000000000..43b2aadbd
--- /dev/null
+++ b/phpseclib/Crypt/EC/Formats/Signature/Raw.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Raw EC Signature Handler
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Formats\Signature;
+
+use phpseclib3\Crypt\Common\Formats\Signature\Raw as Progenitor;
+
+/**
+ * Raw DSA Signature Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Raw extends Progenitor
+{
+}
diff --git a/phpseclib/Crypt/EC/Formats/Signature/SSH2.php b/phpseclib/Crypt/EC/Formats/Signature/SSH2.php
new file mode 100644
index 000000000..c380ea0d1
--- /dev/null
+++ b/phpseclib/Crypt/EC/Formats/Signature/SSH2.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * SSH2 Signature Handler
+ *
+ * PHP version 5
+ *
+ * Handles signatures in the format used by SSH2
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC\Formats\Signature;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * SSH2 Signature Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class SSH2
+{
+    /**
+     * Loads a signature
+     */
+    public static function load(string $sig)
+    {
+        if (!is_string($sig)) {
+            return false;
+        }
+
+        $result = Strings::unpackSSH2('ss', $sig);
+        if ($result === false) {
+            return false;
+        }
+        [$type, $blob] = $result;
+        switch ($type) {
+            // see https://tools.ietf.org/html/rfc5656#section-3.1.2
+            case 'ecdsa-sha2-nistp256':
+            case 'ecdsa-sha2-nistp384':
+            case 'ecdsa-sha2-nistp521':
+                break;
+            default:
+                return false;
+        }
+
+        $result = Strings::unpackSSH2('ii', $blob);
+        if ($result === false) {
+            return false;
+        }
+
+        return [
+            'r' => $result[0],
+            's' => $result[1],
+        ];
+    }
+
+    /**
+     * Returns a signature in the appropriate format
+     *
+     * @return string
+     */
+    public static function save(BigInteger $r, BigInteger $s, string $curve)
+    {
+        switch ($curve) {
+            case 'secp256r1':
+                $curve = 'nistp256';
+                break;
+            case 'secp384r1':
+                $curve = 'nistp384';
+                break;
+            case 'secp521r1':
+                $curve = 'nistp521';
+                break;
+            default:
+                return false;
+        }
+
+        $blob = Strings::packSSH2('ii', $r, $s);
+
+        return Strings::packSSH2('ss', 'ecdsa-sha2-' . $curve, $blob);
+    }
+}
diff --git a/phpseclib/Crypt/EC/Parameters.php b/phpseclib/Crypt/EC/Parameters.php
new file mode 100644
index 000000000..256177bb2
--- /dev/null
+++ b/phpseclib/Crypt/EC/Parameters.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * EC Parameters
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC;
+
+use phpseclib3\Crypt\EC;
+
+/**
+ * EC Parameters
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+final class Parameters extends EC
+{
+    /**
+     * Returns the parameters
+     *
+     * @param array $options optional
+     */
+    public function toString(string $type = 'PKCS1', array $options = []): string
+    {
+        $type = self::validatePlugin('Keys', 'PKCS1', 'saveParameters');
+
+        return $type::saveParameters($this->curve, $options);
+    }
+}
diff --git a/phpseclib/Crypt/EC/PrivateKey.php b/phpseclib/Crypt/EC/PrivateKey.php
new file mode 100644
index 000000000..42769329c
--- /dev/null
+++ b/phpseclib/Crypt/EC/PrivateKey.php
@@ -0,0 +1,274 @@
+<?php
+
+/**
+ * EC Private Key
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Common;
+use phpseclib3\Crypt\EC;
+use phpseclib3\Crypt\EC\BaseCurves\Montgomery as MontgomeryCurve;
+use phpseclib3\Crypt\EC\BaseCurves\TwistedEdwards as TwistedEdwardsCurve;
+use phpseclib3\Crypt\EC\Curves\Curve25519;
+use phpseclib3\Crypt\EC\Curves\Ed25519;
+use phpseclib3\Crypt\EC\Formats\Keys\PKCS1;
+use phpseclib3\Crypt\EC\Formats\Signature\ASN1 as ASN1Signature;
+use phpseclib3\Crypt\Hash;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Exception\UnsupportedOperationException;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * EC Private Key
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+final class PrivateKey extends EC implements Common\PrivateKey
+{
+    use Common\Traits\PasswordProtected;
+
+    /**
+     * Private Key dA
+     *
+     * sign() converts this to a BigInteger so one might wonder why this is a FiniteFieldInteger instead of
+     * a BigInteger. That's because a FiniteFieldInteger, when converted to a byte string, is null padded by
+     * a certain amount whereas a BigInteger isn't.
+     *
+     * @var object
+     */
+    protected $dA;
+
+    /**
+     * @var string
+     */
+    protected $secret;
+
+    /**
+     * Multiplies an encoded point by the private key
+     *
+     * Used by ECDH
+     */
+    public function multiply(string $coordinates): string
+    {
+        if ($this->curve instanceof MontgomeryCurve) {
+            if ($this->curve instanceof Curve25519 && self::$engines['libsodium']) {
+                return sodium_crypto_scalarmult($this->dA->toBytes(), $coordinates);
+            }
+
+            $point = [$this->curve->convertInteger(new BigInteger(strrev($coordinates), 256))];
+            $point = $this->curve->multiplyPoint($point, $this->dA);
+            return strrev($point[0]->toBytes(true));
+        }
+        if (!$this->curve instanceof TwistedEdwardsCurve) {
+            $coordinates = "\0$coordinates";
+        }
+        $point = PKCS1::extractPoint($coordinates, $this->curve);
+        $point = $this->curve->multiplyPoint($point, $this->dA);
+        if ($this->curve instanceof TwistedEdwardsCurve) {
+            return $this->curve->encodePoint($point);
+        }
+        if (empty($point)) {
+            throw new RuntimeException('The infinity point is invalid');
+        }
+        return "\4" . $point[0]->toBytes(true) . $point[1]->toBytes(true);
+    }
+
+    /**
+     * Create a signature
+     *
+     * @see self::verify()
+     * @param string $message
+     */
+    public function sign($message)
+    {
+        if ($this->curve instanceof MontgomeryCurve) {
+            throw new UnsupportedOperationException('Montgomery Curves cannot be used to create signatures');
+        }
+
+        $dA = $this->dA;
+        $order = $this->curve->getOrder();
+
+        $shortFormat = $this->shortFormat;
+        $format = $this->sigFormat;
+        if ($format === false) {
+            return false;
+        }
+
+        if ($this->curve instanceof TwistedEdwardsCurve) {
+            if ($this->curve instanceof Ed25519 && self::$engines['libsodium'] && !isset($this->context)) {
+                $result = sodium_crypto_sign_detached($message, $this->withPassword()->toString('libsodium'));
+                return $shortFormat == 'SSH2' ? Strings::packSSH2('ss', 'ssh-' . strtolower($this->getCurve()), $result) : $result;
+            }
+
+            // contexts (Ed25519ctx) are supported but prehashing (Ed25519ph) is not.
+            // quoting https://tools.ietf.org/html/rfc8032#section-8.5 ,
+            // "The Ed25519ph and Ed448ph variants ... SHOULD NOT be used"
+            $A = $this->curve->encodePoint($this->QA);
+            $curve = $this->curve;
+            $hash = new Hash($curve::HASH);
+
+            $secret = substr($hash->hash($this->secret), $curve::SIZE);
+
+            if ($curve instanceof Ed25519) {
+                $dom = !isset($this->context) ? '' :
+                    'SigEd25519 no Ed25519 collisions' . "\0" . chr(strlen($this->context)) . $this->context;
+            } else {
+                $context = $this->context ?? '';
+                $dom = 'SigEd448' . "\0" . chr(strlen($context)) . $context;
+            }
+            // SHA-512(dom2(F, C) || prefix || PH(M))
+            $r = $hash->hash($dom . $secret . $message);
+            $r = strrev($r);
+            $r = new BigInteger($r, 256);
+            [, $r] = $r->divide($order);
+            $R = $curve->multiplyPoint($curve->getBasePoint(), $r);
+            $R = $curve->encodePoint($R);
+            $k = $hash->hash($dom . $R . $A . $message);
+            $k = strrev($k);
+            $k = new BigInteger($k, 256);
+            [, $k] = $k->divide($order);
+            $S = $k->multiply($dA)->add($r);
+            [, $S] = $S->divide($order);
+            $S = str_pad(strrev($S->toBytes()), $curve::SIZE, "\0");
+            return $shortFormat == 'SSH2' ? Strings::packSSH2('ss', 'ssh-' . strtolower($this->getCurve()), $R . $S) : $R . $S;
+        }
+
+        if (self::$engines['OpenSSL'] && in_array($this->hash->getHash(), openssl_get_md_methods())) {
+            $signature = '';
+            // altho PHP's OpenSSL bindings only supported EC key creation in PHP 7.1 they've long
+            // supported signing / verification
+            // we use specified curves to avoid issues with OpenSSL possibly not supporting a given named curve;
+            // doing this may mean some curve-specific optimizations can't be used but idk if OpenSSL even
+            // has curve-specific optimizations
+            $result = openssl_sign($message, $signature, $this->withPassword()->toString('PKCS8', ['namedCurve' => false]), $this->hash->getHash());
+
+            if ($result) {
+                if ($shortFormat == 'ASN1') {
+                    return $signature;
+                }
+
+                ['r' => $r, 's' => $s] = ASN1Signature::load($signature);
+
+                return $this->formatSignature($r, $s);
+            }
+        }
+
+        $e = $this->hash->hash($message);
+        $e = new BigInteger($e, 256);
+
+        $Ln = $this->hash->getLength() - $order->getLength();
+        $z = $Ln > 0 ? $e->bitwise_rightShift($Ln) : $e;
+
+        while (true) {
+            $k = BigInteger::randomRange(self::$one, $order->subtract(self::$one));
+            [$x, $y] = $this->curve->multiplyPoint($this->curve->getBasePoint(), $k);
+            $x = $x->toBigInteger();
+            [, $r] = $x->divide($order);
+            if ($r->equals(self::$zero)) {
+                continue;
+            }
+            $kinv = $k->modInverse($order);
+            $temp = $z->add($dA->multiply($r));
+            $temp = $kinv->multiply($temp);
+            [, $s] = $temp->divide($order);
+            if (!$s->equals(self::$zero)) {
+                break;
+            }
+        }
+
+        // the following is an RFC6979 compliant implementation of deterministic ECDSA
+        // it's unused because it's mainly intended for use when a good CSPRNG isn't
+        // available. if phpseclib's CSPRNG isn't good then even key generation is
+        // suspect
+        /*
+        // if this were actually being used it'd probably be better if this lived in load() and createKey()
+        $this->q = $this->curve->getOrder();
+        $dA = $this->dA->toBigInteger();
+        $this->x = $dA;
+
+        $h1 = $this->hash->hash($message);
+        $k = $this->computek($h1);
+        list($x, $y) = $this->curve->multiplyPoint($this->curve->getBasePoint(), $k);
+        $x = $x->toBigInteger();
+        list(, $r) = $x->divide($this->q);
+        $kinv = $k->modInverse($this->q);
+        $h1 = $this->bits2int($h1);
+        $temp = $h1->add($dA->multiply($r));
+        $temp = $kinv->multiply($temp);
+        list(, $s) = $temp->divide($this->q);
+        */
+
+        return $this->formatSignature($r, $s);
+    }
+
+    /**
+     * Returns the private key
+     *
+     * @param array $options optional
+     */
+    public function toString(string $type, array $options = []): string
+    {
+        $type = self::validatePlugin('Keys', $type, 'savePrivateKey');
+
+        return $type::savePrivateKey($this->dA, $this->curve, $this->QA, $this->secret, $this->password, $options);
+    }
+
+    /**
+     * Returns the public key
+     *
+     * @see self::getPrivateKey()
+     */
+    public function getPublicKey()
+    {
+        $format = 'PKCS8';
+        if ($this->curve instanceof MontgomeryCurve) {
+            $format = 'MontgomeryPublic';
+        }
+
+        $type = self::validatePlugin('Keys', $format, 'savePublicKey');
+
+        $key = $type::savePublicKey($this->curve, $this->QA);
+        $key = EC::loadFormat($format, $key);
+        if ($this->curve instanceof MontgomeryCurve) {
+            return $key;
+        }
+        $key = $key
+            ->withHash($this->hash->getHash())
+            ->withSignatureFormat($this->shortFormat);
+        if ($this->curve instanceof TwistedEdwardsCurve) {
+            $key = $key->withContext($this->context);
+        }
+        return $key;
+    }
+
+    /**
+     * Returns a signature in the appropriate format
+     */
+    private function formatSignature(BigInteger $r, BigInteger $s): string
+    {
+        $format = $this->sigFormat;
+
+        $temp = new \ReflectionMethod($format, 'save');
+        $paramCount = $temp->getNumberOfRequiredParameters();
+
+        // @codingStandardsIgnoreStart
+        switch ($paramCount) {
+            case 2: return $format::save($r, $s);
+            case 3: return $format::save($r, $s, $this->getCurve());
+            case 4: return $format::save($r, $s, $this->getCurve(), $this->getLength());
+        }
+        // @codingStandardsIgnoreEnd
+
+        // presumably the only way you could get to this is if you were using a custom plugin
+        throw new UnsupportedOperationException("$format::save() has $paramCount parameters - the only valid parameter counts are 2 or 3");
+    }
+}
diff --git a/phpseclib/Crypt/EC/PublicKey.php b/phpseclib/Crypt/EC/PublicKey.php
new file mode 100644
index 000000000..3e1948838
--- /dev/null
+++ b/phpseclib/Crypt/EC/PublicKey.php
@@ -0,0 +1,171 @@
+<?php
+
+/**
+ * EC Public Key
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\EC;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Common;
+use phpseclib3\Crypt\EC;
+use phpseclib3\Crypt\EC\BaseCurves\Montgomery as MontgomeryCurve;
+use phpseclib3\Crypt\EC\BaseCurves\TwistedEdwards as TwistedEdwardsCurve;
+use phpseclib3\Crypt\EC\Curves\Ed25519;
+use phpseclib3\Crypt\EC\Formats\Keys\PKCS1;
+use phpseclib3\Crypt\EC\Formats\Signature\ASN1 as ASN1Signature;
+use phpseclib3\Crypt\Hash;
+use phpseclib3\Exception\UnsupportedOperationException;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * EC Public Key
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+final class PublicKey extends EC implements Common\PublicKey
+{
+    use Common\Traits\Fingerprint;
+
+    /**
+     * Verify a signature
+     *
+     * @see self::verify()
+     * @param string $message
+     * @param string $signature
+     */
+    public function verify($message, $signature): bool
+    {
+        if ($this->curve instanceof MontgomeryCurve) {
+            throw new UnsupportedOperationException('Montgomery Curves cannot be used to create signatures');
+        }
+
+        $shortFormat = $this->shortFormat;
+        $format = $this->sigFormat;
+        if ($format === false) {
+            return false;
+        }
+
+        $order = $this->curve->getOrder();
+
+        if ($this->curve instanceof TwistedEdwardsCurve) {
+            if ($shortFormat == 'SSH2') {
+                [, $signature] = Strings::unpackSSH2('ss', $signature);
+            }
+
+            if ($this->curve instanceof Ed25519 && self::$engines['libsodium'] && !isset($this->context)) {
+                return sodium_crypto_sign_verify_detached($signature, $message, $this->toString('libsodium'));
+            }
+
+            $curve = $this->curve;
+            if (strlen($signature) != 2 * $curve::SIZE) {
+                return false;
+            }
+
+            $R = substr($signature, 0, $curve::SIZE);
+            $S = substr($signature, $curve::SIZE);
+
+            try {
+                $R = PKCS1::extractPoint($R, $curve);
+                $R = $this->curve->convertToInternal($R);
+            } catch (\Exception $e) {
+                return false;
+            }
+
+            $S = strrev($S);
+            $S = new BigInteger($S, 256);
+
+            if ($S->compare($order) >= 0) {
+                return false;
+            }
+
+            $A = $curve->encodePoint($this->QA);
+
+            if ($curve instanceof Ed25519) {
+                $dom2 = !isset($this->context) ? '' :
+                    'SigEd25519 no Ed25519 collisions' . "\0" . chr(strlen($this->context)) . $this->context;
+            } else {
+                $context = $this->context ?? '';
+                $dom2 = 'SigEd448' . "\0" . chr(strlen($context)) . $context;
+            }
+
+            $hash = new Hash($curve::HASH);
+            $k = $hash->hash($dom2 . substr($signature, 0, $curve::SIZE) . $A . $message);
+            $k = strrev($k);
+            $k = new BigInteger($k, 256);
+            [, $k] = $k->divide($order);
+
+            $qa = $curve->convertToInternal($this->QA);
+
+            $lhs = $curve->multiplyPoint($curve->getBasePoint(), $S);
+            $rhs = $curve->multiplyPoint($qa, $k);
+            $rhs = $curve->addPoint($rhs, $R);
+            $rhs = $curve->convertToAffine($rhs);
+
+            return $lhs[0]->equals($rhs[0]) && $lhs[1]->equals($rhs[1]);
+        }
+
+        $params = $format::load($signature);
+        if ($params === false || count($params) != 2) {
+            return false;
+        }
+        ['r' => $r, 's' => $s] = $params;
+
+        if (self::$engines['OpenSSL'] && in_array($this->hash->getHash(), openssl_get_md_methods())) {
+            $sig = $format != 'ASN1' ? ASN1Signature::save($r, $s) : $signature;
+
+            $result = openssl_verify($message, $sig, $this->toString('PKCS8', ['namedCurve' => false]), $this->hash->getHash());
+
+            if ($result != -1) {
+                return (bool) $result;
+            }
+        }
+
+        $n_1 = $order->subtract(self::$one);
+        if (!$r->between(self::$one, $n_1) || !$s->between(self::$one, $n_1)) {
+            return false;
+        }
+
+        $e = $this->hash->hash($message);
+        $e = new BigInteger($e, 256);
+
+        $Ln = $this->hash->getLength() - $order->getLength();
+        $z = $Ln > 0 ? $e->bitwise_rightShift($Ln) : $e;
+
+        $w = $s->modInverse($order);
+        [, $u1] = $z->multiply($w)->divide($order);
+        [, $u2] = $r->multiply($w)->divide($order);
+
+        $u1 = $this->curve->convertInteger($u1);
+        $u2 = $this->curve->convertInteger($u2);
+
+        [$x1, $y1] = $this->curve->multiplyAddPoints(
+            [$this->curve->getBasePoint(), $this->QA],
+            [$u1, $u2]
+        );
+
+        $x1 = $x1->toBigInteger();
+        [, $x1] = $x1->divide($order);
+
+        return $x1->equals($r);
+    }
+
+    /**
+     * Returns the public key
+     *
+     * @param array $options optional
+     */
+    public function toString(string $type, array $options = []): string
+    {
+        $type = self::validatePlugin('Keys', $type, 'savePublicKey');
+
+        return $type::savePublicKey($this->curve, $this->QA, $options);
+    }
+}
diff --git a/phpseclib/Crypt/Hash.php b/phpseclib/Crypt/Hash.php
index 6c5c22a97..c4b2356fe 100644
--- a/phpseclib/Crypt/Hash.php
+++ b/phpseclib/Crypt/Hash.php
@@ -13,7 +13,7 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $hash = new \phpseclib\Crypt\Hash('sha512');
+ *    $hash = new \phpseclib3\Crypt\Hash('sha512');
  *
  *    $hash->setKey('abcdefg');
  *
@@ -21,8 +21,6 @@
  * ?>
  * </code>
  *
- * @category  Crypt
- * @package   Hash
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @author    Andreas Fischer <bantu@phpbb.com>
@@ -31,61 +29,175 @@
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\Crypt;
+declare(strict_types=1);
 
-use phpseclib\Exception\UnsupportedAlgorithmException;
+namespace phpseclib3\Crypt;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Exception\InsufficientSetupException;
+use phpseclib3\Exception\LengthException;
+use phpseclib3\Exception\UnsupportedAlgorithmException;
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Math\PrimeField;
 
 /**
- * @package Hash
  * @author  Jim Wigginton <terrafrost@php.net>
  * @author  Andreas Fischer <bantu@phpbb.com>
- * @access  public
  */
 class Hash
 {
+    /**
+     * Padding Types
+     */
+    public const PADDING_KECCAK = 1;
+
+    /**
+     * Padding Types
+     */
+    public const PADDING_SHA3 = 2;
+
+    /**
+     * Padding Types
+     */
+    public const PADDING_SHAKE = 3;
+
+    /**
+     * Padding Type
+     *
+     * Only used by SHA3
+     *
+     * @var int
+     */
+    private $paddingType = 0;
+
     /**
      * Hash Parameter
      *
      * @see self::setHash()
      * @var int
-     * @access private
      */
-    var $hashParam;
+    private $hashParam;
 
     /**
      * Byte-length of hash output (Internal HMAC)
      *
      * @see self::setHash()
      * @var int
-     * @access private
      */
-    var $length;
+    private $length;
 
     /**
      * Hash Algorithm
      *
      * @see self::setHash()
      * @var string
-     * @access private
      */
-    var $hash;
+    private $algo;
 
     /**
      * Key
      *
      * @see self::setKey()
      * @var string
-     * @access private
      */
-    var $key = false;
+    private $key = false;
 
     /**
-     * Default Constructor.
+     * Nonce
+     *
+     * @see self::setNonce()
+     * @var string
+     */
+    private $nonce = false;
+
+    /**
+     * Hash Parameters
      *
-     * @param string $hash
-     * @access public
+     * @var array
      */
-    function __construct($hash = 'sha256')
+    private $parameters = [];
+
+    /**
+     * Computed Key
+     *
+     * @see self::_computeKey()
+     * @var string
+     */
+    private $computedKey = false;
+
+    /**
+     * Outer XOR (Internal HMAC)
+     *
+     * Used only for sha512
+     *
+     * @see self::hash()
+     * @var string
+     */
+    private $opad;
+
+    /**
+     * Inner XOR (Internal HMAC)
+     *
+     * Used only for sha512
+     *
+     * @see self::hash()
+     * @var string
+     */
+    private $ipad;
+
+    /**
+     * Recompute AES Key
+     *
+     * Used only for umac
+     *
+     * @see self::hash()
+     * @var boolean
+     */
+    private $recomputeAESKey;
+
+    /**
+     * umac cipher object
+     *
+     * @see self::hash()
+     * @var AES
+     */
+    private $c;
+
+    /**
+     * umac pad
+     *
+     * @see self::hash()
+     * @var string
+     */
+    private $pad;
+
+    /**
+     * Block Size
+     *
+     * @var int
+     */
+    private $blockSize;
+
+    /**#@+
+     * UMAC variables
+     *
+     * @var PrimeField
+     */
+    private static $factory36;
+    private static $factory64;
+    private static $factory128;
+    private static $offset64;
+    private static $offset128;
+    private static $marker64;
+    private static $marker128;
+    private static $maxwordrange64;
+    private static $maxwordrange128;
+    /**#@-*/
+
+    /**
+     * Default Constructor.
+     */
+    public function __construct(string $hash = 'sha256')
     {
         $this->setHash($hash);
     }
@@ -95,12 +207,60 @@ function __construct($hash = 'sha256')
      *
      * Keys can be of any length.
      *
-     * @access public
      * @param string $key
      */
-    function setKey($key = false)
+    public function setKey($key = false): void
     {
         $this->key = $key;
+        $this->computeKey();
+        $this->recomputeAESKey = true;
+    }
+
+    /**
+     * Sets the nonce for UMACs
+     *
+     * Keys can be of any length.
+     *
+     * @param string $nonce
+     */
+    public function setNonce($nonce = false): void
+    {
+        switch (true) {
+            case !is_string($nonce):
+            case strlen($nonce) > 0 && strlen($nonce) <= 16:
+                $this->recomputeAESKey = true;
+                $this->nonce = $nonce;
+                return;
+        }
+
+        throw new LengthException('The nonce length must be between 1 and 16 bytes, inclusive');
+    }
+
+    /**
+     * Pre-compute the key used by the HMAC
+     *
+     * Quoting http://tools.ietf.org/html/rfc2104#section-2, "Applications that use keys longer than B bytes
+     * will first hash the key using H and then use the resultant L byte string as the actual key to HMAC."
+     *
+     * As documented in https://www.reddit.com/r/PHP/comments/9nct2l/symfonypolyfill_hash_pbkdf2_correct_fix_for/
+     * when doing an HMAC multiple times it's faster to compute the hash once instead of computing it during
+     * every call
+     */
+    private function computeKey(): void
+    {
+        if ($this->key === false) {
+            $this->computedKey = false;
+            return;
+        }
+
+        if (strlen($this->key) <= $this->getBlockLengthInBytes()) {
+            $this->computedKey = $this->key;
+            return;
+        }
+
+        $this->computedKey = is_array($this->algo) ?
+            call_user_func($this->algo, $this->key) :
+            hash($this->algo, $this->key, true);
     }
 
     /**
@@ -108,28 +268,41 @@ function setKey($key = false)
      *
      * As set by the constructor or by the setHash() method.
      *
-     * @access public
      * @return string
      */
-    function getHash()
+    public function getHash()
     {
         return $this->hashParam;
     }
 
     /**
      * Sets the hash function.
-     *
-     * @access public
-     * @param string $hash
      */
-    function setHash($hash)
+    public function setHash(string $hash): void
     {
+        $oldHash = $this->hashParam;
         $this->hashParam = $hash = strtolower($hash);
         switch ($hash) {
+            case 'umac-32':
+            case 'umac-64':
+            case 'umac-96':
+            case 'umac-128':
+                if ($oldHash != $this->hashParam) {
+                    $this->recomputeAESKey = true;
+                }
+                $this->blockSize = 128;
+                $this->length = abs((int) substr($hash, -3)) >> 3;
+                $this->algo = 'umac';
+                return;
+            case 'md2-96':
             case 'md5-96':
             case 'sha1-96':
+            case 'sha224-96':
             case 'sha256-96':
+            case 'sha384-96':
             case 'sha512-96':
+            case 'sha512/224-96':
+            case 'sha512/256-96':
                 $hash = substr($hash, 0, -3);
                 $this->length = 12; // 96 / 8 = 12
                 break;
@@ -140,66 +313,1101 @@ function setHash($hash)
             case 'sha1':
                 $this->length = 20;
                 break;
+            case 'sha224':
+            case 'sha512/224':
+            case 'sha3-224':
+                $this->length = 28;
+                break;
+            case 'keccak256':
+                $this->paddingType = self::PADDING_KECCAK;
+                // fall-through
             case 'sha256':
+            case 'sha512/256':
+            case 'sha3-256':
                 $this->length = 32;
                 break;
             case 'sha384':
+            case 'sha3-384':
                 $this->length = 48;
                 break;
             case 'sha512':
+            case 'sha3-512':
                 $this->length = 64;
                 break;
             default:
-                // see if the hash isn't "officially" supported see if it can
-                // be "unofficially" supported and calculate the length
-                // accordingly.
-                if (in_array($hash, hash_algos())) {
-                    $this->length = strlen(hash($hash, '', true));
-                    break;
-                }
-                // if the hash algorithm doens't exist maybe it's a truncated
-                // hash, e.g. whirlpool-12 or some such.
-                if (preg_match('#(-\d+)$#', $hash, $matches)) {
-                    $hash = substr($hash, 0, -strlen($matches[1]));
-                    if (in_array($hash, hash_algos())) {
-                        $this->length = abs($matches[1]) >> 3;
-                        break;
-                    }
+                if (preg_match('#^(shake(?:128|256))-(\d+)$#', $hash, $matches)) {
+                    $this->paddingType = self::PADDING_SHAKE;
+                    $hash = $matches[1];
+                    $this->length = $matches[2] >> 3;
+                } else {
+                    throw new UnsupportedAlgorithmException(
+                        "$hash is not a supported algorithm"
+                    );
                 }
-                throw new UnsupportedAlgorithmException(
-                    "$hash is not a supported algorithm"
-                );
         }
 
-        $this->hash = $hash;
+        switch ($hash) {
+            case 'md2':
+            case 'md2-96':
+                $this->blockSize = 128;
+                break;
+            case 'md5-96':
+            case 'sha1-96':
+            case 'sha224-96':
+            case 'sha256-96':
+            case 'md5':
+            case 'sha1':
+            case 'sha224':
+            case 'sha256':
+                $this->blockSize = 512;
+                break;
+            case 'sha3-224':
+                $this->blockSize = 1152; // 1600 - 2*224
+                break;
+            case 'sha3-256':
+            case 'shake256':
+            case 'keccak256':
+                $this->blockSize = 1088; // 1600 - 2*256
+                break;
+            case 'sha3-384':
+                $this->blockSize = 832; // 1600 - 2*384
+                break;
+            case 'sha3-512':
+                $this->blockSize = 576; // 1600 - 2*512
+                break;
+            case 'shake128':
+                $this->blockSize = 1344; // 1600 - 2*128
+                break;
+            default:
+                $this->blockSize = 1024;
+        }
+
+        if (in_array(substr($hash, 0, 5), ['shake', 'kecca'])) {
+            //preg_match('#(\d+)$#', $hash, $matches);
+            //$this->parameters['capacity'] = 2 * $matches[1]; // 1600 - $this->blockSize
+            //$this->parameters['rate'] = 1600 - $this->parameters['capacity']; // == $this->blockSize
+            if (!$this->paddingType) {
+                $this->paddingType = self::PADDING_SHA3;
+            }
+            $this->parameters = [
+                'capacity' => 1600 - $this->blockSize,
+                'rate' => $this->blockSize,
+                'length' => $this->length,
+                'padding' => $this->paddingType,
+            ];
+            $hash = ['phpseclib3\Crypt\Hash', PHP_INT_SIZE == 8 ? 'sha3_64' : 'sha3_32'];
+        }
+
+        if (is_array($hash)) {
+            $b = $this->blockSize >> 3;
+            $this->ipad = str_repeat(chr(0x36), $b);
+            $this->opad = str_repeat(chr(0x5C), $b);
+        }
+
+        $this->algo = $hash;
+
+        $this->computeKey();
     }
 
     /**
-     * Compute the HMAC.
+     * KDF: Key-Derivation Function
      *
-     * @access public
-     * @param string $text
-     * @return string
+     * The key-derivation function generates pseudorandom bits used to key the hash functions.
+     *
+     * @param int $index a non-negative integer less than 2^64
+     * @param int $numbytes a non-negative integer less than 2^64
+     * @return string string of length numbytes bytes
+     */
+    private function kdf(int $index, int $numbytes): string
+    {
+        $this->c->setIV(pack('N4', 0, $index, 0, 1));
+
+        return $this->c->encrypt(str_repeat("\0", $numbytes));
+    }
+
+    /**
+     * PDF Algorithm
+     *
+     * @return string string of length taglen bytes.
+     */
+    private function pdf(): string
+    {
+        $k = $this->key;
+        $nonce = $this->nonce;
+        $taglen = $this->length;
+
+        //
+        // Extract and zero low bit(s) of Nonce if needed
+        //
+        if ($taglen <= 8) {
+            $last = strlen($nonce) - 1;
+            $mask = $taglen == 4 ? "\3" : "\1";
+            $index = $nonce[$last] & $mask;
+            $nonce[$last] = $nonce[$last] ^ $index;
+        }
+
+        //
+        // Make Nonce BLOCKLEN bytes by appending zeroes if needed
+        //
+        $nonce = str_pad($nonce, 16, "\0");
+
+        //
+        // Generate subkey, encipher and extract indexed substring
+        //
+        $kp = $this->kdf(0, 16);
+        $c = new AES('ctr');
+        $c->disablePadding();
+        $c->setKey($kp);
+        $c->setIV($nonce);
+        $t = $c->encrypt("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
+
+        // we could use ord() but per https://paragonie.com/blog/2016/06/constant-time-encoding-boring-cryptography-rfc-4648-and-you
+        // unpack() doesn't leak timing info
+        return $taglen <= 8 ?
+            substr($t, unpack('C', $index)[1] * $taglen, $taglen) :
+            substr($t, 0, $taglen);
+    }
+
+    /**
+     * UHASH Algorithm
+     *
+     * @param string $m string of length less than 2^67 bits.
+     * @param int $taglen the integer 4, 8, 12 or 16.
+     * @return string string of length taglen bytes.
+     */
+    private function uhash(string $m, int $taglen): string
+    {
+        //
+        // One internal iteration per 4 bytes of output
+        //
+        $iters = $taglen >> 2;
+
+        //
+        // Define total key needed for all iterations using KDF.
+        // L1Key reuses most key material between iterations.
+        //
+        //$L1Key  = $this->kdf(1, 1024 + ($iters - 1) * 16);
+        $L1Key  = $this->kdf(1, (1024 + ($iters - 1)) * 16);
+        $L2Key  = $this->kdf(2, $iters * 24);
+        $L3Key1 = $this->kdf(3, $iters * 64);
+        $L3Key2 = $this->kdf(4, $iters * 4);
+
+        //
+        // For each iteration, extract key and do three-layer hash.
+        // If bytelength(M) <= 1024, then skip L2-HASH.
+        //
+        $y = '';
+        for ($i = 0; $i < $iters; $i++) {
+            $L1Key_i  = substr($L1Key, $i * 16, 1024);
+            $L2Key_i  = substr($L2Key, $i * 24, 24);
+            $L3Key1_i = substr($L3Key1, $i * 64, 64);
+            $L3Key2_i = substr($L3Key2, $i * 4, 4);
+
+            $a = self::L1Hash($L1Key_i, $m);
+            $b = strlen($m) <= 1024 ? "\0\0\0\0\0\0\0\0$a" : self::L2Hash($L2Key_i, $a);
+            $c = self::L3Hash($L3Key1_i, $L3Key2_i, $b);
+            $y .= $c;
+        }
+
+        return $y;
+    }
+
+    /**
+     * L1-HASH Algorithm
+     *
+     * The first-layer hash breaks the message into 1024-byte chunks and
+     * hashes each with a function called NH.  Concatenating the results
+     * forms a string, which is up to 128 times shorter than the original.
+     *
+     * @param string $k string of length 1024 bytes.
+     * @param string $m string of length less than 2^67 bits.
+     * @return string string of length (8 * ceil(bitlength(M)/8192)) bytes.
      */
-    function hash($text)
+    private static function L1Hash(string $k, string $m): string
     {
+        //
+        // Break M into 1024 byte chunks (final chunk may be shorter)
+        //
+        $m = str_split($m, 1024);
+
+        //
+        // For each chunk, except the last: endian-adjust, NH hash
+        // and add bit-length.  Use results to build Y.
+        //
+        $length = 1024 * 8;
+        $y = '';
+
+        for ($i = 0; $i < count($m) - 1; $i++) {
+            $m[$i] = pack('N*', ...unpack('V*', $m[$i])); // ENDIAN-SWAP
+            $y .= PHP_INT_SIZE == 8 ?
+                static::nh64($k, $m[$i], $length) :
+                static::nh32($k, $m[$i], $length);
+        }
+
+        //
+        // For the last chunk: pad to 32-byte boundary, endian-adjust,
+        // NH hash and add bit-length.  Concatenate the result to Y.
+        //
+        $length = count($m) ? strlen($m[$i]) : 0;
+        $pad = 32 - ($length % 32);
+        $pad = max(32, $length + $pad % 32);
+        $m[$i] = str_pad($m[$i] ?? '', $pad, "\0"); // zeropad
+        $m[$i] = pack('N*', ...unpack('V*', $m[$i])); // ENDIAN-SWAP
+
+        $y .= PHP_INT_SIZE == 8 ?
+            static::nh64($k, $m[$i], $length * 8) :
+            static::nh32($k, $m[$i], $length * 8);
+
+        return $y;
+    }
+
+    /**
+     * 32-bit safe 64-bit Multiply with 2x 32-bit ints
+     *
+     * @param int $x
+     * @param int $y
+     * @return string $x * $y
+     */
+    private static function mul32_64($x, $y)
+    {
+        // see mul64() for a more detailed explanation of how this works
+
+        $x1 = ($x >> 16) & 0xFFFF;
+        $x0 = $x & 0xFFFF;
+
+        $y1 = ($y >> 16) & 0xFFFF;
+        $y0 = $y & 0xFFFF;
+
+        // the following 3x lines will possibly yield floats
+        $z2 = $x1 * $y1;
+        $z0 = $x0 * $y0;
+        $z1 = $x1 * $y0 + $x0 * $y1;
+
+        $a = intval(fmod($z0, 65536));
+        $b = intval($z0 / 65536) + intval(fmod($z1, 65536));
+        $c = intval($z1 / 65536) + intval(fmod($z2, 65536)) + intval($b / 65536);
+        $b = intval(fmod($b, 65536));
+        $d = intval($z2 / 65536) + intval($c / 65536);
+        $c = intval(fmod($c, 65536));
+        $d = intval(fmod($d, 65536));
+
+        return pack('n4', $d, $c, $b, $a);
+    }
+
+    /**
+     * 32-bit safe 64-bit Addition with 2x 64-bit strings
+     *
+     * @param int $x
+     * @param int $y
+     * @return int $x * $y
+     */
+    private static function add32_64($x, $y)
+    {
+        [, $x1, $x2, $x3, $x4] = unpack('n4', $x);
+        [, $y1, $y2, $y3, $y4] = unpack('n4', $y);
+        $a = $x4 + $y4;
+        $b = $x3 + $y3 + ($a >> 16);
+        $c = $x2 + $y2 + ($b >> 16);
+        $d = $x1 + $y1 + ($c >> 16);
+        return pack('n4', $d, $c, $b, $a);
+    }
+
+    /**
+     * 32-bit safe 32-bit Addition with 2x 32-bit strings
+     *
+     * @param int $x
+     * @param int $y
+     * @return int $x * $y
+     */
+    private static function add32($x, $y)
+    {
+        // see add64() for a more detailed explanation of how this works
+
+        $x1 = $x & 0xFFFF;
+        $x2 = ($x >> 16) & 0xFFFF;
+        $y1 = $y & 0xFFFF;
+        $y2 = ($y >> 16) & 0xFFFF;
+
+        $a = $x1 + $y1;
+        $b = ($x2 + $y2 + ($a >> 16)) << 16;
+        $a &= 0xFFFF;
+
+        return $a | $b;
+    }
+
+    /**
+     * NH Algorithm / 32-bit safe
+     *
+     * @param string $k string of length 1024 bytes.
+     * @param string $m string with length divisible by 32 bytes.
+     * @return string string of length 8 bytes.
+     */
+    private static function nh32(string $k, string $m, int $length): string
+    {
+        //
+        // Break M and K into 4-byte chunks
+        //
+        $k = unpack('N*', $k);
+        $m = unpack('N*', $m);
+        $t = count($m);
+
+        //
+        // Perform NH hash on the chunks, pairing words for multiplication
+        // which are 4 apart to accommodate vector-parallelism.
+        //
+        $i = 1;
+        $y = "\0\0\0\0\0\0\0\0";
+        while ($i <= $t) {
+            $temp  = self::add32($m[$i], $k[$i]);
+            $temp2 = self::add32($m[$i + 4], $k[$i + 4]);
+            $y = self::add32_64($y, self::mul32_64($temp, $temp2));
+
+            $temp  = self::add32($m[$i + 1], $k[$i + 1]);
+            $temp2 = self::add32($m[$i + 5], $k[$i + 5]);
+            $y = self::add32_64($y, self::mul32_64($temp, $temp2));
+
+            $temp  = self::add32($m[$i + 2], $k[$i + 2]);
+            $temp2 = self::add32($m[$i + 6], $k[$i + 6]);
+            $y = self::add32_64($y, self::mul32_64($temp, $temp2));
+
+            $temp  = self::add32($m[$i + 3], $k[$i + 3]);
+            $temp2 = self::add32($m[$i + 7], $k[$i + 7]);
+            $y = self::add32_64($y, self::mul32_64($temp, $temp2));
+
+            $i += 8;
+        }
+
+        return self::add32_64($y, pack('N2', 0, $length));
+    }
+
+    /**
+     * 64-bit Multiply with 2x 32-bit ints
+     */
+    private static function mul64(int $x, int $y): int
+    {
+        // since PHP doesn't implement unsigned integers we'll implement them with signed integers
+        // to do this we'll use karatsuba multiplication
+
+        $x1 = $x >> 16;
+        $x0 = $x & 0xFFFF;
+
+        $y1 = $y >> 16;
+        $y0 = $y & 0xFFFF;
+
+        $z2 = $x1 * $y1; // up to 32 bits long
+        $z0 = $x0 * $y0; // up to 32 bits long
+        $z1 = $x1 * $y0 + $x0 * $y1; // up to 33 bit long
+        // normally karatsuba multiplication calculates $z1 thusly:
+        //$z1 = ($x1 + $x0) * ($y0 + $y1) - $z2 - $z0;
+        // the idea being to eliminate one extra multiplication. for arbitrary precision math that makes sense
+        // but not for this purpose
+
+        // at this point karatsuba would normally return this:
+        //return ($z2 << 64) + ($z1 << 32) + $z0;
+        // the problem is that the output could be out of range for signed 64-bit ints,
+        // which would cause PHP to switch to floats, which would risk losing the lower few bits
+        // as such we'll OR 4x 16-bit blocks together like so:
+        /*
+          ........  |  ........  |  ........  |  ........
+          upper $z2 |  lower $z2 |  lower $z1 |  lower $z0
+                    | +upper $z1 | +upper $z0 |
+         +   $carry | +   $carry |            |
+        */
+        // technically upper $z1 is 17 bit - not 16 - but the most significant digit of that will
+        // just get added to $carry
+
+        $a = $z0 & 0xFFFF;
+        $b = ($z0 >> 16) + ($z1 & 0xFFFF);
+        $c = ($z1 >> 16) + ($z2 & 0xFFFF) + ($b >> 16);
+        $b = ($b & 0xFFFF) << 16;
+        $d = ($z2 >> 16) + ($c >> 16);
+        $c = ($c & 0xFFFF) << 32;
+        $d = ($d & 0xFFFF) << 48;
+
+        return $a | $b | $c | $d;
+    }
+
+    /**
+     * 64-bit Addition with 2x 64-bit ints
+     */
+    private static function add64(int $x, int $y): int
+    {
+        // doing $x + $y risks returning a result that's out of range for signed 64-bit ints
+        // in that event PHP would convert the result to a float and precision would be lost
+        // so we'll just add 2x 32-bit ints together like so:
+        /*
+           ........ | ........
+           upper $x | lower $x
+          +upper $y |+lower $y
+          +  $carry |
+        */
+        $x1 = $x & 0xFFFFFFFF;
+        $x2 = ($x >> 32) & 0xFFFFFFFF;
+        $y1 = $y & 0xFFFFFFFF;
+        $y2 = ($y >> 32) & 0xFFFFFFFF;
+
+        $a = $x1 + $y1;
+        $b = ($x2 + $y2 + ($a >> 32)) << 32;
+        $a &= 0xFFFFFFFF;
+
+        return $a | $b;
+    }
+
+    /**
+     * NH Algorithm / 64-bit safe
+     *
+     * @param string $k string of length 1024 bytes.
+     * @param string $m string with length divisible by 32 bytes.
+     * @return string string of length 8 bytes.
+     */
+    private static function nh64($k, $m, $length)
+    {
+        //
+        // Break M and K into 4-byte chunks
+        //
+        $k = unpack('N*', $k);
+        $m = unpack('N*', $m);
+        $t = count($m);
+
+        //
+        // Perform NH hash on the chunks, pairing words for multiplication
+        // which are 4 apart to accommodate vector-parallelism.
+        //
+        $i = 1;
+        $y = 0;
+        while ($i <= $t) {
+            $temp  = ($m[$i] + $k[$i]) & 0xFFFFFFFF;
+            $temp2 = ($m[$i + 4] + $k[$i + 4]) & 0xFFFFFFFF;
+            $y = self::add64($y, self::mul64($temp, $temp2));
+
+            $temp  = ($m[$i + 1] + $k[$i + 1]) & 0xFFFFFFFF;
+            $temp2 = ($m[$i + 5] + $k[$i + 5]) & 0xFFFFFFFF;
+            $y = self::add64($y, self::mul64($temp, $temp2));
+
+            $temp  = ($m[$i + 2] + $k[$i + 2]) & 0xFFFFFFFF;
+            $temp2 = ($m[$i + 6] + $k[$i + 6]) & 0xFFFFFFFF;
+            $y = self::add64($y, self::mul64($temp, $temp2));
+
+            $temp  = ($m[$i + 3] + $k[$i + 3]) & 0xFFFFFFFF;
+            $temp2 = ($m[$i + 7] + $k[$i + 7]) & 0xFFFFFFFF;
+            $y = self::add64($y, self::mul64($temp, $temp2));
+
+            $i += 8;
+        }
+
+        return pack('J', self::add64($y, $length));
+    }
+
+    /**
+     * L2-HASH: Second-Layer Hash
+     *
+     * The second-layer rehashes the L1-HASH output using a polynomial hash
+     * called POLY.  If the L1-HASH output is long, then POLY is called once
+     * on a prefix of the L1-HASH output and called using different settings
+     * on the remainder.  (This two-step hashing of the L1-HASH output is
+     * needed only if the message length is greater than 16 megabytes.)
+     * Careful implementation of POLY is necessary to avoid a possible
+     * timing attack (see Section 6.6 for more information).
+     *
+     * @param string $k string of length 24 bytes.
+     * @param string $m string of length less than 2^64 bytes.
+     * @return string string of length 16 bytes.
+     */
+    private static function L2Hash(string $k, string $m): string
+    {
+        //
+        //  Extract keys and restrict to special key-sets
+        //
+        $k64 = $k & "\x01\xFF\xFF\xFF\x01\xFF\xFF\xFF";
+        $k64 = new BigInteger($k64, 256);
+        $k128 = substr($k, 8) & "\x01\xFF\xFF\xFF\x01\xFF\xFF\xFF\x01\xFF\xFF\xFF\x01\xFF\xFF\xFF";
+        $k128 = new BigInteger($k128, 256);
+
+        //
+        // If M is no more than 2^17 bytes, hash under 64-bit prime,
+        // otherwise, hash first 2^17 bytes under 64-bit prime and
+        // remainder under 128-bit prime.
+        //
+        if (strlen($m) <= 0x20000) { // 2^14 64-bit words
+            $y = self::poly(64, self::$maxwordrange64, $k64, $m);
+        } else {
+            $m_1 = substr($m, 0, 0x20000); // 1 << 17
+            $m_2 = substr($m, 0x20000) . "\x80";
+            $length = strlen($m_2);
+            $pad = 16 - ($length % 16);
+            $pad %= 16;
+            $m_2 = str_pad($m_2, $length + $pad, "\0"); // zeropad
+            $y = self::poly(64, self::$maxwordrange64, $k64, $m_1);
+            $y = str_pad($y, 16, "\0", STR_PAD_LEFT);
+            $y = self::poly(128, self::$maxwordrange128, $k128, $y . $m_2);
+        }
+
+        return str_pad($y, 16, "\0", STR_PAD_LEFT);
+    }
+
+    /**
+     * POLY Algorithm
+     *
+     * @param int $wordbits the integer 64 or 128.
+     * @param PrimeField\Integer $maxwordrange positive integer less than 2^wordbits.
+     * @param BigInteger $k integer in the range 0 ... prime(wordbits) - 1.
+     * @param string $m string with length divisible by (wordbits / 8) bytes.
+     * @return string in the range 0 ... prime(wordbits) - 1.
+     */
+    private static function poly(int $wordbits, PrimeField\Integer $maxwordrange, BigInteger $k, string $m): string
+    {
+        //
+        // Define constants used for fixing out-of-range words
+        //
+        $wordbytes = $wordbits >> 3;
+        if ($wordbits == 128) {
+            $factory = self::$factory128;
+            $offset = self::$offset128;
+            $marker = self::$marker128;
+        } else {
+            $factory = self::$factory64;
+            $offset = self::$offset64;
+            $marker = self::$marker64;
+        }
+
+        $k = $factory->newInteger($k);
+
+        //
+        // Break M into chunks of length wordbytes bytes
+        //
+        $m_i = str_split($m, $wordbytes);
+
+        //
+        // Each input word m is compared with maxwordrange.  If not smaller
+        // then 'marker' and (m - offset), both in range, are hashed.
+        //
+        $y = $factory->newInteger(new BigInteger(1));
+        foreach ($m_i as $m) {
+            $m = $factory->newInteger(new BigInteger($m, 256));
+            if ($m->compare($maxwordrange) >= 0) {
+                $y = $k->multiply($y)->add($marker);
+                $y = $k->multiply($y)->add($m->subtract($offset));
+            } else {
+                $y = $k->multiply($y)->add($m);
+            }
+        }
+
+        return $y->toBytes();
+    }
+
+    /**
+     * L3-HASH: Third-Layer Hash
+     *
+     * The output from L2-HASH is 16 bytes long.  This final hash function
+     * hashes the 16-byte string to a fixed length of 4 bytes.
+     *
+     * @param string $k1 string of length 64 bytes.
+     * @param string $k2 string of length 4 bytes.
+     * @param string $m string of length 16 bytes.
+     * @return string string of length 4 bytes.
+     */
+    private static function L3Hash(string $k1, string $k2, string $m): string
+    {
+        $factory = self::$factory36;
+
+        $y = $factory->newInteger(new BigInteger());
+        for ($i = 0; $i < 8; $i++) {
+            $m_i = $factory->newInteger(new BigInteger(substr($m, 2 * $i, 2), 256));
+            $k_i = $factory->newInteger(new BigInteger(substr($k1, 8 * $i, 8), 256));
+            $y = $y->add($m_i->multiply($k_i));
+        }
+        $y = str_pad(substr($y->toBytes(), -4), 4, "\0", STR_PAD_LEFT);
+        $y = $y ^ $k2;
+
+        return $y;
+    }
+
+    /**
+     * Compute the Hash / HMAC / UMAC.
+     */
+    public function hash(string $text): string
+    {
+        $algo = $this->algo;
+        if ($algo == 'umac') {
+            if ($this->recomputeAESKey) {
+                if (!is_string($this->nonce)) {
+                    throw new InsufficientSetupException('No nonce has been set');
+                }
+                if (!is_string($this->key)) {
+                    throw new InsufficientSetupException('No key has been set');
+                }
+                if (strlen($this->key) != 16) {
+                    throw new LengthException('Key must be 16 bytes long');
+                }
+
+                if (!isset(self::$maxwordrange64)) {
+                    $one = new BigInteger(1);
+
+                    $prime36 = new BigInteger("\x00\x00\x00\x0F\xFF\xFF\xFF\xFB", 256);
+                    self::$factory36 = new PrimeField($prime36);
+
+                    $prime64 = new BigInteger("\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xC5", 256);
+                    self::$factory64 = new PrimeField($prime64);
+
+                    $prime128 = new BigInteger("\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x61", 256);
+                    self::$factory128 = new PrimeField($prime128);
+
+                    self::$offset64 = new BigInteger("\1\0\0\0\0\0\0\0\0", 256);
+                    self::$offset64 = self::$factory64->newInteger(self::$offset64->subtract($prime64));
+                    self::$offset128 = new BigInteger("\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 256);
+                    self::$offset128 = self::$factory128->newInteger(self::$offset128->subtract($prime128));
+
+                    self::$marker64 = self::$factory64->newInteger($prime64->subtract($one));
+                    self::$marker128 = self::$factory128->newInteger($prime128->subtract($one));
+
+                    $maxwordrange64 = $one->bitwise_leftShift(64)->subtract($one->bitwise_leftShift(32));
+                    self::$maxwordrange64 = self::$factory64->newInteger($maxwordrange64);
+
+                    $maxwordrange128 = $one->bitwise_leftShift(128)->subtract($one->bitwise_leftShift(96));
+                    self::$maxwordrange128 = self::$factory128->newInteger($maxwordrange128);
+                }
+
+                $this->c = new AES('ctr');
+                $this->c->disablePadding();
+                $this->c->setKey($this->key);
+
+                $this->pad = $this->pdf();
+
+                $this->recomputeAESKey = false;
+            }
+
+            $hashedmessage = $this->uhash($text, $this->length);
+            return $hashedmessage ^ $this->pad;
+        }
+
+        if (is_array($algo)) {
+            if (empty($this->key) || !is_string($this->key)) {
+                return substr($algo($text, ...array_values($this->parameters)), 0, $this->length);
+            }
+
+            // SHA3 HMACs are discussed at https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.202.pdf#page=30
+
+            $key    = str_pad($this->computedKey, $b, chr(0));
+            $temp   = $this->ipad ^ $key;
+            $temp  .= $text;
+            $temp   = substr($algo($temp, ...array_values($this->parameters)), 0, $this->length);
+            $output = $this->opad ^ $key;
+            $output .= $temp;
+            $output = $algo($output, ...array_values($this->parameters));
+
+            return substr($output, 0, $this->length);
+        }
+
         $output = !empty($this->key) || is_string($this->key) ?
-            hash_hmac($this->hash, $text, $this->key, true) :
-            hash($this->hash, $text, true);
+            hash_hmac($algo, $text, $this->computedKey, true) :
+            hash($algo, $text, true);
 
         return strlen($output) > $this->length
             ? substr($output, 0, $this->length)
             : $output;
     }
 
+    /**
+     * Returns the hash length (in bits)
+     */
+    public function getLength(): int
+    {
+        return $this->length << 3;
+    }
+
     /**
      * Returns the hash length (in bytes)
-     *
-     * @access public
-     * @return int
      */
-    function getLength()
+    public function getLengthInBytes(): int
     {
         return $this->length;
     }
+
+    /**
+     * Returns the block length (in bits)
+     */
+    public function getBlockLength(): int
+    {
+        return $this->blockSize;
+    }
+
+    /**
+     * Returns the block length (in bytes)
+     */
+    public function getBlockLengthInBytes(): int
+    {
+        return $this->blockSize >> 3;
+    }
+
+    /**
+     * Pads SHA3 based on the mode
+     */
+    private static function sha3_pad(int $padLength, int $padType): string
+    {
+        switch ($padType) {
+            case self::PADDING_KECCAK:
+                $temp = chr(0x01) . str_repeat("\0", $padLength - 1);
+                $temp[$padLength - 1] = $temp[$padLength - 1] | chr(0x80);
+                return $temp;
+            case self::PADDING_SHAKE:
+                $temp = chr(0x1F) . str_repeat("\0", $padLength - 1);
+                $temp[$padLength - 1] = $temp[$padLength - 1] | chr(0x80);
+                return $temp;
+            //case self::PADDING_SHA3:
+            default:
+                // from https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.202.pdf#page=36
+                return $padLength == 1 ? chr(0x86) : chr(0x06) . str_repeat("\0", $padLength - 2) . chr(0x80);
+        }
+    }
+
+    /**
+     * Pure-PHP 32-bit implementation of SHA3
+     *
+     * Whereas BigInteger.php's 32-bit engine works on PHP 64-bit this 32-bit implementation
+     * of SHA3 will *not* work on PHP 64-bit. This is because this implementation
+     * employees bitwise NOTs and bitwise left shifts. And the round constants only work
+     * on 32-bit PHP. eg. dechex(-2147483648) returns 80000000 on 32-bit PHP and
+     * FFFFFFFF80000000 on 64-bit PHP. Sure, we could do bitwise ANDs but that would slow
+     * things down.
+     *
+     * SHA512 requires BigInteger to simulate 64-bit unsigned integers because SHA2 employees
+     * addition whereas SHA3 just employees bitwise operators. PHP64 only supports signed
+     * 64-bit integers, which complicates addition, whereas that limitation isn't an issue
+     * for SHA3.
+     *
+     * In https://ws680.nist.gov/publication/get_pdf.cfm?pub_id=919061#page=16 KECCAK[C] is
+     * defined as "the KECCAK instance with KECCAK-f[1600] as the underlying permutation and
+     * capacity c". This is relevant because, altho the KECCAK standard defines a mode
+     * (KECCAK-f[800]) designed for 32-bit machines that mode is incompatible with SHA3
+     */
+    private static function sha3_32(string $p, int $c, int $r, int $d, int $padType): string
+    {
+        $block_size = $r >> 3;
+        $padLength = $block_size - (strlen($p) % $block_size);
+        $num_ints = $block_size >> 2;
+
+        $p .= static::sha3_pad($padLength, $padType);
+
+        $n = strlen($p) / $r; // number of blocks
+
+        $s = [
+            [[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]],
+            [[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]],
+            [[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]],
+            [[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]],
+            [[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]],
+        ];
+
+        $p = str_split($p, $block_size);
+
+        foreach ($p as $pi) {
+            $pi = unpack('V*', $pi);
+            $x = $y = 0;
+            for ($i = 1; $i <= $num_ints; $i += 2) {
+                $s[$x][$y][0] ^= $pi[$i + 1];
+                $s[$x][$y][1] ^= $pi[$i];
+                if (++$y == 5) {
+                    $y = 0;
+                    $x++;
+                }
+            }
+            static::processSHA3Block32($s);
+        }
+
+        $z = '';
+        $i = $j = 0;
+        while (strlen($z) < $d) {
+            $z .= pack('V2', $s[$i][$j][1], $s[$i][$j++][0]);
+            if ($j == 5) {
+                $j = 0;
+                $i++;
+                if ($i == 5) {
+                    $i = 0;
+                    static::processSHA3Block32($s);
+                }
+            }
+        }
+
+        return $z;
+    }
+
+    /**
+     * 32-bit block processing method for SHA3
+     */
+    private static function processSHA3Block32(array &$s): void
+    {
+        static $rotationOffsets = [
+            [ 0,  1, 62, 28, 27],
+            [36, 44,  6, 55, 20],
+            [ 3, 10, 43, 25, 39],
+            [41, 45, 15, 21,  8],
+            [18,  2, 61, 56, 14],
+        ];
+
+        // the standards give these constants in hexadecimal notation. it's tempting to want to use
+        // that same notation, here, however, we can't, because 0x80000000, on PHP32, is a positive
+        // float - not the negative int that we need to be in PHP32. so we use -2147483648 instead
+        static $roundConstants = [
+            [0, 1],
+            [0, 32898],
+            [-2147483648, 32906],
+            [-2147483648, -2147450880],
+            [0, 32907],
+            [0, -2147483647],
+            [-2147483648, -2147450751],
+            [-2147483648, 32777],
+            [0, 138],
+            [0, 136],
+            [0, -2147450871],
+            [0, -2147483638],
+            [0, -2147450741],
+            [-2147483648, 139],
+            [-2147483648, 32905],
+            [-2147483648, 32771],
+            [-2147483648, 32770],
+            [-2147483648, 128],
+            [0, 32778],
+            [-2147483648, -2147483638],
+            [-2147483648, -2147450751],
+            [-2147483648, 32896],
+            [0, -2147483647],
+            [-2147483648, -2147450872],
+        ];
+
+        for ($round = 0; $round < 24; $round++) {
+            // theta step
+            $parity = $rotated = [];
+            for ($i = 0; $i < 5; $i++) {
+                $parity[] = [
+                    $s[0][$i][0] ^ $s[1][$i][0] ^ $s[2][$i][0] ^ $s[3][$i][0] ^ $s[4][$i][0],
+                    $s[0][$i][1] ^ $s[1][$i][1] ^ $s[2][$i][1] ^ $s[3][$i][1] ^ $s[4][$i][1],
+                ];
+                $rotated[] = static::rotateLeft32($parity[$i], 1);
+            }
+
+            $temp = [
+                [$parity[4][0] ^ $rotated[1][0], $parity[4][1] ^ $rotated[1][1]],
+                [$parity[0][0] ^ $rotated[2][0], $parity[0][1] ^ $rotated[2][1]],
+                [$parity[1][0] ^ $rotated[3][0], $parity[1][1] ^ $rotated[3][1]],
+                [$parity[2][0] ^ $rotated[4][0], $parity[2][1] ^ $rotated[4][1]],
+                [$parity[3][0] ^ $rotated[0][0], $parity[3][1] ^ $rotated[0][1]],
+            ];
+            for ($i = 0; $i < 5; $i++) {
+                for ($j = 0; $j < 5; $j++) {
+                    $s[$i][$j][0] ^= $temp[$j][0];
+                    $s[$i][$j][1] ^= $temp[$j][1];
+                }
+            }
+
+            $st = $s;
+
+            // rho and pi steps
+            for ($i = 0; $i < 5; $i++) {
+                for ($j = 0; $j < 5; $j++) {
+                    $st[(2 * $i + 3 * $j) % 5][$j] = static::rotateLeft32($s[$j][$i], $rotationOffsets[$j][$i]);
+                }
+            }
+
+            // chi step
+            for ($i = 0; $i < 5; $i++) {
+                $s[$i][0] = [
+                    $st[$i][0][0] ^ (~$st[$i][1][0] & $st[$i][2][0]),
+                    $st[$i][0][1] ^ (~$st[$i][1][1] & $st[$i][2][1]),
+                ];
+                $s[$i][1] = [
+                    $st[$i][1][0] ^ (~$st[$i][2][0] & $st[$i][3][0]),
+                    $st[$i][1][1] ^ (~$st[$i][2][1] & $st[$i][3][1]),
+                ];
+                $s[$i][2] = [
+                    $st[$i][2][0] ^ (~$st[$i][3][0] & $st[$i][4][0]),
+                    $st[$i][2][1] ^ (~$st[$i][3][1] & $st[$i][4][1]),
+                ];
+                $s[$i][3] = [
+                    $st[$i][3][0] ^ (~$st[$i][4][0] & $st[$i][0][0]),
+                    $st[$i][3][1] ^ (~$st[$i][4][1] & $st[$i][0][1]),
+                ];
+                $s[$i][4] = [
+                    $st[$i][4][0] ^ (~$st[$i][0][0] & $st[$i][1][0]),
+                    $st[$i][4][1] ^ (~$st[$i][0][1] & $st[$i][1][1]),
+                ];
+            }
+
+            // iota step
+            $s[0][0][0] ^= $roundConstants[$round][0];
+            $s[0][0][1] ^= $roundConstants[$round][1];
+        }
+    }
+
+    /**
+     * Rotate 32-bit int
+     */
+    private static function rotateLeft32(array $x, int $shift): array
+    {
+        if ($shift < 32) {
+            [$hi, $lo] = $x;
+        } else {
+            $shift -= 32;
+            [$lo, $hi] = $x;
+        }
+
+        $mask = -1 ^ (-1 << $shift);
+        return [
+            ($hi << $shift) | (($lo >> (32 - $shift)) & $mask),
+            ($lo << $shift) | (($hi >> (32 - $shift)) & $mask),
+        ];
+    }
+
+    /**
+     * Pure-PHP 64-bit implementation of SHA3
+     */
+    private static function sha3_64(string $p, int $c, int $r, int $d, int $padType): string
+    {
+        $block_size = $r >> 3;
+        $padLength = $block_size - (strlen($p) % $block_size);
+        $num_ints = $block_size >> 2;
+
+        $p .= static::sha3_pad($padLength, $padType);
+
+        $n = strlen($p) / $r; // number of blocks
+
+        $s = [
+            [0, 0, 0, 0, 0],
+            [0, 0, 0, 0, 0],
+            [0, 0, 0, 0, 0],
+            [0, 0, 0, 0, 0],
+            [0, 0, 0, 0, 0],
+        ];
+
+        $p = str_split($p, $block_size);
+
+        foreach ($p as $pi) {
+            $pi = unpack('P*', $pi);
+            $x = $y = 0;
+            foreach ($pi as $subpi) {
+                $s[$x][$y++] ^= $subpi;
+                if ($y == 5) {
+                    $y = 0;
+                    $x++;
+                }
+            }
+            static::processSHA3Block64($s);
+        }
+
+        $z = '';
+        $i = $j = 0;
+        while (strlen($z) < $d) {
+            $z .= pack('P', $s[$i][$j++]);
+            if ($j == 5) {
+                $j = 0;
+                $i++;
+                if ($i == 5) {
+                    $i = 0;
+                    static::processSHA3Block64($s);
+                }
+            }
+        }
+
+        return $z;
+    }
+
+    /**
+     * 64-bit block processing method for SHA3
+     */
+    private static function processSHA3Block64(array &$s): void
+    {
+        static $rotationOffsets = [
+            [ 0,  1, 62, 28, 27],
+            [36, 44,  6, 55, 20],
+            [ 3, 10, 43, 25, 39],
+            [41, 45, 15, 21,  8],
+            [18,  2, 61, 56, 14],
+        ];
+
+        static $roundConstants = [
+            1,
+            32898,
+            -9223372036854742902,
+            -9223372034707259392,
+            32907,
+            2147483649,
+            -9223372034707259263,
+            -9223372036854743031,
+            138,
+            136,
+            2147516425,
+            2147483658,
+            2147516555,
+            -9223372036854775669,
+            -9223372036854742903,
+            -9223372036854743037,
+            -9223372036854743038,
+            -9223372036854775680,
+            32778,
+            -9223372034707292150,
+            -9223372034707259263,
+            -9223372036854742912,
+            2147483649,
+            -9223372034707259384,
+        ];
+
+        for ($round = 0; $round < 24; $round++) {
+            // theta step
+            $parity = [];
+            for ($i = 0; $i < 5; $i++) {
+                $parity[] = $s[0][$i] ^ $s[1][$i] ^ $s[2][$i] ^ $s[3][$i] ^ $s[4][$i];
+            }
+            $temp = [
+                $parity[4] ^ static::rotateLeft64($parity[1], 1),
+                $parity[0] ^ static::rotateLeft64($parity[2], 1),
+                $parity[1] ^ static::rotateLeft64($parity[3], 1),
+                $parity[2] ^ static::rotateLeft64($parity[4], 1),
+                $parity[3] ^ static::rotateLeft64($parity[0], 1),
+            ];
+            for ($i = 0; $i < 5; $i++) {
+                for ($j = 0; $j < 5; $j++) {
+                    $s[$i][$j] ^= $temp[$j];
+                }
+            }
+
+            $st = $s;
+
+            // rho and pi steps
+            for ($i = 0; $i < 5; $i++) {
+                for ($j = 0; $j < 5; $j++) {
+                    $st[(2 * $i + 3 * $j) % 5][$j] = static::rotateLeft64($s[$j][$i], $rotationOffsets[$j][$i]);
+                }
+            }
+
+            // chi step
+            for ($i = 0; $i < 5; $i++) {
+                $s[$i] = [
+                    $st[$i][0] ^ (~$st[$i][1] & $st[$i][2]),
+                    $st[$i][1] ^ (~$st[$i][2] & $st[$i][3]),
+                    $st[$i][2] ^ (~$st[$i][3] & $st[$i][4]),
+                    $st[$i][3] ^ (~$st[$i][4] & $st[$i][0]),
+                    $st[$i][4] ^ (~$st[$i][0] & $st[$i][1]),
+                ];
+            }
+
+            // iota step
+            $s[0][0] ^= $roundConstants[$round];
+        }
+    }
+
+    /**
+     * Rotate 64-bit int
+     */
+    private static function rotateLeft64(int $x, int $shift): int
+    {
+        $mask = -1 ^ (-1 << $shift);
+        return ($x << $shift) | (($x >> (64 - $shift)) & $mask);
+    }
+
+    /**
+     *  __toString() magic method
+     */
+    public function __toString()
+    {
+        return $this->getHash();
+    }
 }
diff --git a/phpseclib/Crypt/PublicKeyLoader.php b/phpseclib/Crypt/PublicKeyLoader.php
new file mode 100644
index 000000000..2d515a444
--- /dev/null
+++ b/phpseclib/Crypt/PublicKeyLoader.php
@@ -0,0 +1,107 @@
+<?php
+
+/**
+ * PublicKeyLoader
+ *
+ * Returns a PublicKey or PrivateKey object.
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2009 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt;
+
+use phpseclib3\Crypt\Common\AsymmetricKey;
+use phpseclib3\Crypt\Common\PrivateKey;
+use phpseclib3\Crypt\Common\PublicKey;
+use phpseclib3\Exception\NoKeyLoadedException;
+use phpseclib3\File\X509;
+
+/**
+ * PublicKeyLoader
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PublicKeyLoader
+{
+    /**
+     * Loads a public or private key
+     *
+     * @param string|array $key
+     */
+    public static function load($key, ?string $password = null): AsymmetricKey
+    {
+        try {
+            return EC::load($key, $password);
+        } catch (NoKeyLoadedException $e) {
+        }
+
+        try {
+            return RSA::load($key, $password);
+        } catch (NoKeyLoadedException $e) {
+        }
+
+        try {
+            return DSA::load($key, $password);
+        } catch (NoKeyLoadedException $e) {
+        }
+
+        try {
+            $x509 = new X509();
+            $x509->loadX509($key);
+            $key = $x509->getPublicKey();
+            if ($key) {
+                return $key;
+            }
+        } catch (\Exception $e) {
+        }
+
+        throw new NoKeyLoadedException('Unable to read key');
+    }
+
+    /**
+     * Loads a private key
+     *
+     * @param string|array $key
+     */
+    public static function loadPrivateKey($key, ?string $password = null): PrivateKey
+    {
+        $key = self::load($key, $password);
+        if (!$key instanceof PrivateKey) {
+            throw new NoKeyLoadedException('The key that was loaded was not a private key');
+        }
+        return $key;
+    }
+
+    /**
+     * Loads a public key
+     *
+     * @param string|array $key
+     */
+    public static function loadPublicKey($key): PublicKey
+    {
+        $key = self::load($key);
+        if (!$key instanceof PublicKey) {
+            throw new NoKeyLoadedException('The key that was loaded was not a public key');
+        }
+        return $key;
+    }
+
+    /**
+     * Loads parameters
+     *
+     * @param string|array $key
+     */
+    public static function loadParameters($key): AsymmetricKey
+    {
+        $key = self::load($key);
+        if (!$key instanceof PrivateKey && !$key instanceof PublicKey) {
+            throw new NoKeyLoadedException('The key that was loaded was not a parameter');
+        }
+        return $key;
+    }
+}
diff --git a/phpseclib/Crypt/RC2.php b/phpseclib/Crypt/RC2.php
index bfe3bca44..6755f6652 100644
--- a/phpseclib/Crypt/RC2.php
+++ b/phpseclib/Crypt/RC2.php
@@ -3,7 +3,7 @@
 /**
  * Pure-PHP implementation of RC2.
  *
- * Uses mcrypt, if available, and an internal implementation, otherwise.
+ * Uses OpenSSL, if available/possible, and an internal implementation, otherwise
  *
  * PHP version 5
  *
@@ -16,7 +16,7 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $rc2 = new \phpseclib\Crypt\RC2();
+ *    $rc2 = new \phpseclib3\Crypt\RC2('ctr');
  *
  *    $rc2->setKey('abcdefgh');
  *
@@ -26,123 +26,111 @@
  * ?>
  * </code>
  *
- * @category Crypt
- * @package  RC2
  * @author   Patrick Monnerat <pm@datasphere.ch>
  * @license  http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link     http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\Crypt;
+declare(strict_types=1);
 
-use phpseclib\Crypt\Base;
+namespace phpseclib3\Crypt;
+
+use phpseclib3\Crypt\Common\BlockCipher;
+use phpseclib3\Exception\BadModeException;
+use phpseclib3\Exception\InvalidArgumentException;
+use phpseclib3\Exception\LengthException;
 
 /**
  * Pure-PHP implementation of RC2.
- *
- * @package RC2
- * @access  public
  */
-class RC2 extends Base
+class RC2 extends BlockCipher
 {
     /**
      * Block Length of the cipher
      *
-     * @see \phpseclib\Crypt\Base::block_size
+     * @see Common\SymmetricKey::block_size
      * @var int
-     * @access private
      */
-    var $block_size = 8;
+    protected $block_size = 8;
 
     /**
      * The Key
      *
-     * @see \phpseclib\Crypt\Base::key
+     * @see Common\SymmetricKey::key
      * @see self::setKey()
      * @var string
-     * @access private
      */
-    var $key;
+    protected $key;
 
     /**
      * The Original (unpadded) Key
      *
-     * @see \phpseclib\Crypt\Base::key
+     * @see Common\SymmetricKey::key
      * @see self::setKey()
      * @see self::encrypt()
      * @see self::decrypt()
      * @var string
-     * @access private
-     */
-    var $orig_key;
-
-    /**
-     * Don't truncate / null pad key
-     *
-     * @see \phpseclib\Crypt\Base::_clearBuffers()
-     * @var bool
-     * @access private
      */
-    var $skip_key_adjustment = true;
+    private $orig_key;
 
     /**
      * Key Length (in bytes)
      *
-     * @see \phpseclib\Crypt\RC2::setKeyLength()
+     * @see \phpseclib3\Crypt\RC2::setKeyLength()
      * @var int
-     * @access private
      */
-    var $key_length = 16; // = 128 bits
+    protected $key_length = 16; // = 128 bits
 
     /**
+<<<<<<< HEAD
+=======
      * The mcrypt specific name of the cipher
      *
-     * @see \phpseclib\Crypt\Base::cipher_name_mcrypt
+     * @see Common\SymmetricKey::cipher_name_mcrypt
      * @var string
-     * @access private
      */
-    var $cipher_name_mcrypt = 'rc2';
+    protected $cipher_name_mcrypt = 'rc2';
 
     /**
      * Optimizing value while CFB-encrypting
      *
-     * @see \phpseclib\Crypt\Base::cfb_init_len
+     * @see Common\SymmetricKey::cfb_init_len
      * @var int
-     * @access private
      */
-    var $cfb_init_len = 500;
+    protected $cfb_init_len = 500;
 
     /**
+>>>>>>> 3.0
      * The key length in bits.
      *
+     * {@internal Should be in range [1..1024].}
+     *
+     * {@internal Changing this value after setting the key has no effect.}
+     *
      * @see self::setKeyLength()
      * @see self::setKey()
      * @var int
-     * @access private
-     * @internal Should be in range [1..1024].
-     * @internal Changing this value after setting the key has no effect.
      */
-    var $default_key_length = 1024;
+    private $default_key_length = 1024;
 
     /**
      * The key length in bits.
      *
+     * {@internal Should be in range [1..1024].}
+     *
      * @see self::isValidEnine()
      * @see self::setKey()
      * @var int
-     * @access private
-     * @internal Should be in range [1..1024].
      */
-    var $current_key_length;
+    private $current_key_length;
 
     /**
      * The Key Schedule
      *
-     * @see self::_setupKey()
+     * @see self::setupKey()
      * @var array
-     * @access private
      */
-    var $keys;
+    private $keys;
 
     /**
      * Key expansion randomization table.
@@ -150,9 +138,8 @@ class RC2 extends Base
      *
      * @see self::setKey()
      * @var array
-     * @access private
      */
-    var $pitable = array(
+    private static $pitable = [
         0xD9, 0x78, 0xF9, 0xC4, 0x19, 0xDD, 0xB5, 0xED,
         0x28, 0xE9, 0xFD, 0x79, 0x4A, 0xA0, 0xD8, 0x9D,
         0xC6, 0x7E, 0x37, 0x83, 0x2B, 0x76, 0x53, 0x8E,
@@ -216,17 +203,16 @@ class RC2 extends Base
         0x0D, 0x38, 0x34, 0x1B, 0xAB, 0x33, 0xFF, 0xB0,
         0xBB, 0x48, 0x0C, 0x5F, 0xB9, 0xB1, 0xCD, 0x2E,
         0xC5, 0xF3, 0xDB, 0x47, 0xE5, 0xA5, 0x9C, 0x77,
-        0x0A, 0xA6, 0x20, 0x68, 0xFE, 0x7F, 0xC1, 0xAD
-    );
+        0x0A, 0xA6, 0x20, 0x68, 0xFE, 0x7F, 0xC1, 0xAD,
+    ];
 
     /**
      * Inverse key expansion randomization table.
      *
      * @see self::setKey()
      * @var array
-     * @access private
      */
-    var $invpitable = array(
+    private static $invpitable = [
         0xD1, 0xDA, 0xB9, 0x6F, 0x9C, 0xC8, 0x78, 0x66,
         0x80, 0x2C, 0xF8, 0x37, 0xEA, 0xE0, 0x62, 0xA4,
         0xCB, 0x71, 0x50, 0x27, 0x4B, 0x95, 0xD9, 0x20,
@@ -258,57 +244,80 @@ class RC2 extends Base
         0xA1, 0xD4, 0xDD, 0xC4, 0x56, 0xF4, 0xD2, 0x77,
         0x81, 0x09, 0x82, 0x33, 0x9F, 0x07, 0x86, 0x75,
         0x38, 0x4E, 0x69, 0xF1, 0xAD, 0x23, 0x73, 0x87,
-        0x70, 0x02, 0xC2, 0x1E, 0xB8, 0x0A, 0xFC, 0xE6
-    );
+        0x70, 0x02, 0xC2, 0x1E, 0xB8, 0x0A, 0xFC, 0xE6,
+    ];
+
+    /**
+     * Default Constructor.
+     *
+     * @throws InvalidArgumentException if an invalid / unsupported mode is provided
+     */
+    public function __construct(string $mode)
+    {
+        parent::__construct($mode);
+
+        if ($this->mode == self::MODE_STREAM) {
+            throw new BadModeException('Block ciphers cannot be ran in stream mode');
+        }
+    }
 
     /**
      * Test for engine validity
      *
-     * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
+     * This is mainly just a wrapper to set things up for \phpseclib3\Crypt\Common\SymmetricKey::isValidEngine()
      *
-     * @see \phpseclib\Crypt\Base::__construct()
+<<<<<<< HEAD
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
+=======
+     * @see Common\SymmetricKey::__construct()
      * @param int $engine
-     * @access public
      * @return bool
+>>>>>>> 3.0
      */
-    function isValidEngine($engine)
+    protected function isValidEngineHelper(int $engine): bool
     {
         switch ($engine) {
             case self::ENGINE_OPENSSL:
                 if ($this->current_key_length != 128 || strlen($this->orig_key) < 16) {
                     return false;
                 }
+                // quoting https://www.openssl.org/news/openssl-3.0-notes.html, OpenSSL 3.0.1
+                // "Moved all variations of the EVP ciphers CAST5, BF, IDEA, SEED, RC2, RC4, RC5, and DES to the legacy provider"
+                // in theory openssl_get_cipher_methods() should catch this but, on GitHub Actions, at least, it does not
+                if (defined('OPENSSL_VERSION_TEXT') && version_compare(preg_replace('#OpenSSL (\d+\.\d+\.\d+) .*#', '$1', OPENSSL_VERSION_TEXT), '3.0.1', '>=')) {
+                    return false;
+                }
                 $this->cipher_name_openssl_ecb = 'rc2-ecb';
-                $this->cipher_name_openssl = 'rc2-' . $this->_openssl_translate_mode();
+                $this->cipher_name_openssl = 'rc2-' . $this->openssl_translate_mode();
         }
 
-        return parent::isValidEngine($engine);
+        return parent::isValidEngineHelper($engine);
     }
 
     /**
      * Sets the key length.
      *
-     * Valid key lengths are 1 to 1024.
+     * Valid key lengths are 8 to 1024.
      * Calling this function after setting the key has no effect until the next
-     *  \phpseclib\Crypt\RC2::setKey() call.
+     *  \phpseclib3\Crypt\RC2::setKey() call.
      *
-     * @access public
      * @param int $length in bits
+     * @throws LengthException if the key length isn't supported
      */
-    function setKeyLength($length)
+    public function setKeyLength(int $length): void
     {
-        if ($length >= 1 && $length <= 1024) {
-            $this->default_key_length = $length;
+        if ($length < 8 || $length > 1024) {
+            throw new LengthException('Key size of ' . $length . ' bits is not supported by this algorithm. Only keys between 1 and 1024 bits, inclusive, are supported');
         }
+
+        $this->default_key_length = $this->current_key_length = $length;
+        $this->explicit_key_length = $length >> 3;
     }
 
     /**
      * Returns the current key length
-     *
-     * @access public
-     * @return int
      */
-    function getKeyLength()
+    public function getKeyLength(): int
     {
         return $this->current_key_length;
     }
@@ -316,31 +325,38 @@ function getKeyLength()
     /**
      * Sets the key.
      *
-     * Keys can be of any length. RC2, itself, uses 1 to 1024 bit keys (eg.
+     * Keys can be of any length. RC2, itself, uses 8 to 1024 bit keys (eg.
      * strlen($key) <= 128), however, we only use the first 128 bytes if $key
      * has more then 128 bytes in it, and set $key to a single null byte if
      * it is empty.
      *
-     * If the key is not explicitly set, it'll be assumed to be a single
-     * null byte.
-     *
-     * @see \phpseclib\Crypt\Base::setKey()
-     * @access public
+<<<<<<< HEAD
+     * @throws LengthException if the key length isn't supported
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::setKey()
+=======
+     * @see Common\SymmetricKey::setKey()
      * @param string $key
-     * @param int $t1 optional Effective key length in bits.
+     * @param int|boolean $t1 optional Effective key length in bits.
+     * @throws \LengthException if the key length isn't supported
+>>>>>>> 3.0
      */
-    function setKey($key, $t1 = 0)
+    public function setKey(string $key, ?int $t1 = null): void
     {
         $this->orig_key = $key;
 
-        if ($t1 <= 0) {
+        if ($t1 === null) {
             $t1 = $this->default_key_length;
-        } elseif ($t1 > 1024) {
-            $t1 = 1024;
         }
+
+        if ($t1 < 1 || $t1 > 1024) {
+            throw new LengthException('Key size of ' . $t1 . ' bits is not supported by this algorithm. Only keys between 1 and 1024 bits, inclusive, are supported');
+        }
+
         $this->current_key_length = $t1;
-        // Key byte count should be 1..128.
-        $key = strlen($key) ? substr($key, 0, 128) : "\x00";
+        if (strlen($key) < 1 || strlen($key) > 128) {
+            throw new LengthException('Key of size ' . strlen($key) . ' not supported by this algorithm. Only keys of sizes between 8 and 1024 bits, inclusive, are supported');
+        }
+
         $t = strlen($key);
 
         // The mcrypt RC2 implementation only supports effective key length
@@ -355,7 +371,7 @@ function setKey($key, $t1 = 0)
         $tm = 0xFF >> (8 * $t8 - $t1);
 
         // Expand key.
-        $pitable = $this->pitable;
+        $pitable = self::$pitable;
         for ($i = $t; $i < 128; $i++) {
             $l[$i] = $pitable[$l[$i - 1] + $l[$i - $t]];
         }
@@ -366,23 +382,24 @@ function setKey($key, $t1 = 0)
         }
 
         // Prepare the key for mcrypt.
-        $l[0] = $this->invpitable[$l[0]];
+        $l[0] = self::$invpitable[$l[0]];
         array_unshift($l, 'C*');
 
-        parent::setKey(call_user_func_array('pack', $l));
+        $this->key = pack(...$l);
+        $this->key_length = strlen($this->key);
+        $this->changed = $this->nonIVChanged = true;
+        $this->setEngine();
     }
 
     /**
      * Encrypts a message.
      *
-     * Mostly a wrapper for \phpseclib\Crypt\Base::encrypt, with some additional OpenSSL handling code
+     * Mostly a wrapper for \phpseclib3\Crypt\Common\SymmetricKey::encrypt, with some additional OpenSSL handling code
      *
-     * @see self::decrypt()
-     * @access public
-     * @param string $plaintext
      * @return string $ciphertext
+     * @see self::decrypt()
      */
-    function encrypt($plaintext)
+    public function encrypt(string $plaintext): string
     {
         if ($this->engine == self::ENGINE_OPENSSL) {
             $temp = $this->key;
@@ -398,14 +415,12 @@ function encrypt($plaintext)
     /**
      * Decrypts a message.
      *
-     * Mostly a wrapper for \phpseclib\Crypt\Base::decrypt, with some additional OpenSSL handling code
+     * Mostly a wrapper for \phpseclib3\Crypt\Common\SymmetricKey::decrypt, with some additional OpenSSL handling code
      *
-     * @see self::encrypt()
-     * @access public
-     * @param string $ciphertext
      * @return string $plaintext
+     * @see self::encrypt()
      */
-    function decrypt($ciphertext)
+    public function decrypt(string $ciphertext): string
     {
         if ($this->engine == self::ENGINE_OPENSSL) {
             $temp = $this->key;
@@ -415,24 +430,28 @@ function decrypt($ciphertext)
             return $result;
         }
 
-        return parent::encrypt($ciphertext);
+        return parent::decrypt($ciphertext);
     }
 
     /**
      * Encrypts a block
      *
-     * @see \phpseclib\Crypt\Base::_encryptBlock()
-     * @see \phpseclib\Crypt\Base::encrypt()
-     * @access private
+<<<<<<< HEAD
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::encryptBlock()
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
+=======
+     * @see Common\SymmetricKey::encryptBlock()
+     * @see Common\SymmetricKey::encrypt()
      * @param string $in
      * @return string
+>>>>>>> 3.0
      */
-    function _encryptBlock($in)
+    protected function encryptBlock(string $in): string
     {
-        list($r0, $r1, $r2, $r3) = array_values(unpack('v*', $in));
+        [$r0, $r1, $r2, $r3] = array_values(unpack('v*', $in));
         $keys = $this->keys;
         $limit = 20;
-        $actions = array($limit => 44, 44 => 64);
+        $actions = [$limit => 44, 44 => 64];
         $j = 0;
 
         for (;;) {
@@ -466,18 +485,22 @@ function _encryptBlock($in)
     /**
      * Decrypts a block
      *
-     * @see \phpseclib\Crypt\Base::_decryptBlock()
-     * @see \phpseclib\Crypt\Base::decrypt()
-     * @access private
+<<<<<<< HEAD
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::decryptBlock()
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
+=======
+     * @see Common\SymmetricKey::decryptBlock()
+     * @see Common\SymmetricKey::decrypt()
      * @param string $in
      * @return string
+>>>>>>> 3.0
      */
-    function _decryptBlock($in)
+    protected function decryptBlock(string $in): string
     {
-        list($r0, $r1, $r2, $r3) = array_values(unpack('v*', $in));
+        [$r0, $r1, $r2, $r3] = array_values(unpack('v*', $in));
         $keys = $this->keys;
         $limit = 44;
-        $actions = array($limit => 20, 20 => 0);
+        $actions = [$limit => 20, 20 => 0];
         $j = 64;
 
         for (;;) {
@@ -508,37 +531,21 @@ function _decryptBlock($in)
         return pack('vvvv', $r0, $r1, $r2, $r3);
     }
 
-    /**
-     * Setup the \phpseclib\Crypt\Base::ENGINE_MCRYPT $engine
-     *
-     * @see \phpseclib\Crypt\Base::_setupMcrypt()
-     * @access private
-     */
-    function _setupMcrypt()
-    {
-        if (!isset($this->key)) {
-            $this->setKey('');
-        }
-
-        parent::_setupMcrypt();
-    }
-
     /**
      * Creates the key schedule
      *
-     * @see \phpseclib\Crypt\Base::_setupKey()
-     * @access private
+     * @see Common\SymmetricKey::setupKey()
      */
-    function _setupKey()
+    protected function setupKey(): void
     {
         if (!isset($this->key)) {
             $this->setKey('');
         }
 
-        // Key has already been expanded in \phpseclib\Crypt\RC2::setKey():
+        // Key has already been expanded in \phpseclib3\Crypt\RC2::setKey():
         // Only the first value must be altered.
         $l = unpack('Ca/Cb/v*', $this->key);
-        array_unshift($l, $this->pitable[$l['a']] | ($l['b'] << 8));
+        array_unshift($l, self::$pitable[$l['a']] | ($l['b'] << 8));
         unset($l['a']);
         unset($l['b']);
         $this->keys = $l;
@@ -547,137 +554,107 @@ function _setupKey()
     /**
      * Setup the performance-optimized function for de/encrypt()
      *
-     * @see \phpseclib\Crypt\Base::_setupInlineCrypt()
-     * @access private
+     * @see Common\SymmetricKey::setupInlineCrypt()
      */
-    function _setupInlineCrypt()
+    protected function setupInlineCrypt(): void
     {
-        $lambda_functions =& self::_getLambdaFunctions();
-
-        // The first 10 generated $lambda_functions will use the $keys hardcoded as integers
-        // for the mixing rounds, for better inline crypt performance [~20% faster].
-        // But for memory reason we have to limit those ultra-optimized $lambda_functions to an amount of 10.
-        // (Currently, for Crypt_RC2, one generated $lambda_function cost on php5.5@32bit ~60kb unfreeable mem and ~100kb on php5.5@64bit)
-        $gen_hi_opt_code = (bool)(count($lambda_functions) < 10);
-
-        // Generation of a uniqe hash for our generated code
-        $code_hash = "Crypt_RC2, {$this->mode}";
-        if ($gen_hi_opt_code) {
-            $code_hash = str_pad($code_hash, 32) . $this->_hashInlineCryptFunction($this->key);
-        }
+        // Init code for both, encrypt and decrypt.
+        $init_crypt = '$keys = $this->keys;';
 
-        // Is there a re-usable $lambda_functions in there?
-        // If not, we have to create it.
-        if (!isset($lambda_functions[$code_hash])) {
-            // Init code for both, encrypt and decrypt.
-            $init_crypt = '$keys = $self->keys;';
-
-            switch (true) {
-                case $gen_hi_opt_code:
-                    $keys = $this->keys;
-                default:
-                    $keys = array();
-                    foreach ($this->keys as $k => $v) {
-                        $keys[$k] = '$keys[' . $k . ']';
-                    }
-            }
+        $keys = $this->keys;
 
-            // $in is the current 8 bytes block which has to be en/decrypt
-            $encrypt_block = $decrypt_block = '
-                $in = unpack("v4", $in);
-                $r0 = $in[1];
-                $r1 = $in[2];
-                $r2 = $in[3];
-                $r3 = $in[4];
-            ';
-
-            // Create code for encryption.
-            $limit = 20;
-            $actions = array($limit => 44, 44 => 64);
-            $j = 0;
-
-            for (;;) {
-                // Mixing round.
-                $encrypt_block .= '
-                    $r0 = (($r0 + ' . $keys[$j++] . ' +
-                           ((($r1 ^ $r2) & $r3) ^ $r1)) & 0xFFFF) << 1;
-                    $r0 |= $r0 >> 16;
-                    $r1 = (($r1 + ' . $keys[$j++] . ' +
-                           ((($r2 ^ $r3) & $r0) ^ $r2)) & 0xFFFF) << 2;
-                    $r1 |= $r1 >> 16;
-                    $r2 = (($r2 + ' . $keys[$j++] . ' +
-                           ((($r3 ^ $r0) & $r1) ^ $r3)) & 0xFFFF) << 3;
-                    $r2 |= $r2 >> 16;
-                    $r3 = (($r3 + ' . $keys[$j++] . ' +
-                           ((($r0 ^ $r1) & $r2) ^ $r0)) & 0xFFFF) << 5;
-                    $r3 |= $r3 >> 16;';
-
-                if ($j === $limit) {
-                    if ($limit === 64) {
-                        break;
-                    }
-
-                    // Mashing round.
-                    $encrypt_block .= '
-                        $r0 += $keys[$r3 & 0x3F];
-                        $r1 += $keys[$r0 & 0x3F];
-                        $r2 += $keys[$r1 & 0x3F];
-                        $r3 += $keys[$r2 & 0x3F];';
-                    $limit = $actions[$limit];
-                }
-            }
+        // $in is the current 8 bytes block which has to be en/decrypt
+        $encrypt_block = $decrypt_block = '
+            $in = unpack("v4", $in);
+            $r0 = $in[1];
+            $r1 = $in[2];
+            $r2 = $in[3];
+            $r3 = $in[4];
+        ';
 
-            $encrypt_block .= '$in = pack("v4", $r0, $r1, $r2, $r3);';
+        // Create code for encryption.
+        $limit = 20;
+        $actions = [$limit => 44, 44 => 64];
+        $j = 0;
 
-            // Create code for decryption.
-            $limit = 44;
-            $actions = array($limit => 20, 20 => 0);
-            $j = 64;
+        for (;;) {
+            // Mixing round.
+            $encrypt_block .= '
+                $r0 = (($r0 + ' . $keys[$j++] . ' +
+                       ((($r1 ^ $r2) & $r3) ^ $r1)) & 0xFFFF) << 1;
+                $r0 |= $r0 >> 16;
+                $r1 = (($r1 + ' . $keys[$j++] . ' +
+                       ((($r2 ^ $r3) & $r0) ^ $r2)) & 0xFFFF) << 2;
+                $r1 |= $r1 >> 16;
+                $r2 = (($r2 + ' . $keys[$j++] . ' +
+                       ((($r3 ^ $r0) & $r1) ^ $r3)) & 0xFFFF) << 3;
+                $r2 |= $r2 >> 16;
+                $r3 = (($r3 + ' . $keys[$j++] . ' +
+                       ((($r0 ^ $r1) & $r2) ^ $r0)) & 0xFFFF) << 5;
+                $r3 |= $r3 >> 16;';
 
-            for (;;) {
-                // R-mixing round.
-                $decrypt_block .= '
-                    $r3 = ($r3 | ($r3 << 16)) >> 5;
-                    $r3 = ($r3 - ' . $keys[--$j] . ' -
-                           ((($r0 ^ $r1) & $r2) ^ $r0)) & 0xFFFF;
-                    $r2 = ($r2 | ($r2 << 16)) >> 3;
-                    $r2 = ($r2 - ' . $keys[--$j] . ' -
-                           ((($r3 ^ $r0) & $r1) ^ $r3)) & 0xFFFF;
-                    $r1 = ($r1 | ($r1 << 16)) >> 2;
-                    $r1 = ($r1 - ' . $keys[--$j] . ' -
-                           ((($r2 ^ $r3) & $r0) ^ $r2)) & 0xFFFF;
-                    $r0 = ($r0 | ($r0 << 16)) >> 1;
-                    $r0 = ($r0 - ' . $keys[--$j] . ' -
-                           ((($r1 ^ $r2) & $r3) ^ $r1)) & 0xFFFF;';
-
-                if ($j === $limit) {
-                    if ($limit === 0) {
-                        break;
-                    }
-
-                    // R-mashing round.
-                    $decrypt_block .= '
-                        $r3 = ($r3 - $keys[$r2 & 0x3F]) & 0xFFFF;
-                        $r2 = ($r2 - $keys[$r1 & 0x3F]) & 0xFFFF;
-                        $r1 = ($r1 - $keys[$r0 & 0x3F]) & 0xFFFF;
-                        $r0 = ($r0 - $keys[$r3 & 0x3F]) & 0xFFFF;';
-                    $limit = $actions[$limit];
+            if ($j === $limit) {
+                if ($limit === 64) {
+                    break;
                 }
+
+                // Mashing round.
+                $encrypt_block .= '
+                    $r0 += $keys[$r3 & 0x3F];
+                    $r1 += $keys[$r0 & 0x3F];
+                    $r2 += $keys[$r1 & 0x3F];
+                    $r3 += $keys[$r2 & 0x3F];';
+                $limit = $actions[$limit];
             }
+        }
+
+        $encrypt_block .= '$in = pack("v4", $r0, $r1, $r2, $r3);';
+
+        // Create code for decryption.
+        $limit = 44;
+        $actions = [$limit => 20, 20 => 0];
+        $j = 64;
 
-            $decrypt_block .= '$in = pack("v4", $r0, $r1, $r2, $r3);';
+        for (;;) {
+            // R-mixing round.
+            $decrypt_block .= '
+                $r3 = ($r3 | ($r3 << 16)) >> 5;
+                $r3 = ($r3 - ' . $keys[--$j] . ' -
+                       ((($r0 ^ $r1) & $r2) ^ $r0)) & 0xFFFF;
+                $r2 = ($r2 | ($r2 << 16)) >> 3;
+                $r2 = ($r2 - ' . $keys[--$j] . ' -
+                       ((($r3 ^ $r0) & $r1) ^ $r3)) & 0xFFFF;
+                $r1 = ($r1 | ($r1 << 16)) >> 2;
+                $r1 = ($r1 - ' . $keys[--$j] . ' -
+                       ((($r2 ^ $r3) & $r0) ^ $r2)) & 0xFFFF;
+                $r0 = ($r0 | ($r0 << 16)) >> 1;
+                $r0 = ($r0 - ' . $keys[--$j] . ' -
+                       ((($r1 ^ $r2) & $r3) ^ $r1)) & 0xFFFF;';
 
-            // Creates the inline-crypt function
-            $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
-                array(
-                   'init_crypt'    => $init_crypt,
-                   'encrypt_block' => $encrypt_block,
-                   'decrypt_block' => $decrypt_block
-                )
-            );
+            if ($j === $limit) {
+                if ($limit === 0) {
+                    break;
+                }
+
+                // R-mashing round.
+                $decrypt_block .= '
+                    $r3 = ($r3 - $keys[$r2 & 0x3F]) & 0xFFFF;
+                    $r2 = ($r2 - $keys[$r1 & 0x3F]) & 0xFFFF;
+                    $r1 = ($r1 - $keys[$r0 & 0x3F]) & 0xFFFF;
+                    $r0 = ($r0 - $keys[$r3 & 0x3F]) & 0xFFFF;';
+                $limit = $actions[$limit];
+            }
         }
 
-        // Set the inline-crypt function as callback in: $this->inline_crypt
-        $this->inline_crypt = $lambda_functions[$code_hash];
+        $decrypt_block .= '$in = pack("v4", $r0, $r1, $r2, $r3);';
+
+        // Creates the inline-crypt function
+        $this->inline_crypt = $this->createInlineCryptFunction(
+            [
+               'init_crypt'    => $init_crypt,
+               'encrypt_block' => $encrypt_block,
+               'decrypt_block' => $decrypt_block,
+            ]
+        );
     }
 }
diff --git a/phpseclib/Crypt/RC4.php b/phpseclib/Crypt/RC4.php
index b24129d2c..c31e37e39 100644
--- a/phpseclib/Crypt/RC4.php
+++ b/phpseclib/Crypt/RC4.php
@@ -3,7 +3,7 @@
 /**
  * Pure-PHP implementation of RC4.
  *
- * Uses mcrypt, if available, and an internal implementation, otherwise.
+ * Uses OpenSSL, if available/possible, and an internal implementation, otherwise
  *
  * PHP version 5
  *
@@ -20,7 +20,7 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $rc4 = new \phpseclib\Crypt\RC4();
+ *    $rc4 = new \phpseclib3\Crypt\RC4();
  *
  *    $rc4->setKey('abcdefgh');
  *
@@ -34,197 +34,131 @@
  * ?>
  * </code>
  *
- * @category  Crypt
- * @package   RC4
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2007 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\Crypt;
+declare(strict_types=1);
 
-use phpseclib\Crypt\Base;
+namespace phpseclib3\Crypt;
+
+use phpseclib3\Crypt\Common\StreamCipher;
+use phpseclib3\Exception\LengthException;
 
 /**
  * Pure-PHP implementation of RC4.
  *
- * @package RC4
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
-class RC4 extends Base
+class RC4 extends StreamCipher
 {
-    /**#@+
-     * @access private
-     * @see \phpseclib\Crypt\RC4::_crypt()
-    */
-    const ENCRYPT = 0;
-    const DECRYPT = 1;
-    /**#@-*/
-
-    /**
-     * Block Length of the cipher
-     *
-     * RC4 is a stream cipher
-     * so we the block_size to 0
-     *
-     * @see \phpseclib\Crypt\Base::block_size
-     * @var int
-     * @access private
-     */
-    var $block_size = 0;
-
     /**
-     * Key Length (in bytes)
-     *
-     * @see \phpseclib\Crypt\RC4::setKeyLength()
-     * @var int
-     * @access private
+     * @see \phpseclib3\Crypt\RC4::_crypt()
      */
-    var $key_length = 128; // = 1024 bits
+    public const ENCRYPT = 0;
 
     /**
-     * The mcrypt specific name of the cipher
-     *
-     * @see \phpseclib\Crypt\Base::cipher_name_mcrypt
-     * @var string
-     * @access private
+     * @see \phpseclib3\Crypt\RC4::_crypt()
      */
-    var $cipher_name_mcrypt = 'arcfour';
+    public const DECRYPT = 1;
 
     /**
-     * Holds whether performance-optimized $inline_crypt() can/should be used.
+     * Key Length (in bytes)
      *
-     * @see \phpseclib\Crypt\Base::inline_crypt
-     * @var mixed
-     * @access private
+     * @see \phpseclib3\Crypt\RC4::setKeyLength()
+     * @var int
      */
-    var $use_inline_crypt = false; // currently not available
+    protected $key_length = 128; // = 1024 bits
 
     /**
      * The Key
      *
      * @see self::setKey()
      * @var string
-     * @access private
      */
-    var $key = "\0";
+    protected $key;
 
     /**
      * The Key Stream for decryption and encryption
      *
      * @see self::setKey()
      * @var array
-     * @access private
-     */
-    var $stream;
-
-    /**
-     * Default Constructor.
-     *
-     * Determines whether or not the mcrypt extension should be used.
-     *
-     * @see \phpseclib\Crypt\Base::__construct()
-     * @return \phpseclib\Crypt\RC4
-     * @access public
      */
-    function __construct()
-    {
-        parent::__construct(Base::MODE_STREAM);
-    }
+    private $stream;
 
     /**
      * Test for engine validity
      *
-     * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
+     * This is mainly just a wrapper to set things up for \phpseclib3\Crypt\Common\SymmetricKey::isValidEngine()
      *
-     * @see \phpseclib\Crypt\Base::__construct()
-     * @param int $engine
-     * @access public
-     * @return bool
+     * @see Common\SymmetricKey::__construct()
      */
-    function isValidEngine($engine)
+    protected function isValidEngineHelper(int $engine): bool
     {
-        switch ($engine) {
-            case Base::ENGINE_OPENSSL:
-                switch (strlen($this->key)) {
-                    case 5:
-                        $this->cipher_name_openssl = 'rc4-40';
-                        break;
-                    case 8:
-                        $this->cipher_name_openssl = 'rc4-64';
-                        break;
-                    case 16:
-                        $this->cipher_name_openssl = 'rc4';
-                        break;
-                    default:
-                        return false;
-                }
+        if ($engine == self::ENGINE_OPENSSL) {
+            if ($this->continuousBuffer) {
+                return false;
+            }
+            // quoting https://www.openssl.org/news/openssl-3.0-notes.html, OpenSSL 3.0.1
+            // "Moved all variations of the EVP ciphers CAST5, BF, IDEA, SEED, RC2, RC4, RC5, and DES to the legacy provider"
+            // in theory openssl_get_cipher_methods() should catch this but, on GitHub Actions, at least, it does not
+            if (defined('OPENSSL_VERSION_TEXT') && version_compare(preg_replace('#OpenSSL (\d+\.\d+\.\d+) .*#', '$1', OPENSSL_VERSION_TEXT), '3.0.1', '>=')) {
+                return false;
+            }
+            $this->cipher_name_openssl = 'rc4-40';
         }
 
-        return parent::isValidEngine($engine);
+        return parent::isValidEngineHelper($engine);
     }
 
     /**
-     * Dummy function.
-     *
-     * Some protocols, such as WEP, prepend an "initialization vector" to the key, effectively creating a new key [1].
-     * If you need to use an initialization vector in this manner, feel free to prepend it to the key, yourself, before
-     * calling setKey().
-     *
-     * [1] WEP's initialization vectors (IV's) are used in a somewhat insecure way.  Since, in that protocol,
-     * the IV's are relatively easy to predict, an attack described by
-     * {@link http://www.drizzle.com/~aboba/IEEE/rc4_ksaproc.pdf Scott Fluhrer, Itsik Mantin, and Adi Shamir}
-     * can be used to quickly guess at the rest of the key.  The following links elaborate:
+     * Sets the key length
      *
-     * {@link http://www.rsa.com/rsalabs/node.asp?id=2009 http://www.rsa.com/rsalabs/node.asp?id=2009}
-     * {@link http://en.wikipedia.org/wiki/Related_key_attack http://en.wikipedia.org/wiki/Related_key_attack}
+     * Keys can be between 1 and 256 bytes long.
      *
-     * @param string $iv
-     * @see self::setKey()
-     * @access public
+     * @throws LengthException if the key length is invalid
      */
-    function setIV($iv)
+    public function setKeyLength(int $length): void
     {
+        if ($length < 8 || $length > 2048) {
+            throw new LengthException('Key size of ' . $length . ' bits is not supported by this algorithm. Only keys between 1 and 256 bytes are supported');
+        }
+
+        $this->key_length = $length >> 3;
+
+        parent::setKeyLength($length);
     }
 
     /**
      * Sets the key length
      *
      * Keys can be between 1 and 256 bytes long.
-     *
-     * @access public
-     * @param int $length
      */
-    function setKeyLength($length)
+    public function setKey(string $key): void
     {
-        if ($length < 8) {
-            $this->key_length = 1;
-        } elseif ($length > 2048) {
-            $this->key_length = 248;
-        } else {
-            $this->key_length = $length >> 3;
+        $length = strlen($key);
+        if ($length < 1 || $length > 256) {
+            throw new LengthException('Key size of ' . $length . ' bytes is not supported by RC4. Keys must be between 1 and 256 bytes long');
         }
 
-        parent::setKeyLength($length);
+        parent::setKey($key);
     }
 
     /**
      * Encrypts a message.
      *
-     * @see \phpseclib\Crypt\Base::decrypt()
-     * @see self::_crypt()
-     * @access public
-     * @param string $plaintext
      * @return string $ciphertext
+     * @see Common\SymmetricKey::decrypt()
+     * @see self::crypt()
      */
-    function encrypt($plaintext)
+    public function encrypt(string $plaintext): string
     {
-        if ($this->engine != Base::ENGINE_INTERNAL) {
+        if ($this->engine != self::ENGINE_INTERNAL) {
             return parent::encrypt($plaintext);
         }
-        return $this->_crypt($plaintext, self::ENCRYPT);
+        return $this->crypt($plaintext, self::ENCRYPT);
     }
 
     /**
@@ -233,49 +167,42 @@ function encrypt($plaintext)
      * $this->decrypt($this->encrypt($plaintext)) == $this->encrypt($this->encrypt($plaintext)).
      * At least if the continuous buffer is disabled.
      *
-     * @see \phpseclib\Crypt\Base::encrypt()
-     * @see self::_crypt()
-     * @access public
-     * @param string $ciphertext
      * @return string $plaintext
+     * @see Common\SymmetricKey::encrypt()
+     * @see self::crypt()
      */
-    function decrypt($ciphertext)
+    public function decrypt(string $ciphertext): string
     {
-        if ($this->engine != Base::ENGINE_INTERNAL) {
+        if ($this->engine != self::ENGINE_INTERNAL) {
             return parent::decrypt($ciphertext);
         }
-        return $this->_crypt($ciphertext, self::DECRYPT);
+        return $this->crypt($ciphertext, self::DECRYPT);
     }
 
     /**
      * Encrypts a block
-     *
-     * @access private
-     * @param string $in
      */
-    function _encryptBlock($in)
+    protected function encryptBlock(string $in): string
     {
         // RC4 does not utilize this method
+        return '';
     }
 
     /**
      * Decrypts a block
-     *
-     * @access private
-     * @param string $in
      */
-    function _decryptBlock($in)
+    protected function decryptBlock(string $in): string
     {
         // RC4 does not utilize this method
+        return '';
     }
 
     /**
      * Setup the key (expansion)
      *
-     * @see \phpseclib\Crypt\Base::_setupKey()
-     * @access private
+     * @see Common\SymmetricKey::_setupKey()
      */
-    function _setupKey()
+    protected function setupKey(): void
     {
         $key = $this->key;
         $keyLength = strlen($key);
@@ -288,29 +215,25 @@ function _setupKey()
             $keyStream[$j] = $temp;
         }
 
-        $this->stream = array();
-        $this->stream[self::DECRYPT] = $this->stream[self::ENCRYPT] = array(
+        $this->stream = [];
+        $this->stream[self::DECRYPT] = $this->stream[self::ENCRYPT] = [
             0, // index $i
             0, // index $j
-            $keyStream
-        );
+            $keyStream,
+        ];
     }
 
     /**
      * Encrypts or decrypts a message.
      *
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @access private
-     * @param string $text
-     * @param int $mode
      * @return string $text
+     * @see self::decrypt()
+     * @see self::encrypt()
      */
-    function _crypt($text, $mode)
+    private function crypt(string $text, int $mode): string
     {
         if ($this->changed) {
-            $this->_setup();
-            $this->changed = false;
+            $this->setup();
         }
 
         $stream = &$this->stream[$mode];
diff --git a/phpseclib/Crypt/RSA.php b/phpseclib/Crypt/RSA.php
index c05da5041..7841e78e4 100644
--- a/phpseclib/Crypt/RSA.php
+++ b/phpseclib/Crypt/RSA.php
@@ -10,13 +10,14 @@
  * <?php
  * include 'vendor/autoload.php';
  *
- * extract(\phpseclib\Crypt\RSA::::createKey());
+ * $private = \phpseclib3\Crypt\RSA::createKey();
+ * $public = $private->getPublicKey();
  *
  * $plaintext = 'terrafrost';
  *
- * $ciphertext = $publickey->encrypt($plaintext);
+ * $ciphertext = $public->encrypt($plaintext);
  *
- * echo $privatekey->decrypt($ciphertext);
+ * echo $private->decrypt($ciphertext);
  * ?>
  * </code>
  *
@@ -25,569 +26,337 @@
  * <?php
  * include 'vendor/autoload.php';
  *
- * extract(\phpseclib\Crypt\RSA::createKey());
+ * $private = \phpseclib3\Crypt\RSA::createKey();
+ * $public = $private->getPublicKey();
  *
  * $plaintext = 'terrafrost';
  *
- * $signature = $privatekey->sign($plaintext);
+ * $signature = $private->sign($plaintext);
  *
- * echo $publickey->verify($plaintext, $signature) ? 'verified' : 'unverified';
+ * echo $public->verify($plaintext, $signature) ? 'verified' : 'unverified';
  * ?>
  * </code>
  *
- * @category  Crypt
- * @package   RSA
+ * One thing to consider when using this: so phpseclib uses PSS mode by default.
+ * Technically, id-RSASSA-PSS has a different key format than rsaEncryption. So
+ * should phpseclib save to the id-RSASSA-PSS format by default or the
+ * rsaEncryption format? For stand-alone keys I figure rsaEncryption is better
+ * because SSH doesn't use PSS and idk how many SSH servers would be able to
+ * decode an id-RSASSA-PSS key. For X.509 certificates the id-RSASSA-PSS
+ * format is used by default (unless you change it up to use PKCS1 instead)
+ *
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2009 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\Crypt;
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt;
 
-use phpseclib\Crypt\Hash;
-use phpseclib\Crypt\Random;
-use phpseclib\Math\BigInteger;
+use phpseclib3\Crypt\Common\AsymmetricKey;
+use phpseclib3\Crypt\RSA\Formats\Keys\PSS;
+use phpseclib3\Crypt\RSA\PrivateKey;
+use phpseclib3\Crypt\RSA\PublicKey;
+use phpseclib3\Exception\InconsistentSetupException;
+use phpseclib3\Exception\LengthException;
+use phpseclib3\Exception\OutOfRangeException;
+use phpseclib3\Exception\UnsupportedAlgorithmException;
+use phpseclib3\Math\BigInteger;
 
 /**
  * Pure-PHP PKCS#1 compliant implementation of RSA.
  *
- * @package RSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
-class RSA
+abstract class RSA extends AsymmetricKey
 {
-    /**#@+
-     * @access public
-     * @see self::encrypt()
-     * @see self::decrypt()
+    /**
+     * Algorithm Name
+     *
+     * @var string
      */
+    public const ALGORITHM = 'RSA';
+
     /**
      * Use {@link http://en.wikipedia.org/wiki/Optimal_Asymmetric_Encryption_Padding Optimal Asymmetric Encryption Padding}
      * (OAEP) for encryption / decryption.
      *
-     * Uses sha1 by default.
+     * Uses sha256 by default
      *
      * @see self::setHash()
      * @see self::setMGFHash()
+     * @see self::encrypt()
+     * @see self::decrypt()
      */
-    const ENCRYPTION_OAEP = 1;
+    public const ENCRYPTION_OAEP = 1;
+
     /**
      * Use PKCS#1 padding.
      *
-     * Although self::ENCRYPTION_OAEP offers more security, including PKCS#1 padding is necessary for purposes of backwards
+     * Although self::PADDING_OAEP / self::PADDING_PSS  offers more security, including PKCS#1 padding is necessary for purposes of backwards
      * compatibility with protocols (like SSH-1) written before OAEP's introduction.
+     *
+     * @see self::encrypt()
+     * @see self::decrypt()
      */
-    const ENCRYPTION_PKCS1 = 2;
+    public const ENCRYPTION_PKCS1 = 2;
+
     /**
      * Do not use any padding
      *
      * Although this method is not recommended it can none-the-less sometimes be useful if you're trying to decrypt some legacy
      * stuff, if you're trying to diagnose why an encrypted message isn't decrypting, etc.
+     *
+     * @see self::encrypt()
+     * @see self::decrypt()
      */
-    const ENCRYPTION_NONE = 3;
-    /**#@-*/
+    public const ENCRYPTION_NONE = 4;
 
-    /**#@+
-     * @access public
-     * @see self::sign()
-     * @see self::verify()
-     * @see self::setHash()
-     */
     /**
      * Use the Probabilistic Signature Scheme for signing
      *
-     * Uses sha1 by default.
+     * Uses sha256 and 0 as the salt length
      *
      * @see self::setSaltLength()
      * @see self::setMGFHash()
+     * @see self::setHash()
+     * @see self::sign()
+     * @see self::verify()
+     * @see self::setHash()
      */
-    const SIGNATURE_PSS = 1;
-    /**
-     * Use the PKCS#1 scheme by default.
-     *
-     * Although self::SIGNATURE_PSS offers more security, including PKCS#1 signing is necessary for purposes of backwards
-     * compatibility with protocols (like SSH-2) written before PSS's introduction.
-     */
-    const SIGNATURE_PKCS1 = 2;
-    /**#@-*/
-
-    /**#@+
-     * @access private
-     * @see self::createKey()
-     */
-    /**
-     * ASN1 Integer
-     */
-    const ASN1_INTEGER = 2;
-    /**
-     * ASN1 Bit String
-     */
-    const ASN1_BITSTRING = 3;
-    /**
-     * ASN1 Octet String
-     */
-    const ASN1_OCTETSTRING = 4;
-    /**
-     * ASN1 Object Identifier
-     */
-    const ASN1_OBJECT = 6;
-    /**
-     * ASN1 Sequence (with the constucted bit set)
-     */
-    const ASN1_SEQUENCE = 48;
-    /**#@-*/
-
-    /**#@+
-     * @access private
-     * @see self::__construct()
-     */
-    /**
-     * To use the pure-PHP implementation
-     */
-    const MODE_INTERNAL = 1;
-    /**
-     * To use the OpenSSL library
-     *
-     * (if enabled; otherwise, the internal implementation will be used)
-     */
-    const MODE_OPENSSL = 2;
-    /**#@-*/
-
-    /**
-     * Precomputed Zero
-     *
-     * @var array
-     * @access private
-     */
-    static $zero;
-
-    /**
-     * Precomputed One
-     *
-     * @var array
-     * @access private
-     */
-    static $one;
-
-    /**
-     * Private Key Format
-     *
-     * @var string
-     * @access private
-     */
-    var $privateKeyFormat = 'PKCS1';
-
-    /**
-     * Public Key Format
-     *
-     * @var string
-     * @access private
-     */
-    var $publicKeyFormat = 'PKCS8';
+    public const SIGNATURE_PSS = 16;
 
     /**
-     * Modulus (ie. n)
+     * Use a relaxed version of PKCS#1 padding for signature verification
      *
-     * @var \phpseclib\Math\BigInteger
-     * @access private
+     * @see self::sign()
+     * @see self::verify()
+     * @see self::setHash()
      */
-    var $modulus;
+    public const SIGNATURE_RELAXED_PKCS1 = 32;
 
     /**
-     * Modulus length
+     * Use PKCS#1 padding for signature verification
      *
-     * @var \phpseclib\Math\BigInteger
-     * @access private
+     * @see self::sign()
+     * @see self::verify()
+     * @see self::setHash()
      */
-    var $k;
+    public const SIGNATURE_PKCS1 = 64;
 
     /**
-     * Exponent (ie. e or d)
+     * Encryption padding mode
      *
-     * @var \phpseclib\Math\BigInteger
-     * @access private
+     * @var int
      */
-    var $exponent;
+    protected $encryptionPadding = self::ENCRYPTION_OAEP;
 
     /**
-     * Primes for Chinese Remainder Theorem (ie. p and q)
+     * Signature padding mode
      *
-     * @var array
-     * @access private
+     * @var int
      */
-    var $primes;
+    protected $signaturePadding = self::SIGNATURE_PSS;
 
     /**
-     * Exponents for Chinese Remainder Theorem (ie. dP and dQ)
+     * Length of hash function output
      *
-     * @var array
-     * @access private
+     * @var int
      */
-    var $exponents;
+    protected $hLen;
 
     /**
-     * Coefficients for Chinese Remainder Theorem (ie. qInv)
+     * Length of salt
      *
-     * @var array
-     * @access private
+     * @var int|null
      */
-    var $coefficients;
+    protected $sLen = null;
 
     /**
-     * Hash name
+     * Label
      *
      * @var string
-     * @access private
-     */
-    var $hashName;
-
-    /**
-     * Hash function
-     *
-     * @var \phpseclib\Crypt\Hash
-     * @access private
      */
-    var $hash;
+    protected $label = '';
 
     /**
-     * Length of hash function output
+     * Hash function for the Mask Generation Function
      *
-     * @var int
-     * @access private
+     * @var Hash
      */
-    var $hLen;
+    protected $mgfHash;
 
     /**
-     * Length of salt
+     * Length of MGF hash function output
      *
      * @var int
-     * @access private
      */
-    var $sLen;
+    protected $mgfHLen;
 
     /**
-     * Hash function for the Mask Generation Function
+     * Modulus (ie. n)
      *
-     * @var \phpseclib\Crypt\Hash
-     * @access private
+     * @var BigInteger
      */
-    var $mgfHash;
+    protected $modulus;
 
     /**
-     * Length of MGF hash function output
+     * Modulus length
      *
      * @var int
-     * @access private
      */
-    var $mgfHLen;
+    protected $k;
 
     /**
-     * Encryption mode
+     * Exponent (ie. e or d)
      *
-     * @var int
-     * @access private
+     * @var BigInteger
      */
-    var $encryptionMode = self::ENCRYPTION_OAEP;
+    protected $exponent;
 
     /**
-     * Signature mode
+     * Default public exponent
      *
      * @var int
-     * @access private
+     * @link http://en.wikipedia.org/wiki/65537_%28number%29
      */
-    var $signatureMode = self::SIGNATURE_PSS;
+    private static $defaultExponent = 65537;
 
     /**
-     * Public Exponent
-     *
-     * @var mixed
-     * @access private
-     */
-    var $publicExponent = false;
-
-    /**
-     * Password
+     * Enable Blinding?
      *
-     * @var string
-     * @access private
+     * @var bool
      */
-    var $password = false;
+    protected static $enableBlinding = true;
 
     /**
-     * Loaded File Format
+     * OpenSSL configuration file name.
      *
-     * @var string
-     * @access private
+     * @see self::createKey()
+     * @var ?string
      */
-    var $format = false;
+    protected static $configFile;
 
     /**
-     * OpenSSL configuration file name.
+     * Smallest Prime
      *
-     * Set to null to use system configuration file.
+     * Per <http://cseweb.ucsd.edu/~hovav/dist/survey.pdf#page=5>, this number ought not result in primes smaller
+     * than 256 bits. As a consequence if the key you're trying to create is 1024 bits and you've set smallestPrime
+     * to 384 bits then you're going to get a 384 bit prime and a 640 bit prime (384 + 1024 % 384). At least if
+     * engine is set to self::ENGINE_INTERNAL. If Engine is set to self::ENGINE_OPENSSL then smallest Prime is
+     * ignored (ie. multi-prime RSA support is more intended as a way to speed up RSA key generation when there's
+     * a chance neither gmp nor OpenSSL are installed)
      *
-     * @see self::createKey()
-     * @var mixed
-     * @access public
+     * @var int
      */
-    static $configFile;
+    private static $smallestPrime = 4096;
 
     /**
-     * Supported file formats (lower case)
+     * Public Exponent
      *
-     * @see self::_initialize_static_variables()
-     * @var array
-     * @access private
+     * @var BigInteger
      */
-    static $fileFormats = false;
+    protected $publicExponent;
 
     /**
-     * Supported file formats (original case)
+     * Sets the public exponent for key generation
      *
-     * @see self::_initialize_static_variables()
-     * @var array
-     * @access private
+     * This will be 65537 unless changed.
      */
-    static $origFileFormats = false;
-
+    public static function setExponent(int $val): void
+    {
+        self::$defaultExponent = $val;
+    }
 
     /**
-     * Initialize static variables
+     * Sets the smallest prime number in bits. Used for key generation
      *
-     * @access private
+     * This will be 4096 unless changed.
      */
-    static function _initialize_static_variables()
+    public static function setSmallestPrime(int $val): void
     {
-        if (!isset(self::$zero)) {
-            self::$zero= new BigInteger(0);
-            self::$one = new BigInteger(1);
-            self::$configFile = __DIR__ . '/../openssl.cnf';
-
-            if (self::$fileFormats === false) {
-                self::$fileFormats = array();
-                foreach (glob(__DIR__ . '/RSA/*.php') as $file) {
-                    $name = pathinfo($file, PATHINFO_FILENAME);
-                    $type = 'phpseclib\Crypt\RSA\\' . $name;
-                    $meta = new \ReflectionClass($type);
-                    if (!$meta->isAbstract()) {
-                        self::$fileFormats[strtolower($name)] = $type;
-                        self::$origFileFormats[] = $name;
-                    }
-                }
-            }
-        }
+        self::$smallestPrime = $val;
     }
 
     /**
-     * The constructor
+     * Sets the OpenSSL config file path
      *
-     * If you want to make use of the openssl extension, you'll need to set the mode manually, yourself.  The reason
-     * \phpseclib\Crypt\RSA doesn't do it is because OpenSSL doesn't fail gracefully.  openssl_pkey_new(), in particular, requires
-     * openssl.cnf be present somewhere and, unfortunately, the only real way to find out is too late.
-     *
-     * @return \phpseclib\Crypt\RSA
-     * @access public
+     * Set to the empty string to use the default config file
      */
-    function __construct()
+    public static function setOpenSSLConfigPath(string $val): void
     {
-        self::_initialize_static_variables();
-
-        $this->hash = new Hash('sha1');
-        $this->hLen = $this->hash->getLength();
-        $this->hashName = 'sha1';
-        $this->mgfHash = new Hash('sha1');
-        $this->mgfHLen = $this->mgfHash->getLength();
+        self::$configFile = $val;
     }
 
     /**
-     * Create public / private key pair
+     * Create a private key
      *
-     * Returns an array with the following three elements:
-     *  - 'privatekey': The private key.
-     *  - 'publickey':  The public key.
-     *  - 'partialkey': A partially computed key (if the execution time exceeded $timeout).
-     *                  Will need to be passed back to \phpseclib\Crypt\RSA::createKey() as the third parameter for further processing.
-     *
-     * @access public
-     * @param int $bits
-     * @param int $timeout
-     * @param array $p
+     * The public key can be extracted from the private key
      */
-    static function createKey($bits = 1024, $timeout = false, $partial = array())
+    public static function createKey(int $bits = 2048): PrivateKey
     {
-        self::_initialize_static_variables();
-
-        if (!defined('CRYPT_RSA_MODE')) {
-            switch (true) {
-                // Math/BigInteger's openssl requirements are a little less stringent than Crypt/RSA's. in particular,
-                // Math/BigInteger doesn't require an openssl.cfg file whereas Crypt/RSA does. so if Math/BigInteger
-                // can't use OpenSSL it can be pretty trivially assumed, then, that Crypt/RSA can't either.
-                case defined('MATH_BIGINTEGER_OPENSSL_DISABLE'):
-                    define('CRYPT_RSA_MODE', self::MODE_INTERNAL);
-                    break;
-                case extension_loaded('openssl') && file_exists(self::$configFile):
-                    // some versions of XAMPP have mismatched versions of OpenSSL which causes it not to work
-                    ob_start();
-                    @phpinfo();
-                    $content = ob_get_contents();
-                    ob_end_clean();
-
-                    preg_match_all('#OpenSSL (Header|Library) Version(.*)#im', $content, $matches);
-
-                    $versions = array();
-                    if (!empty($matches[1])) {
-                        for ($i = 0; $i < count($matches[1]); $i++) {
-                            $fullVersion = trim(str_replace('=>', '', strip_tags($matches[2][$i])));
-
-                            // Remove letter part in OpenSSL version
-                            if (!preg_match('/(\d+\.\d+\.\d+)/i', $fullVersion, $m)) {
-                                $versions[$matches[1][$i]] = $fullVersion;
-                            } else {
-                                $versions[$matches[1][$i]] = $m[0];
-                            }
-                        }
-                    }
-
-                    // it doesn't appear that OpenSSL versions were reported upon until PHP 5.3+
-                    switch (true) {
-                        case !isset($versions['Header']):
-                        case !isset($versions['Library']):
-                        case $versions['Header'] == $versions['Library']:
-                            define('CRYPT_RSA_MODE', self::MODE_OPENSSL);
-                            break;
-                        default:
-                            define('CRYPT_RSA_MODE', self::MODE_INTERNAL);
-                            define('MATH_BIGINTEGER_OPENSSL_DISABLE', true);
-                    }
-                    break;
-                default:
-                    define('CRYPT_RSA_MODE', self::MODE_INTERNAL);
-            }
-        }
+        self::initialize_static_variables();
 
-        if (!defined('CRYPT_RSA_EXPONENT')) {
-            // http://en.wikipedia.org/wiki/65537_%28number%29
-            define('CRYPT_RSA_EXPONENT', '65537');
+        $class = new \ReflectionClass(static::class);
+        if ($class->isFinal()) {
+            throw new \RuntimeException('createKey() should not be called from final classes (' . static::class . ')');
         }
-        // per <http://cseweb.ucsd.edu/~hovav/dist/survey.pdf#page=5>, this number ought not result in primes smaller
-        // than 256 bits. as a consequence if the key you're trying to create is 1024 bits and you've set CRYPT_RSA_SMALLEST_PRIME
-        // to 384 bits then you're going to get a 384 bit prime and a 640 bit prime (384 + 1024 % 384). at least if
-        // CRYPT_RSA_MODE is set to self::MODE_INTERNAL. if CRYPT_RSA_MODE is set to self::MODE_OPENSSL then
-        // CRYPT_RSA_SMALLEST_PRIME is ignored (ie. multi-prime RSA support is more intended as a way to speed up RSA key
-        // generation when there's a chance neither gmp nor OpenSSL are installed)
-        if (!defined('CRYPT_RSA_SMALLEST_PRIME')) {
-            define('CRYPT_RSA_SMALLEST_PRIME', 4096);
+
+        $regSize = $bits >> 1; // divide by two to see how many bits P and Q would be
+        if ($regSize > self::$smallestPrime) {
+            $num_primes = floor($bits / self::$smallestPrime);
+            $regSize = self::$smallestPrime;
+        } else {
+            $num_primes = 2;
         }
 
-        // OpenSSL uses 65537 as the exponent and requires RSA keys be 384 bits minimum
-        if (CRYPT_RSA_MODE == self::MODE_OPENSSL && $bits >= 384 && CRYPT_RSA_EXPONENT == 65537) {
-            $config = array();
-            if (isset(self::$configFile)) {
-                $config['config'] = self::$configFile;
+        if ($num_primes == 2 && $bits >= 384 && self::$defaultExponent == 65537) {
+            if (!isset(self::$engines['PHP'])) {
+                self::useBestEngine();
             }
-            $rsa = openssl_pkey_new(array('private_key_bits' => $bits) + $config);
-            openssl_pkey_export($rsa, $privatekeystr, null, $config);
-            $privatekey = new RSA();
-            $privatekey->load($privatekeystr);
 
-            $publickeyarr = openssl_pkey_get_details($rsa);
-            $publickey = new RSA();
-            $publickey->load($publickeyarr['key']);
+            // OpenSSL uses 65537 as the exponent and requires RSA keys be 384 bits minimum
+            if (self::$engines['OpenSSL']) {
+                $config = [];
+                if (self::$configFile) {
+                    $config['config'] = self::$configFile;
+                }
+                $rsa = openssl_pkey_new(['private_key_bits' => $bits] + $config);
+                openssl_pkey_export($rsa, $privatekeystr, null, $config);
 
-            // clear the buffer of error strings stemming from a minimalistic openssl.cnf
-            while (openssl_error_string() !== false) {
-            }
+                // clear the buffer of error strings stemming from a minimalistic openssl.cnf
+                // https://github.com/php/php-src/issues/11054 talks about other errors this'll pick up
+                while (openssl_error_string() !== false) {
+                }
 
-            return array(
-                'privatekey' => $privatekey,
-                'publickey' => $publickey,
-                'partialkey' => false
-            );
+                return RSA::load($privatekeystr);
+            }
         }
 
         static $e;
         if (!isset($e)) {
-            $e = new BigInteger(CRYPT_RSA_EXPONENT);
+            $e = new BigInteger(self::$defaultExponent);
         }
 
-        extract(self::_generateMinMax($bits));
-        $absoluteMin = $min;
-        $temp = $bits >> 1; // divide by two to see how many bits P and Q would be
-        if ($temp > CRYPT_RSA_SMALLEST_PRIME) {
-            $num_primes = floor($bits / CRYPT_RSA_SMALLEST_PRIME);
-            $temp = CRYPT_RSA_SMALLEST_PRIME;
-        } else {
-            $num_primes = 2;
-        }
-        extract(self::_generateMinMax($temp + $bits % $temp));
-        $finalMax = $max;
-        extract(self::_generateMinMax($temp));
-
-        $generator = new BigInteger();
-
-        $n = self::$one->copy();
-        if (!empty($partial)) {
-            extract(unserialize($partial));
-        } else {
-            $exponents = $coefficients = $primes = array();
-            $lcm = array(
-                'top' => self::$one->copy(),
-                'bottom' => false
-            );
-        }
-
-        $start = time();
-        $i0 = count($primes) + 1;
+        $n = clone self::$one;
+        $exponents = $coefficients = $primes = [];
+        $lcm = [
+            'top' => clone self::$one,
+            'bottom' => false,
+        ];
 
         do {
-            for ($i = $i0; $i <= $num_primes; $i++) {
-                if ($timeout !== false) {
-                    $timeout-= time() - $start;
-                    $start = time();
-                    if ($timeout <= 0) {
-                        return array(
-                            'privatekey' => '',
-                            'publickey'  => '',
-                            'partialkey' => serialize(array(
-                                'primes' => $primes,
-                                'coefficients' => $coefficients,
-                                'lcm' => $lcm,
-                                'exponents' => $exponents
-                            ))
-                        );
-                    }
-                }
-
-                if ($i == $num_primes) {
-                    list($min, $temp) = $absoluteMin->divide($n);
-                    if (!$temp->equals(self::$zero)) {
-                        $min = $min->add(self::$one); // ie. ceil()
-                    }
-                    $primes[$i] = $generator->randomPrime($min, $finalMax, $timeout);
+            for ($i = 1; $i <= $num_primes; $i++) {
+                if ($i != $num_primes) {
+                    $primes[$i] = BigInteger::randomPrime($regSize);
                 } else {
-                    $primes[$i] = $generator->randomPrime($min, $max, $timeout);
-                }
-
-                if ($primes[$i] === false) { // if we've reached the timeout
-                    if (count($primes) > 1) {
-                        $partialkey = '';
-                    } else {
-                        array_pop($primes);
-                        $partialkey = serialize(array(
-                            'primes' => $primes,
-                            'coefficients' => $coefficients,
-                            'lcm' => $lcm,
-                            'exponents' => $exponents
-                        ));
-                    }
-
-                    return array(
-                        'privatekey' => false,
-                        'publickey'  => false,
-                        'partialkey' => $partialkey
-                    );
+                    ['min' => $min, 'max' => $max] = BigInteger::minMaxBits($bits);
+                    [$min] = $min->divide($n);
+                    $min = $min->add(self::$one);
+                    [$max] = $max->divide($n);
+                    $primes[$i] = BigInteger::randomRangePrime($min, $max);
                 }
 
                 // the first coefficient is calculated differently from the rest
@@ -604,18 +373,21 @@ static function createKey($bits = 1024, $timeout = false, $partial = array())
                 // see http://en.wikipedia.org/wiki/Euler%27s_totient_function
                 $lcm['top'] = $lcm['top']->multiply($temp);
                 $lcm['bottom'] = $lcm['bottom'] === false ? $temp : $lcm['bottom']->gcd($temp);
-
-                $exponents[$i] = $e->modInverse($temp);
             }
 
-            list($temp) = $lcm['top']->divide($lcm['bottom']);
+            [$temp] = $lcm['top']->divide($lcm['bottom']);
             $gcd = $temp->gcd($e);
             $i0 = 1;
         } while (!$gcd->equals(self::$one));
 
+        $coefficients[2] = $primes[2]->modInverse($primes[1]);
+
         $d = $e->modInverse($temp);
 
-        $coefficients[2] = $primes[2]->modInverse($primes[1]);
+        foreach ($primes as $i => $prime) {
+            $temp = $prime->subtract(self::$one);
+            $exponents[$i] = $e->modInverse($temp);
+        }
 
         // from <http://tools.ietf.org/html/rfc3447#appendix-A.1.2>:
         // RSAPrivateKey ::= SEQUENCE {
@@ -630,1610 +402,485 @@ static function createKey($bits = 1024, $timeout = false, $partial = array())
         //     coefficient       INTEGER,  -- (inverse of q) mod p
         //     otherPrimeInfos   OtherPrimeInfos OPTIONAL
         // }
-        $privatekey = new RSA();
+        $privatekey = new PrivateKey();
         $privatekey->modulus = $n;
         $privatekey->k = $bits >> 3;
         $privatekey->publicExponent = $e;
         $privatekey->exponent = $d;
-        $privatekey->privateExponent = $e;
         $privatekey->primes = $primes;
         $privatekey->exponents = $exponents;
         $privatekey->coefficients = $coefficients;
 
-        $publickey = new RSA();
+        /*
+        $publickey = new PublicKey;
         $publickey->modulus = $n;
         $publickey->k = $bits >> 3;
         $publickey->exponent = $e;
+        $publickey->publicExponent = $e;
+        $publickey->isPublic = true;
+        */
 
-        return array(
-            'privatekey' => $privatekey,
-            'publickey'  => $publickey,
-            'partialkey' => false
-        );
-    }
-
-    /**
-     * Add a fileformat plugin
-     *
-     * The plugin needs to either already be loaded or be auto-loadable.
-     * Loading a plugin whose shortname overwrite an existing shortname will overwrite the old plugin.
-     *
-     * @see self::load()
-     * @param string $fullname
-     * @access public
-     * @return bool
-     */
-    static function addFileFormat($fullname)
-    {
-        self::_initialize_static_variables();
-
-        if (class_exists($fullname)) {
-            $meta = new \ReflectionClass($path);
-            $shortname = $meta->getShortName();
-            self::$fileFormats[strtolower($shortname)] = $fullname;
-            self::$origFileFormats[] = $shortname;
-        }
-    }
-
-    /**
-     * Returns a list of supported formats.
-     *
-     * @access public
-     * @return array
-     */
-    static function getSupportedFormats()
-    {
-        self::_initialize_static_variables();
-
-        return self::$origFileFormats;
+        return $privatekey;
     }
 
     /**
-     * Loads a public or private key
-     *
-     * Returns true on success and false on failure (ie. an incorrect password was provided or the key was malformed)
+     * OnLoad Handler
      *
-     * @access public
-     * @param string $key
-     * @param int $type optional
+     * @return PrivateKey|PublicKey|RSA
      */
-    function load($key, $type = false)
+    protected static function onLoad(array $components)
     {
-        if ($key instanceof RSA) {
-            $this->privateKeyFormat = $key->privateKeyFormat;
-            $this->publicKeyFormat = $key->publicKeyFormat;
-            $this->k = $key->k;
-            $this->hLen = $key->hLen;
-            $this->sLen = $key->sLen;
-            $this->mgfHLen = $key->mgfHLen;
-            $this->encryptionMode = $key->encryptionMode;
-            $this->signatureMode = $key->signatureMode;
-            $this->password = $key->password;
-
-            if (is_object($key->hash)) {
-                $this->hash = new Hash($key->hash->getHash());
-            }
-            if (is_object($key->mgfHash)) {
-                $this->mgfHash = new Hash($key->mgfHash->getHash());
-            }
-
-            if (is_object($key->modulus)) {
-                $this->modulus = $key->modulus->copy();
-            }
-            if (is_object($key->exponent)) {
-                $this->exponent = $key->exponent->copy();
-            }
-            if (is_object($key->publicExponent)) {
-                $this->publicExponent = $key->publicExponent->copy();
-            }
+        $key = $components['isPublicKey'] ?
+            new PublicKey() :
+            new PrivateKey();
 
-            $this->primes = array();
-            $this->exponents = array();
-            $this->coefficients = array();
+        $key->modulus = $components['modulus'];
+        $key->publicExponent = $components['publicExponent'];
+        $key->k = $key->modulus->getLengthInBytes();
 
-            foreach ($this->primes as $prime) {
-                $this->primes[] = $prime->copy();
-            }
-            foreach ($this->exponents as $exponent) {
-                $this->exponents[] = $exponent->copy();
-            }
-            foreach ($this->coefficients as $coefficient) {
-                $this->coefficients[] = $coefficient->copy();
+        if ($components['isPublicKey'] || !isset($components['privateExponent'])) {
+            $key->exponent = $key->publicExponent;
+        } else {
+            $key->privateExponent = $components['privateExponent'];
+            $key->exponent = $key->privateExponent;
+            $key->primes = $components['primes'];
+            $key->exponents = $components['exponents'];
+            $key->coefficients = $components['coefficients'];
+        }
+
+        if ($components['format'] == PSS::class) {
+            // in the X509 world RSA keys are assumed to use PKCS1 padding by default. only if the key is
+            // explicitly a PSS key is the use of PSS assumed. phpseclib does not work like this. phpseclib
+            // uses PSS padding by default. it assumes the more secure method by default and altho it provides
+            // for the less secure PKCS1 method you have to go out of your way to use it. this is consistent
+            // with the latest trends in crypto. libsodium (NaCl) is actually a little more extreme in that
+            // not only does it defaults to the most secure methods - it doesn't even let you choose less
+            // secure methods
+            //$key = $key->withPadding(self::SIGNATURE_PSS);
+            if (isset($components['hash'])) {
+                $key = $key->withHash($components['hash']);
             }
-
-            return true;
-        }
-
-        $components = false;
-        if ($type === false) {
-            foreach (self::$fileFormats as $format) {
-                try {
-                    $components = $format::load($key, $this->password);
-                } catch (Exception $e) {
-                    $components = false;
-                }
-                if ($components !== false) {
-                    break;
-                }
+            if (isset($components['MGFHash'])) {
+                $key = $key->withMGFHash($components['MGFHash']);
             }
-        } else {
-            $format = strtolower($type);
-            if (isset(self::$fileFormats[$format])) {
-                $format = self::$fileFormats[$format];
-                try {
-                    $components = $format::load($key, $this->password);
-                } catch (Exception $e) {
-                    $components = false;
-                }
+            if (isset($components['saltLength'])) {
+                $key = $key->withSaltLength($components['saltLength']);
             }
         }
 
-        if ($components === false) {
-            $this->format = false;
-            return false;
-        }
-
-        $this->format = $format;
-
-        $this->modulus = $components['modulus'];
-        $this->k = strlen($this->modulus->toBytes());
-        $this->exponent = isset($components['privateExponent']) ? $components['privateExponent'] : $components['publicExponent'];
-        if (isset($components['primes'])) {
-            $this->primes = $components['primes'];
-            $this->exponents = $components['exponents'];
-            $this->coefficients = $components['coefficients'];
-            $this->publicExponent = $components['publicExponent'];
-        } else {
-            $this->primes = array();
-            $this->exponents = array();
-            $this->coefficients = array();
-            $this->publicExponent = false;
-        }
-
-        if ($components['isPublicKey']) {
-            $this->setPublicKey();
-        }
-
-        return true;
+        return $key;
     }
 
     /**
-     * Returns the format of the loaded key.
-     *
-     * If the key that was loaded wasn't in a valid or if the key was auto-generated
-     * with RSA::createKey() then this will return false.
-     *
-     * @see self::load()
-     * @access public
-     * @return mixed
+     * Initialize static variables
      */
-    function getLoadedFormat()
+    protected static function initialize_static_variables(): void
     {
-        if ($this->format === false) {
-            return false;
+        if (!isset(self::$configFile)) {
+            self::$configFile = dirname(__FILE__) . '/../openssl.cnf';
         }
 
-        $meta = new \ReflectionClass($this->format);
-        return $meta->getShortName();
+        parent::initialize_static_variables();
     }
 
     /**
-     * Returns the private key
+     * Constructor
      *
-     * The private key is only returned if the currently loaded key contains the constituent prime numbers.
-     *
-     * @see self::getPublicKey()
-     * @access public
-     * @param string $type optional
-     * @return mixed
+     * PublicKey and PrivateKey objects can only be created from abstract RSA class
      */
-    function getPrivateKey($type = 'PKCS1')
+    protected function __construct()
     {
-        $type = strtolower($type);
-        if (!isset(self::$fileFormats[$type])) {
-            return false;
-        }
-        $type = self::$fileFormats[$type];
-        if (!method_exists($type, 'savePrivateKey')) {
-            return false;
-        }
-
-        if (empty($this->primes)) {
-            return false;
-        }
+        parent::__construct();
 
-        $oldFormat = $this->privateKeyFormat;
-        $this->privateKeyFormat = $type;
-        $temp = $type::savePrivateKey($this->modulus, $this->publicExponent, $this->exponent, $this->primes, $this->exponents, $this->coefficients, $this->password);
-        $this->privateKeyFormat = $oldFormat;
-        return $temp;
+        $this->hLen = $this->hash->getLengthInBytes();
+        $this->mgfHash = new Hash('sha256');
+        $this->mgfHLen = $this->mgfHash->getLengthInBytes();
     }
 
     /**
-     * Returns the key size
-     *
-     * More specifically, this returns the size of the modulo in bits.
+     * Integer-to-Octet-String primitive
      *
-     * @access public
-     * @return int
+     * See {@link http://tools.ietf.org/html/rfc3447#section-4.1 RFC3447#section-4.1}.
      */
-    function getSize()
+    protected function i2osp(BigInteger $x, int $xLen): string
     {
-        return !isset($this->modulus) ? 0 : strlen($this->modulus->toBits());
+        $x = $x->toBytes();
+        if (strlen($x) > $xLen) {
+            throw new OutOfRangeException('Resultant string length out of range');
+        }
+        return str_pad($x, $xLen, chr(0), STR_PAD_LEFT);
     }
 
     /**
-     * Sets the password
-     *
-     * Private keys can be encrypted with a password.  To unset the password, pass in the empty string or false.
-     * Or rather, pass in $password such that empty($password) && !is_string($password) is true.
+     * Octet-String-to-Integer primitive
      *
-     * @see self::createKey()
-     * @see self::load()
-     * @access public
-     * @param string $password
+     * See {@link http://tools.ietf.org/html/rfc3447#section-4.2 RFC3447#section-4.2}.
      */
-    function setPassword($password = false)
+    protected function os2ip(string $x): BigInteger
     {
-        $this->password = $password;
+        return new BigInteger($x, 256);
     }
 
     /**
-     * Defines the public key
-     *
-     * Some private key formats define the public exponent and some don't.  Those that don't define it are problematic when
-     * used in certain contexts.  For example, in SSH-2, RSA authentication works by sending the public key along with a
-     * message signed by the private key to the server.  The SSH-2 server looks the public key up in an index of public keys
-     * and if it's present then proceeds to verify the signature.  Problem is, if your private key doesn't include the public
-     * exponent this won't work unless you manually add the public exponent. phpseclib tries to guess if the key being used
-     * is the public key but in the event that it guesses incorrectly you might still want to explicitly set the key as being
-     * public.
-     *
-     * Do note that when a new key is loaded the index will be cleared.
+     * EMSA-PKCS1-V1_5-ENCODE
      *
-     * Returns true on success, false on failure
+     * See {@link http://tools.ietf.org/html/rfc3447#section-9.2 RFC3447#section-9.2}.
      *
-     * @see self::getPublicKey()
-     * @access public
-     * @param string $key optional
-     * @param int $type optional
-     * @return bool
+     * @throws LengthException if the intended encoded message length is too short
      */
-    function setPublicKey($key = false, $type = false)
+    protected function emsa_pkcs1_v1_5_encode(string $m, int $emLen): string
     {
-        // if a public key has already been loaded return false
-        if (!empty($this->publicExponent)) {
-            return false;
-        }
-
-        if ($key === false && !empty($this->modulus)) {
-            $this->publicExponent = $this->exponent;
-            return true;
-        }
+        $h = $this->hash->hash($m);
 
-        $components = false;
-        if ($type === false) {
-            foreach (self::$fileFormats as $format) {
-                if (!method_exists($format, 'savePublicKey')) {
-                    continue;
-                }
-                try {
-                    $components = $format::load($key, $this->password);
-                } catch (Exception $e) {
-                    $components = false;
-                }
-                if ($components !== false) {
-                    break;
-                }
-            }
-        } else {
-            $format = strtolower($type);
-            if (isset(self::$fileFormats[$format])) {
-                $format = self::$fileFormats[$format];
-                try {
-                    $components = $format::load($key, $this->password);
-                } catch (Exception $e) {
-                    $components = false;
-                }
-            }
+        // see http://tools.ietf.org/html/rfc3447#page-43
+        switch ($this->hash->getHash()) {
+            case 'md2':
+                $t = "\x30\x20\x30\x0c\x06\x08\x2a\x86\x48\x86\xf7\x0d\x02\x02\x05\x00\x04\x10";
+                break;
+            case 'md5':
+                $t = "\x30\x20\x30\x0c\x06\x08\x2a\x86\x48\x86\xf7\x0d\x02\x05\x05\x00\x04\x10";
+                break;
+            case 'sha1':
+                $t = "\x30\x21\x30\x09\x06\x05\x2b\x0e\x03\x02\x1a\x05\x00\x04\x14";
+                break;
+            case 'sha256':
+                $t = "\x30\x31\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x01\x05\x00\x04\x20";
+                break;
+            case 'sha384':
+                $t = "\x30\x41\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x02\x05\x00\x04\x30";
+                break;
+            case 'sha512':
+                $t = "\x30\x51\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x03\x05\x00\x04\x40";
+                break;
+            // from https://www.emc.com/collateral/white-papers/h11300-pkcs-1v2-2-rsa-cryptography-standard-wp.pdf#page=40
+            case 'sha224':
+                $t = "\x30\x2d\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x04\x05\x00\x04\x1c";
+                break;
+            case 'sha512/224':
+                $t = "\x30\x2d\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x05\x05\x00\x04\x1c";
+                break;
+            case 'sha512/256':
+                $t = "\x30\x31\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x06\x05\x00\x04\x20";
         }
+        $t .= $h;
+        $tLen = strlen($t);
 
-        if ($components === false) {
-            $this->format = false;
-            return false;
+        if ($emLen < $tLen + 11) {
+            throw new LengthException('Intended encoded message length too short');
         }
 
-        $this->format = $format;
-
-        if (empty($this->modulus) || !$this->modulus->equals($components['modulus'])) {
-            $this->modulus = $components['modulus'];
-            $this->exponent = $this->publicExponent = $components['publicExponent'];
-            return true;
-        }
+        $ps = str_repeat(chr(0xFF), $emLen - $tLen - 3);
 
-        $this->publicExponent = $components['publicExponent'];
+        $em = "\0\1$ps\0$t";
 
-        return true;
+        return $em;
     }
 
     /**
-     * Defines the private key
-     *
-     * If phpseclib guessed a private key was a public key and loaded it as such it might be desirable to force
-     * phpseclib to treat the key as a private key. This function will do that.
-     *
-     * Do note that when a new key is loaded the index will be cleared.
+     * EMSA-PKCS1-V1_5-ENCODE (without NULL)
      *
-     * Returns true on success, false on failure
+     * Quoting https://tools.ietf.org/html/rfc8017#page-65,
      *
-     * @see self::getPublicKey()
-     * @access public
-     * @param string $key optional
-     * @param int $type optional
-     * @return bool
+     * "The parameters field associated with id-sha1, id-sha224, id-sha256,
+     *  id-sha384, id-sha512, id-sha512/224, and id-sha512/256 should
+     *  generally be omitted, but if present, it shall have a value of type
+     *  NULL"
      */
-    function setPrivateKey($key = false, $type = false)
+    protected function emsa_pkcs1_v1_5_encode_without_null(string $m, int $emLen): string
     {
-        if ($key === false && !empty($this->publicExponent)) {
-            unset($this->publicExponent);
-            return true;
-        }
-
-        $rsa = new RSA();
-        if (!$rsa->load($key, $type)) {
-            return false;
-        }
-        unset($rsa->publicExponent);
-
-        // don't overwrite the old key if the new key is invalid
-        $this->load($rsa);
-        return true;
-    }
+        $h = $this->hash->hash($m);
 
-    /**
-     * Returns the public key
-     *
-     * The public key is only returned under two circumstances - if the private key had the public key embedded within it
-     * or if the public key was set via setPublicKey().  If the currently loaded key is supposed to be the public key this
-     * function won't return it since this library, for the most part, doesn't distinguish between public and private keys.
-     *
-     * @see self::getPrivateKey()
-     * @access public
-     * @param string $type optional
-     * @return mixed
-     */
-    function getPublicKey($type = 'PKCS8')
-    {
-        $type = strtolower($type);
-        if (!isset(self::$fileFormats[$type])) {
-            return false;
-        }
-        $type = self::$fileFormats[$type];
-        if (!method_exists($type, 'savePublicKey')) {
-            return false;
-        }
-
-        if (empty($this->modulus) || empty($this->publicExponent)) {
-            return false;
-        }
-
-        $oldFormat = $this->publicKeyFormat;
-        $this->publicKeyFormat = $type;
-        $temp = $type::savePublicKey($this->modulus, $this->publicExponent);
-        $this->publicKeyFormat = $oldFormat;
-        return $temp;
-    }
-
-    /**
-     * Returns the public key's fingerprint
-     *
-     * The public key's fingerprint is returned, which is equivalent to running `ssh-keygen -lf rsa.pub`. If there is
-     * no public key currently loaded, false is returned.
-     * Example output (md5): "c1:b1:30:29:d7:b8:de:6c:97:77:10:d7:46:41:63:87" (as specified by RFC 4716)
-     *
-     * @access public
-     * @param string $algorithm The hashing algorithm to be used. Valid options are 'md5' and 'sha256'. False is returned
-     * for invalid values.
-     * @return mixed
-     */
-    public function getPublicKeyFingerprint($algorithm = 'md5')
-    {
-        if (empty($this->modulus) || empty($this->publicExponent)) {
-            return false;
-        }
-
-        $modulus = $this->modulus->toBytes(true);
-        $publicExponent = $this->publicExponent->toBytes(true);
-
-        $RSAPublicKey = pack('Na*Na*Na*', strlen('ssh-rsa'), 'ssh-rsa', strlen($publicExponent), $publicExponent, strlen($modulus), $modulus);
-
-        switch ($algorithm) {
+        // see http://tools.ietf.org/html/rfc3447#page-43
+        switch ($this->hash->getHash()) {
+            case 'sha1':
+                $t = "\x30\x1f\x30\x07\x06\x05\x2b\x0e\x03\x02\x1a\x04\x14";
+                break;
             case 'sha256':
-                $hash = new Hash('sha256');
-                $base = base64_encode($hash->hash($RSAPublicKey));
-                return substr($base, 0, strlen($base) - 1);
-            case 'md5':
-                return substr(chunk_split(md5($RSAPublicKey), 2, ':'), 0, -1);
+                $t = "\x30\x2f\x30\x0b\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x01\x04\x20";
+                break;
+            case 'sha384':
+                $t = "\x30\x3f\x30\x0b\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x02\x04\x30";
+                break;
+            case 'sha512':
+                $t = "\x30\x4f\x30\x0b\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x03\x04\x40";
+                break;
+            // from https://www.emc.com/collateral/white-papers/h11300-pkcs-1v2-2-rsa-cryptography-standard-wp.pdf#page=40
+            case 'sha224':
+                $t = "\x30\x2b\x30\x0b\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x04\x04\x1c";
+                break;
+            case 'sha512/224':
+                $t = "\x30\x2b\x30\x0b\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x05\x04\x1c";
+                break;
+            case 'sha512/256':
+                $t = "\x30\x2f\x30\x0b\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x06\x04\x20";
+                break;
             default:
-                return false;
-        }
-    }
-
-    /**
-     * Returns a minimalistic private key
-     *
-     * Returns the private key without the prime number constituants.  Structurally identical to a public key that
-     * hasn't been set as the public key
-     *
-     * @see self::getPrivateKey()
-     * @access private
-     * @param string $type optional
-     * @return mixed
-     */
-    function _getPrivatePublicKey($type = 'PKCS8')
-    {
-        $type = strtolower($type);
-        if (!isset(self::$fileFormats[$type])) {
-            return false;
-        }
-        $type = self::$fileFormats[$type];
-        if (!method_exists($type, 'savePublicKey')) {
-            return false;
+                throw new UnsupportedAlgorithmException('md2 and md5 require NULLs');
         }
+        $t .= $h;
+        $tLen = strlen($t);
 
-        if (empty($this->modulus) || empty($this->exponent)) {
-            return false;
-        }
-
-        $oldFormat = $this->publicKeyFormat;
-        $this->publicKeyFormat = $type;
-        $temp = $type::savePublicKey($this->modulus, $this->exponent);
-        $this->publicKeyFormat = $oldFormat;
-        return $temp;
-    }
-
-
-    /**
-     * __toString() magic method
-     *
-     * @access public
-     * @return string
-     */
-    function __toString()
-    {
-        $key = $this->getPrivateKey($this->privateKeyFormat);
-        if (is_string($key)) {
-            return $key;
+        if ($emLen < $tLen + 11) {
+            throw new LengthException('Intended encoded message length too short');
         }
-        $key = $this->_getPrivatePublicKey($this->publicKeyFormat);
-        return is_string($key) ? $key : '';
-    }
 
-    /**
-     * __clone() magic method
-     *
-     * @access public
-     * @return \phpseclib\Crypt\RSA
-     */
-    function __clone()
-    {
-        $key = new RSA();
-        $key->load($this);
-        return $key;
-    }
+        $ps = str_repeat(chr(0xFF), $emLen - $tLen - 3);
 
-    /**
-     * Generates the smallest and largest numbers requiring $bits bits
-     *
-     * @access private
-     * @param int $bits
-     * @return array
-     */
-    static function _generateMinMax($bits)
-    {
-        $bytes = $bits >> 3;
-        $min = str_repeat(chr(0), $bytes);
-        $max = str_repeat(chr(0xFF), $bytes);
-        $msb = $bits & 7;
-        if ($msb) {
-            $min = chr(1 << ($msb - 1)) . $min;
-            $max = chr((1 << $msb) - 1) . $max;
-        } else {
-            $min[0] = chr(0x80);
-        }
+        $em = "\0\1$ps\0$t";
 
-        return array(
-            'min' => new BigInteger($min, 256),
-            'max' => new BigInteger($max, 256)
-        );
+        return $em;
     }
 
     /**
-     * DER-decode the length
-     *
-     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
-     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
+     * MGF1
      *
-     * @access private
-     * @param string $string
-     * @return int
+     * See {@link http://tools.ietf.org/html/rfc3447#appendix-B.2.1 RFC3447#appendix-B.2.1}.
      */
-    function _decodeLength(&$string)
+    protected function mgf1(string $mgfSeed, int $maskLen): string
     {
-        $length = ord($this->_string_shift($string));
-        if ($length & 0x80) { // definite length, long form
-            $length&= 0x7F;
-            $temp = $this->_string_shift($string, $length);
-            list(, $length) = unpack('N', substr(str_pad($temp, 4, chr(0), STR_PAD_LEFT), -4));
-        }
-        return $length;
-    }
+        // if $maskLen would yield strings larger than 4GB, PKCS#1 suggests a "Mask too long" error be output.
 
-    /**
-     * DER-encode the length
-     *
-     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
-     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
-     *
-     * @access private
-     * @param int $length
-     * @return string
-     */
-    function _encodeLength($length)
-    {
-        if ($length <= 0x7F) {
-            return chr($length);
+        $t = '';
+        $count = ceil($maskLen / $this->mgfHLen);
+        for ($i = 0; $i < $count; $i++) {
+            $c = pack('N', $i);
+            $t .= $this->mgfHash->hash($mgfSeed . $c);
         }
 
-        $temp = ltrim(pack('N', $length), chr(0));
-        return pack('Ca*', 0x80 | strlen($temp), $temp);
-    }
-
-    /**
-     * String Shift
-     *
-     * Inspired by array_shift
-     *
-     * @param string $string
-     * @param int $index
-     * @return string
-     * @access private
-     */
-    function _string_shift(&$string, $index = 1)
-    {
-        $substr = substr($string, 0, $index);
-        $string = substr($string, $index);
-        return $substr;
-    }
-
-    /**
-     * Determines the private key format
-     *
-     * @see self::createKey()
-     * @access public
-     * @param int $format
-     */
-    function setPrivateKeyFormat($format)
-    {
-        $this->privateKeyFormat = $format;
+        return substr($t, 0, $maskLen);
     }
 
     /**
-     * Determines the public key format
+     * Returns the key size
      *
-     * @see self::createKey()
-     * @access public
-     * @param int $format
+     * More specifically, this returns the size of the modulo in bits.
      */
-    function setPublicKeyFormat($format)
+    public function getLength(): int
     {
-        $this->publicKeyFormat = $format;
+        return !isset($this->modulus) ? 0 : $this->modulus->getLength();
     }
 
     /**
      * Determines which hashing function should be used
      *
-     * Used with signature production / verification and (if the encryption mode is self::ENCRYPTION_OAEP) encryption and
-     * decryption.  If $hash isn't supported, sha1 is used.
-     *
-     * @access public
-     * @param string $hash
+     * Used with signature production / verification and (if the encryption mode is self::PADDING_OAEP) encryption and
+     * decryption.
      */
-    function setHash($hash)
+    public function withHash(string $hash): RSA
     {
-        // \phpseclib\Crypt\Hash supports algorithms that PKCS#1 doesn't support.  md5-96 and sha1-96, for example.
-        switch ($hash) {
+        $new = clone $this;
+
+        // \phpseclib3\Crypt\Hash supports algorithms that PKCS#1 doesn't support.  md5-96 and sha1-96, for example.
+        switch (strtolower($hash)) {
             case 'md2':
             case 'md5':
             case 'sha1':
             case 'sha256':
             case 'sha384':
             case 'sha512':
-                $this->hash = new Hash($hash);
-                $this->hashName = $hash;
+            case 'sha224':
+            case 'sha512/224':
+            case 'sha512/256':
+                $new->hash = new Hash($hash);
                 break;
             default:
-                $this->hash = new Hash('sha1');
-                $this->hashName = 'sha1';
+                throw new UnsupportedAlgorithmException(
+                    'The only supported hash algorithms are: md2, md5, sha1, sha256, sha384, sha512, sha224, sha512/224, sha512/256'
+                );
         }
-        $this->hLen = $this->hash->getLength();
+        $new->hLen = $new->hash->getLengthInBytes();
+
+        return $new;
     }
 
     /**
      * Determines which hashing function should be used for the mask generation function
      *
-     * The mask generation function is used by self::ENCRYPTION_OAEP and self::SIGNATURE_PSS and although it's
+     * The mask generation function is used by self::PADDING_OAEP and self::PADDING_PSS and although it's
      * best if Hash and MGFHash are set to the same thing this is not a requirement.
-     *
-     * @access public
-     * @param string $hash
      */
-    function setMGFHash($hash)
+    public function withMGFHash(string $hash): RSA
     {
-        // \phpseclib\Crypt\Hash supports algorithms that PKCS#1 doesn't support.  md5-96 and sha1-96, for example.
-        switch ($hash) {
+        $new = clone $this;
+
+        // \phpseclib3\Crypt\Hash supports algorithms that PKCS#1 doesn't support.  md5-96 and sha1-96, for example.
+        switch (strtolower($hash)) {
             case 'md2':
             case 'md5':
             case 'sha1':
             case 'sha256':
             case 'sha384':
             case 'sha512':
-                $this->mgfHash = new Hash($hash);
+            case 'sha224':
+            case 'sha512/224':
+            case 'sha512/256':
+                $new->mgfHash = new Hash($hash);
                 break;
             default:
-                $this->mgfHash = new Hash('sha1');
-        }
-        $this->mgfHLen = $this->mgfHash->getLength();
-    }
-
-    /**
-     * Determines the salt length
-     *
-     * To quote from {@link http://tools.ietf.org/html/rfc3447#page-38 RFC3447#page-38}:
-     *
-     *    Typical salt lengths in octets are hLen (the length of the output
-     *    of the hash function Hash) and 0.
-     *
-     * @access public
-     * @param int $format
-     */
-    function setSaltLength($sLen)
-    {
-        $this->sLen = $sLen;
-    }
-
-    /**
-     * Integer-to-Octet-String primitive
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-4.1 RFC3447#section-4.1}.
-     *
-     * @access private
-     * @param \phpseclib\Math\BigInteger $x
-     * @param int $xLen
-     * @throws \OutOfBoundsException if strlen($x) > $xLen
-     * @return string
-     */
-    function _i2osp($x, $xLen)
-    {
-        $x = $x->toBytes();
-        if (strlen($x) > $xLen) {
-            throw new \OutOfBoundsException('Integer too large');
-        }
-        return str_pad($x, $xLen, chr(0), STR_PAD_LEFT);
-    }
-
-    /**
-     * Octet-String-to-Integer primitive
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-4.2 RFC3447#section-4.2}.
-     *
-     * @access private
-     * @param string $x
-     * @return \phpseclib\Math\BigInteger
-     */
-    function _os2ip($x)
-    {
-        return new BigInteger($x, 256);
-    }
-
-    /**
-     * Exponentiate with or without Chinese Remainder Theorem
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-5.1.1 RFC3447#section-5.1.2}.
-     *
-     * @access private
-     * @param \phpseclib\Math\BigInteger $x
-     * @return \phpseclib\Math\BigInteger
-     */
-    function _exponentiate($x)
-    {
-        if (empty($this->primes) || empty($this->coefficients) || empty($this->exponents)) {
-            return $x->modPow($this->exponent, $this->modulus);
-        }
-
-        $num_primes = count($this->primes);
-
-        if (defined('CRYPT_RSA_DISABLE_BLINDING')) {
-            $m_i = array(
-                1 => $x->modPow($this->exponents[1], $this->primes[1]),
-                2 => $x->modPow($this->exponents[2], $this->primes[2])
-            );
-            $h = $m_i[1]->subtract($m_i[2]);
-            $h = $h->multiply($this->coefficients[2]);
-            list(, $h) = $h->divide($this->primes[1]);
-            $m = $m_i[2]->add($h->multiply($this->primes[2]));
-
-            $r = $this->primes[1];
-            for ($i = 3; $i <= $num_primes; $i++) {
-                $m_i = $x->modPow($this->exponents[$i], $this->primes[$i]);
-
-                $r = $r->multiply($this->primes[$i - 1]);
-
-                $h = $m_i->subtract($m);
-                $h = $h->multiply($this->coefficients[$i]);
-                list(, $h) = $h->divide($this->primes[$i]);
-
-                $m = $m->add($r->multiply($h));
-            }
-        } else {
-            $smallest = $this->primes[1];
-            for ($i = 2; $i <= $num_primes; $i++) {
-                if ($smallest->compare($this->primes[$i]) > 0) {
-                    $smallest = $this->primes[$i];
-                }
-            }
-
-            $r = self::$one->random(self::$one, $smallest->subtract(self::$one));
-
-            $m_i = array(
-                1 => $this->_blind($x, $r, 1),
-                2 => $this->_blind($x, $r, 2)
-            );
-            $h = $m_i[1]->subtract($m_i[2]);
-            $h = $h->multiply($this->coefficients[2]);
-            list(, $h) = $h->divide($this->primes[1]);
-            $m = $m_i[2]->add($h->multiply($this->primes[2]));
-
-            $r = $this->primes[1];
-            for ($i = 3; $i <= $num_primes; $i++) {
-                $m_i = $this->_blind($x, $r, $i);
-
-                $r = $r->multiply($this->primes[$i - 1]);
-
-                $h = $m_i->subtract($m);
-                $h = $h->multiply($this->coefficients[$i]);
-                list(, $h) = $h->divide($this->primes[$i]);
-
-                $m = $m->add($r->multiply($h));
-            }
-        }
-
-        return $m;
-    }
-
-    /**
-     * Performs RSA Blinding
-     *
-     * Protects against timing attacks by employing RSA Blinding.
-     * Returns $x->modPow($this->exponents[$i], $this->primes[$i])
-     *
-     * @access private
-     * @param \phpseclib\Math\BigInteger $x
-     * @param \phpseclib\Math\BigInteger $r
-     * @param int $i
-     * @return \phpseclib\Math\BigInteger
-     */
-    function _blind($x, $r, $i)
-    {
-        $x = $x->multiply($r->modPow($this->publicExponent, $this->primes[$i]));
-        $x = $x->modPow($this->exponents[$i], $this->primes[$i]);
-
-        $r = $r->modInverse($this->primes[$i]);
-        $x = $x->multiply($r);
-        list(, $x) = $x->divide($this->primes[$i]);
-
-        return $x;
-    }
-
-    /**
-     * Performs blinded RSA equality testing
-     *
-     * Protects against a particular type of timing attack described.
-     *
-     * See {@link http://codahale.com/a-lesson-in-timing-attacks/ A Lesson In Timing Attacks (or, Don't use MessageDigest.isEquals)}
-     *
-     * Thanks for the heads up singpolyma!
-     *
-     * @access private
-     * @param string $x
-     * @param string $y
-     * @return bool
-     */
-    function _equals($x, $y)
-    {
-        if (strlen($x) != strlen($y)) {
-            return false;
+                throw new UnsupportedAlgorithmException(
+                    'The only supported hash algorithms are: md2, md5, sha1, sha256, sha384, sha512, sha224, sha512/224, sha512/256'
+                );
         }
+        $new->mgfHLen = $new->mgfHash->getLengthInBytes();
 
-        $result = 0;
-        for ($i = 0; $i < strlen($x); $i++) {
-            $result |= ord($x[$i]) ^ ord($y[$i]);
-        }
-
-        return $result == 0;
+        return $new;
     }
 
     /**
-     * RSAEP
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-5.1.1 RFC3447#section-5.1.1}.
-     *
-     * @access private
-     * @param \phpseclib\Math\BigInteger $m
-     * @throws \OutOfRangeException if $m < 0 or $m > $this->modulus
-     * @return \phpseclib\Math\BigInteger
+     * Returns the MGF hash algorithm currently being used
      */
-    function _rsaep($m)
+    public function getMGFHash(): Hash
     {
-        if ($m->compare(self::$zero) < 0 || $m->compare($this->modulus) > 0) {
-            throw new \OutOfRangeException('Message representative out of range');
-        }
-        return $this->_exponentiate($m);
+        return clone $this->mgfHash;
     }
 
     /**
-     * RSADP
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-5.1.2 RFC3447#section-5.1.2}.
+     * Determines the salt length
      *
-     * @access private
-     * @param \phpseclib\Math\BigInteger $c
-     * @throws \OutOfRangeException if $c < 0 or $c > $this->modulus
-     * @return \phpseclib\Math\BigInteger
-     */
-    function _rsadp($c)
-    {
-        if ($c->compare(self::$zero) < 0 || $c->compare($this->modulus) > 0) {
-            throw new \OutOfRangeException('Ciphertext representative out of range');
-        }
-        return $this->_exponentiate($c);
-    }
-
-    /**
-     * RSASP1
+     * Used by RSA::PADDING_PSS
      *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-5.2.1 RFC3447#section-5.2.1}.
+     * To quote from {@link http://tools.ietf.org/html/rfc3447#page-38 RFC3447#page-38}:
      *
-     * @access private
-     * @param \phpseclib\Math\BigInteger $m
-     * @throws \OutOfRangeException if $m < 0 or $m > $this->modulus
-     * @return \phpseclib\Math\BigInteger
+     *    Typical salt lengths in octets are hLen (the length of the output
+     *    of the hash function Hash) and 0.
      */
-    function _rsasp1($m)
+    public function withSaltLength(?int $sLen): RSA
     {
-        if ($m->compare(self::$zero) < 0 || $m->compare($this->modulus) > 0) {
-            throw new \OutOfRangeException('Message representative out of range');
-        }
-        return $this->_exponentiate($m);
+        $new = clone $this;
+        $new->sLen = $sLen;
+        return $new;
     }
 
     /**
-     * RSAVP1
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-5.2.2 RFC3447#section-5.2.2}.
-     *
-     * @access private
-     * @param \phpseclib\Math\BigInteger $s
-     * @throws \OutOfRangeException if $s < 0 or $s > $this->modulus
-     * @return \phpseclib\Math\BigInteger
+     * Returns the salt length currently being used
      */
-    function _rsavp1($s)
+    public function getSaltLength(): int
     {
-        if ($s->compare(self::$zero) < 0 || $s->compare($this->modulus) > 0) {
-            throw new \OutOfRangeException('Signature representative out of range');
-        }
-        return $this->_exponentiate($s);
+        return $this->sLen !== null ? $this->sLen : $this->hLen;
     }
 
     /**
-     * MGF1
+     * Determines the label
      *
-     * See {@link http://tools.ietf.org/html/rfc3447#appendix-B.2.1 RFC3447#appendix-B.2.1}.
-     *
-     * @access private
-     * @param string $mgfSeed
-     * @param int $mgfLen
-     * @return string
-     */
-    function _mgf1($mgfSeed, $maskLen)
-    {
-        // if $maskLen would yield strings larger than 4GB, PKCS#1 suggests a "Mask too long" error be output.
-
-        $t = '';
-        $count = ceil($maskLen / $this->mgfHLen);
-        for ($i = 0; $i < $count; $i++) {
-            $c = pack('N', $i);
-            $t.= $this->mgfHash->hash($mgfSeed . $c);
-        }
-
-        return substr($t, 0, $maskLen);
-    }
-
-    /**
-     * RSAES-OAEP-ENCRYPT
+     * Used by RSA::PADDING_OAEP
      *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-7.1.1 RFC3447#section-7.1.1} and
-     * {http://en.wikipedia.org/wiki/Optimal_Asymmetric_Encryption_Padding OAES}.
-     *
-     * @access private
-     * @param string $m
-     * @param string $l
-     * @throws \OutOfBoundsException if strlen($m) > $this->k - 2 * $this->hLen - 2
-     * @return string
-     */
-    function _rsaes_oaep_encrypt($m, $l = '')
-    {
-        $mLen = strlen($m);
-
-        // Length checking
-
-        // if $l is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
-        // be output.
-
-        if ($mLen > $this->k - 2 * $this->hLen - 2) {
-            throw new \OutOfBoundsException('Message too long');
-        }
-
-        // EME-OAEP encoding
-
-        $lHash = $this->hash->hash($l);
-        $ps = str_repeat(chr(0), $this->k - $mLen - 2 * $this->hLen - 2);
-        $db = $lHash . $ps . chr(1) . $m;
-        $seed = Random::string($this->hLen);
-        $dbMask = $this->_mgf1($seed, $this->k - $this->hLen - 1);
-        $maskedDB = $db ^ $dbMask;
-        $seedMask = $this->_mgf1($maskedDB, $this->hLen);
-        $maskedSeed = $seed ^ $seedMask;
-        $em = chr(0) . $maskedSeed . $maskedDB;
-
-        // RSA encryption
-
-        $m = $this->_os2ip($em);
-        $c = $this->_rsaep($m);
-        $c = $this->_i2osp($c, $this->k);
-
-        // Output the ciphertext C
-
-        return $c;
-    }
-
-    /**
-     * RSAES-OAEP-DECRYPT
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-7.1.2 RFC3447#section-7.1.2}.  The fact that the error
-     * messages aren't distinguishable from one another hinders debugging, but, to quote from RFC3447#section-7.1.2:
-     *
-     *    Note.  Care must be taken to ensure that an opponent cannot
-     *    distinguish the different error conditions in Step 3.g, whether by
-     *    error message or timing, or, more generally, learn partial
-     *    information about the encoded message EM.  Otherwise an opponent may
-     *    be able to obtain useful information about the decryption of the
-     *    ciphertext C, leading to a chosen-ciphertext attack such as the one
-     *    observed by Manger [36].
-     *
-     * As for $l...  to quote from {@link http://tools.ietf.org/html/rfc3447#page-17 RFC3447#page-17}:
+     * To quote from {@link http://tools.ietf.org/html/rfc3447#page-17 RFC3447#page-17}:
      *
      *    Both the encryption and the decryption operations of RSAES-OAEP take
      *    the value of a label L as input.  In this version of PKCS #1, L is
      *    the empty string; other uses of the label are outside the scope of
      *    this document.
-     *
-     * @access private
-     * @param string $c
-     * @param string $l
-     * @throws \RuntimeException on decryption error
-     * @return string
-     */
-    function _rsaes_oaep_decrypt($c, $l = '')
-    {
-        // Length checking
-
-        // if $l is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
-        // be output.
-
-        if (strlen($c) != $this->k || $this->k < 2 * $this->hLen + 2) {
-            throw new \RuntimeException('Decryption error');
-        }
-
-        // RSA decryption
-
-        $c = $this->_os2ip($c);
-        $m = $this->_rsadp($c);
-        if ($m === false) {
-            throw new \RuntimeException('Decryption error');
-        }
-        $em = $this->_i2osp($m, $this->k);
-
-        // EME-OAEP decoding
-
-        $lHash = $this->hash->hash($l);
-        $y = ord($em[0]);
-        $maskedSeed = substr($em, 1, $this->hLen);
-        $maskedDB = substr($em, $this->hLen + 1);
-        $seedMask = $this->_mgf1($maskedDB, $this->hLen);
-        $seed = $maskedSeed ^ $seedMask;
-        $dbMask = $this->_mgf1($seed, $this->k - $this->hLen - 1);
-        $db = $maskedDB ^ $dbMask;
-        $lHash2 = substr($db, 0, $this->hLen);
-        $m = substr($db, $this->hLen);
-        if ($lHash != $lHash2) {
-            throw new \RuntimeException('Decryption error');
-        }
-        $m = ltrim($m, chr(0));
-        if (ord($m[0]) != 1) {
-            throw new \RuntimeException('Decryption error');
-        }
-
-        // Output the message M
-
-        return substr($m, 1);
-    }
-
-    /**
-     * Raw Encryption / Decryption
-     *
-     * Doesn't use padding and is not recommended.
-     *
-     * @access private
-     * @param string $m
-     * @return string
-     */
-    function _raw_encrypt($m)
-    {
-        $temp = $this->_os2ip($m);
-        $temp = $this->_rsaep($temp);
-        return  $this->_i2osp($temp, $this->k);
-    }
-
-    /**
-     * RSAES-PKCS1-V1_5-ENCRYPT
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-7.2.1 RFC3447#section-7.2.1}.
-     *
-     * @access private
-     * @param string $m
-     * @throws \OutOfBoundsException if strlen($m) > $this->k - 11
-     * @return string
-     */
-    function _rsaes_pkcs1_v1_5_encrypt($m)
-    {
-        $mLen = strlen($m);
-
-        // Length checking
-
-        if ($mLen > $this->k - 11) {
-            throw new \OutOfBoundsException('Message too long');
-        }
-
-        // EME-PKCS1-v1_5 encoding
-
-        $psLen = $this->k - $mLen - 3;
-        $ps = '';
-        while (strlen($ps) != $psLen) {
-            $temp = Random::string($psLen - strlen($ps));
-            $temp = str_replace("\x00", '', $temp);
-            $ps.= $temp;
-        }
-        $type = 2;
-        // see the comments of _rsaes_pkcs1_v1_5_decrypt() to understand why this is being done
-        if (defined('CRYPT_RSA_PKCS15_COMPAT') && (!isset($this->publicExponent) || $this->exponent !== $this->publicExponent)) {
-            $type = 1;
-            // "The padding string PS shall consist of k-3-||D|| octets. ... for block type 01, they shall have value FF"
-            $ps = str_repeat("\xFF", $psLen);
-        }
-        $em = chr(0) . chr($type) . $ps . chr(0) . $m;
-
-        // RSA encryption
-        $m = $this->_os2ip($em);
-        $c = $this->_rsaep($m);
-        $c = $this->_i2osp($c, $this->k);
-
-        // Output the ciphertext C
-
-        return $c;
-    }
-
-    /**
-     * RSAES-PKCS1-V1_5-DECRYPT
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-7.2.2 RFC3447#section-7.2.2}.
-     *
-     * For compatibility purposes, this function departs slightly from the description given in RFC3447.
-     * The reason being that RFC2313#section-8.1 (PKCS#1 v1.5) states that ciphertext's encrypted by the
-     * private key should have the second byte set to either 0 or 1 and that ciphertext's encrypted by the
-     * public key should have the second byte set to 2.  In RFC3447 (PKCS#1 v2.1), the second byte is supposed
-     * to be 2 regardless of which key is used.  For compatibility purposes, we'll just check to make sure the
-     * second byte is 2 or less.  If it is, we'll accept the decrypted string as valid.
-     *
-     * As a consequence of this, a private key encrypted ciphertext produced with \phpseclib\Crypt\RSA may not decrypt
-     * with a strictly PKCS#1 v1.5 compliant RSA implementation.  Public key encrypted ciphertext's should but
-     * not private key encrypted ciphertext's.
-     *
-     * @access private
-     * @param string $c
-     * @throws \RuntimeException on decryption error
-     * @return string
      */
-    function _rsaes_pkcs1_v1_5_decrypt($c)
+    public function withLabel(string $label): RSA
     {
-        // Length checking
-
-        if (strlen($c) != $this->k) { // or if k < 11
-            throw new \RuntimeException('Decryption error');
-        }
-
-        // RSA decryption
-
-        $c = $this->_os2ip($c);
-        $m = $this->_rsadp($c);
-
-        if ($m === false) {
-            throw new \RuntimeException('Decryption error');
-        }
-        $em = $this->_i2osp($m, $this->k);
-
-        // EME-PKCS1-v1_5 decoding
-
-        if (ord($em[0]) != 0 || ord($em[1]) > 2) {
-            throw new \RuntimeException('Decryption error');
-        }
-
-        $ps = substr($em, 2, strpos($em, chr(0), 2) - 2);
-        $m = substr($em, strlen($ps) + 3);
-
-        if (strlen($ps) < 8) {
-            throw new \RuntimeException('Decryption error');
-        }
-
-        // Output M
-
-        return $m;
+        $new = clone $this;
+        $new->label = $label;
+        return $new;
     }
 
     /**
-     * EMSA-PSS-ENCODE
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-9.1.1 RFC3447#section-9.1.1}.
-     *
-     * @access private
-     * @param string $m
-     * @throws \RuntimeException on encoding error
-     * @param int $emBits
+     * Returns the label currently being used
      */
-    function _emsa_pss_encode($m, $emBits)
+    public function getLabel(): string
     {
-        // if $m is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
-        // be output.
-
-        $emLen = ($emBits + 1) >> 3; // ie. ceil($emBits / 8)
-        $sLen = $this->sLen ? $this->sLen : $this->hLen;
-
-        $mHash = $this->hash->hash($m);
-        if ($emLen < $this->hLen + $sLen + 2) {
-            throw new \RuntimeException('Encoding error');
-        }
-
-        $salt = Random::string($sLen);
-        $m2 = "\0\0\0\0\0\0\0\0" . $mHash . $salt;
-        $h = $this->hash->hash($m2);
-        $ps = str_repeat(chr(0), $emLen - $sLen - $this->hLen - 2);
-        $db = $ps . chr(1) . $salt;
-        $dbMask = $this->_mgf1($h, $emLen - $this->hLen - 1);
-        $maskedDB = $db ^ $dbMask;
-        $maskedDB[0] = ~chr(0xFF << ($emBits & 7)) & $maskedDB[0];
-        $em = $maskedDB . $h . chr(0xBC);
-
-        return $em;
+        return $this->label;
     }
 
     /**
-     * EMSA-PSS-VERIFY
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-9.1.2 RFC3447#section-9.1.2}.
+     * Determines the padding modes
      *
-     * @access private
-     * @param string $m
-     * @param string $em
-     * @param int $emBits
-     * @return string
+     * Example: $key->withPadding(RSA::ENCRYPTION_PKCS1 | RSA::SIGNATURE_PKCS1);
      */
-    function _emsa_pss_verify($m, $em, $emBits)
+    public function withPadding(int $padding): RSA
     {
-        // if $m is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
-        // be output.
-
-        $emLen = ($emBits + 1) >> 3; // ie. ceil($emBits / 8);
-        $sLen = $this->sLen ? $this->sLen : $this->hLen;
-
-        $mHash = $this->hash->hash($m);
-        if ($emLen < $this->hLen + $sLen + 2) {
-            return false;
-        }
-
-        if ($em[strlen($em) - 1] != chr(0xBC)) {
-            return false;
-        }
-
-        $maskedDB = substr($em, 0, -$this->hLen - 1);
-        $h = substr($em, -$this->hLen - 1, $this->hLen);
-        $temp = chr(0xFF << ($emBits & 7));
-        if ((~$maskedDB[0] & $temp) != $temp) {
-            return false;
-        }
-        $dbMask = $this->_mgf1($h, $emLen - $this->hLen - 1);
-        $db = $maskedDB ^ $dbMask;
-        $db[0] = ~chr(0xFF << ($emBits & 7)) & $db[0];
-        $temp = $emLen - $this->hLen - $sLen - 2;
-        if (substr($db, 0, $temp) != str_repeat(chr(0), $temp) || ord($db[$temp]) != 1) {
-            return false;
-        }
-        $salt = substr($db, $temp + 1); // should be $sLen long
-        $m2 = "\0\0\0\0\0\0\0\0" . $mHash . $salt;
-        $h2 = $this->hash->hash($m2);
-        return $this->_equals($h, $h2);
-    }
-
-    /**
-     * RSASSA-PSS-SIGN
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-8.1.1 RFC3447#section-8.1.1}.
-     *
-     * @access private
-     * @param string $m
-     * @return string
-     */
-    function _rsassa_pss_sign($m)
-    {
-        // EMSA-PSS encoding
-
-        $em = $this->_emsa_pss_encode($m, 8 * $this->k - 1);
-
-        // RSA signature
-
-        $m = $this->_os2ip($em);
-        $s = $this->_rsasp1($m);
-        $s = $this->_i2osp($s, $this->k);
-
-        // Output the signature S
-
-        return $s;
-    }
-
-    /**
-     * RSASSA-PSS-VERIFY
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-8.1.2 RFC3447#section-8.1.2}.
-     *
-     * @access private
-     * @param string $m
-     * @param string $s
-     * @throws \RuntimeException on invalid signature
-     * @return string
-     */
-    function _rsassa_pss_verify($m, $s)
-    {
-        // Length checking
-
-        if (strlen($s) != $this->k) {
-            throw new \RuntimeException('Invalid signature');
-        }
-
-        // RSA verification
-
-        $modBits = 8 * $this->k;
-
-        $s2 = $this->_os2ip($s);
-        $m2 = $this->_rsavp1($s2);
-        if ($m2 === false) {
-            throw new \RuntimeException('Invalid signature');
-        }
-        $em = $this->_i2osp($m2, $modBits >> 3);
-        if ($em === false) {
-            throw new \RuntimeException('Invalid signature');
+        $masks = [
+            self::ENCRYPTION_OAEP,
+            self::ENCRYPTION_PKCS1,
+            self::ENCRYPTION_NONE,
+        ];
+        $encryptedCount = 0;
+        $selected = 0;
+        foreach ($masks as $mask) {
+            if ($padding & $mask) {
+                $selected = $mask;
+                $encryptedCount++;
+            }
         }
-
-        // EMSA-PSS verification
-
-        return $this->_emsa_pss_verify($m, $em, $modBits - 1);
-    }
-
-    /**
-     * EMSA-PKCS1-V1_5-ENCODE
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-9.2 RFC3447#section-9.2}.
-     *
-     * @access private
-     * @param string $m
-     * @param int $emLen
-     * @throws \LengthException if the intended encoded message length is too short
-     * @return string
-     */
-    function _emsa_pkcs1_v1_5_encode($m, $emLen)
-    {
-        $h = $this->hash->hash($m);
-        if ($h === false) {
-            return false;
+        if ($encryptedCount > 1) {
+            throw new InconsistentSetupException('Multiple encryption padding modes have been selected; at most only one should be selected');
+        }
+        $encryptionPadding = $selected;
+
+        $masks = [
+            self::SIGNATURE_PSS,
+            self::SIGNATURE_RELAXED_PKCS1,
+            self::SIGNATURE_PKCS1,
+        ];
+        $signatureCount = 0;
+        $selected = 0;
+        foreach ($masks as $mask) {
+            if ($padding & $mask) {
+                $selected = $mask;
+                $signatureCount++;
+            }
         }
-
-        // see http://tools.ietf.org/html/rfc3447#page-43
-        switch ($this->hashName) {
-            case 'md2':
-                $t = pack('H*', '3020300c06082a864886f70d020205000410');
-                break;
-            case 'md5':
-                $t = pack('H*', '3020300c06082a864886f70d020505000410');
-                break;
-            case 'sha1':
-                $t = pack('H*', '3021300906052b0e03021a05000414');
-                break;
-            case 'sha256':
-                $t = pack('H*', '3031300d060960864801650304020105000420');
-                break;
-            case 'sha384':
-                $t = pack('H*', '3041300d060960864801650304020205000430');
-                break;
-            case 'sha512':
-                $t = pack('H*', '3051300d060960864801650304020305000440');
+        if ($signatureCount > 1) {
+            throw new InconsistentSetupException('Multiple signature padding modes have been selected; at most only one should be selected');
         }
-        $t.= $h;
-        $tLen = strlen($t);
+        $signaturePadding = $selected;
 
-        if ($emLen < $tLen + 11) {
-            throw new \LengthException('Intended encoded message length too short');
+        $new = clone $this;
+        if ($encryptedCount) {
+            $new->encryptionPadding = $encryptionPadding;
         }
-
-        $ps = str_repeat(chr(0xFF), $emLen - $tLen - 3);
-
-        $em = "\0\1$ps\0$t";
-
-        return $em;
-    }
-
-    /**
-     * RSASSA-PKCS1-V1_5-SIGN
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-8.2.1 RFC3447#section-8.2.1}.
-     *
-     * @access private
-     * @param string $m
-     * @throws \LengthException if the RSA modulus is too short
-     * @return string
-     */
-    function _rsassa_pkcs1_v1_5_sign($m)
-    {
-        // EMSA-PKCS1-v1_5 encoding
-
-        $em = $this->_emsa_pkcs1_v1_5_encode($m, $this->k);
-        if ($em === false) {
-            throw new \LengthException('RSA modulus too short');
+        if ($signatureCount) {
+            $new->signaturePadding = $signaturePadding;
         }
-
-        // RSA signature
-
-        $m = $this->_os2ip($em);
-        $s = $this->_rsasp1($m);
-        $s = $this->_i2osp($s, $this->k);
-
-        // Output the signature S
-
-        return $s;
+        return $new;
     }
 
     /**
-     * RSASSA-PKCS1-V1_5-VERIFY
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-8.2.2 RFC3447#section-8.2.2}.
-     *
-     * @access private
-     * @param string $m
-     * @throws \RuntimeException if the signature is invalid
-     * @throws \LengthException if the RSA modulus is too short
-     * @return string
+     * Returns the padding currently being used
      */
-    function _rsassa_pkcs1_v1_5_verify($m, $s)
+    public function getPadding(): int
     {
-        // Length checking
-
-        if (strlen($s) != $this->k) {
-            throw new \RuntimeException('Invalid signature');
-        }
-
-        // RSA verification
-
-        $s = $this->_os2ip($s);
-        $m2 = $this->_rsavp1($s);
-        if ($m2 === false) {
-            throw new \RuntimeException('Invalid signature');
-        }
-        $em = $this->_i2osp($m2, $this->k);
-        if ($em === false) {
-            throw new \RuntimeException('Invalid signature');
-        }
-
-        // EMSA-PKCS1-v1_5 encoding
-
-        $em2 = $this->_emsa_pkcs1_v1_5_encode($m, $this->k);
-        if ($em2 === false) {
-            throw new \LengthException('RSA modulus too short');
-        }
-
-        // Compare
-        return $this->_equals($em, $em2);
-    }
-
-    /**
-     * Set Encryption Mode
-     *
-     * Valid values include self::ENCRYPTION_OAEP and self::ENCRYPTION_PKCS1.
-     *
-     * @access public
-     * @param int $mode
-     */
-    function setEncryptionMode($mode)
-    {
-        $this->encryptionMode = $mode;
-    }
-
-    /**
-     * Set Signature Mode
-     *
-     * Valid values include self::SIGNATURE_PSS and self::SIGNATURE_PKCS1
-     *
-     * @access public
-     * @param int $mode
-     */
-    function setSignatureMode($mode)
-    {
-        $this->signatureMode = $mode;
+        return $this->signaturePadding | $this->encryptionPadding;
     }
 
     /**
-     * Encryption
+     * Returns the current engine being used
      *
-     * Both self::ENCRYPTION_OAEP and self::ENCRYPTION_PKCS1 both place limits on how long $plaintext can be.
-     * If $plaintext exceeds those limits it will be broken up so that it does and the resultant ciphertext's will
-     * be concatenated together.
-     *
-     * @see self::decrypt()
-     * @access public
-     * @param string $plaintext
-     * @return string
-     * @throws \LengthException if the RSA modulus is too short
-     */
-    function encrypt($plaintext)
-    {
-        switch ($this->encryptionMode) {
-            case self::ENCRYPTION_NONE:
-                $plaintext = str_split($plaintext, $this->k);
-                $ciphertext = '';
-                foreach ($plaintext as $m) {
-                    $ciphertext.= $this->_raw_encrypt($m);
-                }
-                return $ciphertext;
-            case self::ENCRYPTION_PKCS1:
-                $length = $this->k - 11;
-                if ($length <= 0) {
-                    throw new \LengthException('RSA modulus too short (' . $this->k . ' bytes long; should be more than 11 bytes with PKCS1)');
-                }
-
-                $plaintext = str_split($plaintext, $length);
-                $ciphertext = '';
-                foreach ($plaintext as $m) {
-                    $ciphertext.= $this->_rsaes_pkcs1_v1_5_encrypt($m);
-                }
-                return $ciphertext;
-            //case self::ENCRYPTION_OAEP:
-            default:
-                $length = $this->k - 2 * $this->hLen - 2;
-                if ($length <= 0) {
-                    throw new \LengthException('RSA modulus too short (' . $this->k . ' bytes long; should be more than ' . (2 * $this->hLen - 2) . ' bytes with OAEP / ' . $this->hashName . ')');
-                }
-
-                $plaintext = str_split($plaintext, $length);
-                $ciphertext = '';
-                foreach ($plaintext as $m) {
-                    $ciphertext.= $this->_rsaes_oaep_encrypt($m);
-                }
-                return $ciphertext;
-        }
-    }
-
-    /**
-     * Decryption
+     * OpenSSL is only used in this class (and it's subclasses) for key generation
+     * Even then it depends on the parameters you're using. It's not used for
+     * multi-prime RSA nor is it used if the key length is outside of the range
+     * supported by OpenSSL
      *
-     * @see self::encrypt()
-     * @access public
-     * @param string $plaintext
-     * @return string
+     * @see self::useInternalEngine()
+     * @see self::useBestEngine()
      */
-    function decrypt($ciphertext)
+    public function getEngine(): string
     {
-        if ($this->k <= 0) {
-            return false;
-        }
-
-        $ciphertext = str_split($ciphertext, $this->k);
-        $ciphertext[count($ciphertext) - 1] = str_pad($ciphertext[count($ciphertext) - 1], $this->k, chr(0), STR_PAD_LEFT);
-
-        $plaintext = '';
-
-        switch ($this->encryptionMode) {
-            case self::ENCRYPTION_NONE:
-                $decrypt = '_raw_encrypt';
-                break;
-            case self::ENCRYPTION_PKCS1:
-                $decrypt = '_rsaes_pkcs1_v1_5_decrypt';
-                break;
-            //case self::ENCRYPTION_OAEP:
-            default:
-                $decrypt = '_rsaes_oaep_decrypt';
-        }
-
-        foreach ($ciphertext as $c) {
-            $temp = $this->$decrypt($c);
-            if ($temp === false) {
-                return false;
-            }
-            $plaintext.= $temp;
+        if (!isset(self::$engines['PHP'])) {
+            self::useBestEngine();
         }
-
-        return $plaintext;
+        return self::$engines['OpenSSL'] && self::$defaultExponent == 65537 ?
+            'OpenSSL' :
+            'PHP';
     }
 
     /**
-     * Create a signature
-     *
-     * @see self::verify()
-     * @access public
-     * @param string $message
-     * @return string
+     * Enable RSA Blinding
      */
-    function sign($message)
+    public static function enableBlinding(): void
     {
-        if (empty($this->modulus) || empty($this->exponent)) {
-            return false;
-        }
-
-        switch ($this->signatureMode) {
-            case self::SIGNATURE_PKCS1:
-                return $this->_rsassa_pkcs1_v1_5_sign($message);
-            //case self::SIGNATURE_PSS:
-            default:
-                return $this->_rsassa_pss_sign($message);
-        }
+        static::$enableBlinding = true;
     }
 
     /**
-     * Verifies a signature
-     *
-     * @see self::sign()
-     * @access public
-     * @param string $message
-     * @param string $signature
-     * @return bool
+     * Disable RSA Blinding
      */
-    function verify($message, $signature)
+    public static function disableBlinding(): void
     {
-        if (empty($this->modulus) || empty($this->exponent)) {
-            return false;
-        }
-
-        switch ($this->signatureMode) {
-            case self::SIGNATURE_PKCS1:
-                return $this->_rsassa_pkcs1_v1_5_verify($message, $signature);
-            //case self::SIGNATURE_PSS:
-            default:
-                return $this->_rsassa_pss_verify($message, $signature);
-        }
+        static::$enableBlinding = false;
     }
 }
diff --git a/phpseclib/Crypt/RSA/Formats/Keys/JWK.php b/phpseclib/Crypt/RSA/Formats/Keys/JWK.php
new file mode 100644
index 000000000..78ff61355
--- /dev/null
+++ b/phpseclib/Crypt/RSA/Formats/Keys/JWK.php
@@ -0,0 +1,130 @@
+<?php
+
+/**
+ * JSON Web Key (RFC7517) Formatted RSA Handler
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\RSA\Formats\Keys;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Common\Formats\Keys\JWK as Progenitor;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * JWK Formatted RSA Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class JWK extends Progenitor
+{
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param string|array $key
+     */
+    public static function load($key, ?string $password = null): array
+    {
+        $key = parent::loadHelper($key);
+
+        if ($key->kty != 'RSA') {
+            throw new \RuntimeException('Only RSA JWK keys are supported');
+        }
+
+        $count = $publicCount = 0;
+        $vars = ['n', 'e', 'd', 'p', 'q', 'dp', 'dq', 'qi'];
+        foreach ($vars as $var) {
+            if (!isset($key->$var) || !is_string($key->$var)) {
+                continue;
+            }
+            $count++;
+            $value = new BigInteger(Strings::base64url_decode($key->$var), 256);
+            switch ($var) {
+                case 'n':
+                    $publicCount++;
+                    $components['modulus'] = $value;
+                    break;
+                case 'e':
+                    $publicCount++;
+                    $components['publicExponent'] = $value;
+                    break;
+                case 'd':
+                    $components['privateExponent'] = $value;
+                    break;
+                case 'p':
+                    $components['primes'][1] = $value;
+                    break;
+                case 'q':
+                    $components['primes'][2] = $value;
+                    break;
+                case 'dp':
+                    $components['exponents'][1] = $value;
+                    break;
+                case 'dq':
+                    $components['exponents'][2] = $value;
+                    break;
+                case 'qi':
+                    $components['coefficients'][2] = $value;
+            }
+        }
+
+        if ($count == count($vars)) {
+            return $components + ['isPublicKey' => false];
+        }
+
+        if ($count == 2 && $publicCount == 2) {
+            return $components + ['isPublicKey' => true];
+        }
+
+        throw new \UnexpectedValueException('Key does not have an appropriate number of RSA parameters');
+    }
+
+    /**
+     * Convert a private key to the appropriate format.
+     *
+     * @param string $password optional
+     * @param array $options optional
+     */
+    public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $d, array $primes, array $exponents, array $coefficients, ?string $password = null, array $options = []): string
+    {
+        if (count($primes) != 2) {
+            throw new \InvalidArgumentException('JWK does not support multi-prime RSA keys');
+        }
+
+        $key = [
+            'kty' => 'RSA',
+            'n' => Strings::base64url_encode($n->toBytes()),
+            'e' => Strings::base64url_encode($e->toBytes()),
+            'd' => Strings::base64url_encode($d->toBytes()),
+            'p' => Strings::base64url_encode($primes[1]->toBytes()),
+            'q' => Strings::base64url_encode($primes[2]->toBytes()),
+            'dp' => Strings::base64url_encode($exponents[1]->toBytes()),
+            'dq' => Strings::base64url_encode($exponents[2]->toBytes()),
+            'qi' => Strings::base64url_encode($coefficients[2]->toBytes()),
+        ];
+
+        return self::wrapKey($key, $options);
+    }
+
+    /**
+     * Convert a public key to the appropriate format
+     */
+    public static function savePublicKey(BigInteger $n, BigInteger $e, array $options = []): string
+    {
+        $key = [
+            'kty' => 'RSA',
+            'n' => Strings::base64url_encode($n->toBytes()),
+            'e' => Strings::base64url_encode($e->toBytes()),
+        ];
+
+        return self::wrapKey($key, $options);
+    }
+}
diff --git a/phpseclib/Crypt/RSA/Formats/Keys/MSBLOB.php b/phpseclib/Crypt/RSA/Formats/Keys/MSBLOB.php
new file mode 100644
index 000000000..b448044d4
--- /dev/null
+++ b/phpseclib/Crypt/RSA/Formats/Keys/MSBLOB.php
@@ -0,0 +1,208 @@
+<?php
+
+/**
+ * Miccrosoft BLOB Formatted RSA Key Handler
+ *
+ * More info:
+ *
+ * https://msdn.microsoft.com/en-us/library/windows/desktop/aa375601(v=vs.85).aspx
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\RSA\Formats\Keys;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Exception\InvalidArgumentException;
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\Exception\UnsupportedFormatException;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * Microsoft BLOB Formatted RSA Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class MSBLOB
+{
+    /**
+     * Public/Private Key Pair
+     */
+    public const PRIVATEKEYBLOB = 0x7;
+    /**
+     * Public Key
+     */
+    public const PUBLICKEYBLOB = 0x6;
+    /**
+     * Public Key
+     */
+    public const PUBLICKEYBLOBEX = 0xA;
+    /**
+     * RSA public key exchange algorithm
+     */
+    public const CALG_RSA_KEYX = 0x0000A400;
+    /**
+     * RSA public key exchange algorithm
+     */
+    public const CALG_RSA_SIGN = 0x00002400;
+    /**
+     * Public Key
+     */
+    public const RSA1 = 0x31415352;
+    /**
+     * Private Key
+     */
+    public const RSA2 = 0x32415352;
+
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param string|array $key
+     */
+    public static function load($key, ?string $password = null): array
+    {
+        if (!Strings::is_stringable($key)) {
+            throw new UnexpectedValueException('Key should be a string - not a ' . gettype($key));
+        }
+
+        $key = Strings::base64_decode($key);
+
+        if (!is_string($key)) {
+            throw new UnexpectedValueException('Base64 decoding produced an error');
+        }
+        if (strlen($key) < 20) {
+            throw new UnexpectedValueException('Key appears to be malformed');
+        }
+
+        // PUBLICKEYSTRUC  publickeystruc
+        // https://msdn.microsoft.com/en-us/library/windows/desktop/aa387453(v=vs.85).aspx
+        [
+            'type' => $type,
+            'version' => $version,
+            'reserved' => $reserved,
+            'algo' => $algo
+        ] = unpack('atype/aversion/vreserved/Valgo', Strings::shift($key, 8));
+        switch (ord($type)) {
+            case self::PUBLICKEYBLOB:
+            case self::PUBLICKEYBLOBEX:
+                $publickey = true;
+                break;
+            case self::PRIVATEKEYBLOB:
+                $publickey = false;
+                break;
+            default:
+                throw new UnexpectedValueException('Key appears to be malformed');
+        }
+
+        $components = ['isPublicKey' => $publickey];
+
+        // https://msdn.microsoft.com/en-us/library/windows/desktop/aa375549(v=vs.85).aspx
+        switch ($algo) {
+            case self::CALG_RSA_KEYX:
+            case self::CALG_RSA_SIGN:
+                break;
+            default:
+                throw new UnexpectedValueException('Key appears to be malformed');
+        }
+
+        // RSAPUBKEY rsapubkey
+        // https://msdn.microsoft.com/en-us/library/windows/desktop/aa387685(v=vs.85).aspx
+        // could do V for pubexp but that's unsigned 32-bit whereas some PHP installs only do signed 32-bit
+        [
+            'magic' => $magic,
+            'bitlen' => $bitlen,
+            'pubexp' => $pubexp
+        ] = unpack('Vmagic/Vbitlen/a4pubexp', Strings::shift($key, 12));
+        switch ($magic) {
+            case self::RSA2:
+                $components['isPublicKey'] = false;
+                // fall-through
+            case self::RSA1:
+                break;
+            default:
+                throw new UnexpectedValueException('Key appears to be malformed');
+        }
+
+        $baseLength = $bitlen / 16;
+        if (strlen($key) != 2 * $baseLength && strlen($key) != 9 * $baseLength) {
+            throw new UnexpectedValueException('Key appears to be malformed');
+        }
+
+        $components[$components['isPublicKey'] ? 'publicExponent' : 'privateExponent'] = new BigInteger(strrev($pubexp), 256);
+        // BYTE modulus[rsapubkey.bitlen/8]
+        $components['modulus'] = new BigInteger(strrev(Strings::shift($key, $bitlen / 8)), 256);
+
+        if ($publickey) {
+            return $components;
+        }
+
+        $components['isPublicKey'] = false;
+
+        // BYTE prime1[rsapubkey.bitlen/16]
+        $components['primes'] = [1 => new BigInteger(strrev(Strings::shift($key, $bitlen / 16)), 256)];
+        // BYTE prime2[rsapubkey.bitlen/16]
+        $components['primes'][] = new BigInteger(strrev(Strings::shift($key, $bitlen / 16)), 256);
+        // BYTE exponent1[rsapubkey.bitlen/16]
+        $components['exponents'] = [1 => new BigInteger(strrev(Strings::shift($key, $bitlen / 16)), 256)];
+        // BYTE exponent2[rsapubkey.bitlen/16]
+        $components['exponents'][] = new BigInteger(strrev(Strings::shift($key, $bitlen / 16)), 256);
+        // BYTE coefficient[rsapubkey.bitlen/16]
+        $components['coefficients'] = [2 => new BigInteger(strrev(Strings::shift($key, $bitlen / 16)), 256)];
+        if (isset($components['privateExponent'])) {
+            $components['publicExponent'] = $components['privateExponent'];
+        }
+        // BYTE privateExponent[rsapubkey.bitlen/8]
+        $components['privateExponent'] = new BigInteger(strrev(Strings::shift($key, $bitlen / 8)), 256);
+
+        return $components;
+    }
+
+    /**
+     * Convert a private key to the appropriate format.
+     */
+    public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $d, array $primes, array $exponents, array $coefficients, ?string $password = null): string
+    {
+        if (count($primes) != 2) {
+            throw new InvalidArgumentException('MSBLOB does not support multi-prime RSA keys');
+        }
+
+        if (!empty($password) && is_string($password)) {
+            throw new UnsupportedFormatException('MSBLOB private keys do not support encryption');
+        }
+
+        $n = strrev($n->toBytes());
+        $e = str_pad(strrev($e->toBytes()), 4, "\0");
+        $key = pack('aavV', chr(self::PRIVATEKEYBLOB), chr(2), 0, self::CALG_RSA_KEYX);
+        $key .= pack('VVa*', self::RSA2, 8 * strlen($n), $e);
+        $key .= $n;
+        $key .= strrev($primes[1]->toBytes());
+        $key .= strrev($primes[2]->toBytes());
+        $key .= strrev($exponents[1]->toBytes());
+        $key .= strrev($exponents[2]->toBytes());
+        $key .= strrev($coefficients[2]->toBytes());
+        $key .= strrev($d->toBytes());
+
+        return Strings::base64_encode($key);
+    }
+
+    /**
+     * Convert a public key to the appropriate format
+     */
+    public static function savePublicKey(BigInteger $n, BigInteger $e): string
+    {
+        $n = strrev($n->toBytes());
+        $e = str_pad(strrev($e->toBytes()), 4, "\0");
+        $key = pack('aavV', chr(self::PUBLICKEYBLOB), chr(2), 0, self::CALG_RSA_KEYX);
+        $key .= pack('VVa*', self::RSA1, 8 * strlen($n), $e);
+        $key .= $n;
+
+        return Strings::base64_encode($key);
+    }
+}
diff --git a/phpseclib/Crypt/RSA/Formats/Keys/OpenSSH.php b/phpseclib/Crypt/RSA/Formats/Keys/OpenSSH.php
new file mode 100644
index 000000000..2eee1448f
--- /dev/null
+++ b/phpseclib/Crypt/RSA/Formats/Keys/OpenSSH.php
@@ -0,0 +1,120 @@
+<?php
+
+/**
+ * OpenSSH Formatted RSA Key Handler
+ *
+ * PHP version 5
+ *
+ * Place in $HOME/.ssh/authorized_keys
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\RSA\Formats\Keys;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Common\Formats\Keys\OpenSSH as Progenitor;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * OpenSSH Formatted RSA Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class OpenSSH extends Progenitor
+{
+    /**
+     * Supported Key Types
+     *
+     * @var array
+     */
+    protected static $types = ['ssh-rsa'];
+
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param string|array $key
+     */
+    public static function load($key, ?string $password = null): array
+    {
+        static $one;
+        if (!isset($one)) {
+            $one = new BigInteger(1);
+        }
+
+        $parsed = parent::load($key, $password);
+
+        if (isset($parsed['paddedKey'])) {
+            [$type] = Strings::unpackSSH2('s', $parsed['paddedKey']);
+            if ($type != $parsed['type']) {
+                throw new RuntimeException("The public and private keys are not of the same type ($type vs $parsed[type])");
+            }
+
+            $primes = $coefficients = [];
+
+            [
+                $modulus,
+                $publicExponent,
+                $privateExponent,
+                $coefficients[2],
+                $primes[1],
+                $primes[2],
+                $comment,
+            ] = Strings::unpackSSH2('i6s', $parsed['paddedKey']);
+
+            $temp = $primes[1]->subtract($one);
+            $exponents = [1 => $publicExponent->modInverse($temp)];
+            $temp = $primes[2]->subtract($one);
+            $exponents[] = $publicExponent->modInverse($temp);
+
+            $isPublicKey = false;
+
+            return compact('publicExponent', 'modulus', 'privateExponent', 'primes', 'coefficients', 'exponents', 'comment', 'isPublicKey');
+        }
+
+        [$publicExponent, $modulus] = Strings::unpackSSH2('ii', $parsed['publicKey']);
+
+        return [
+            'isPublicKey' => true,
+            'modulus' => $modulus,
+            'publicExponent' => $publicExponent,
+            'comment' => $parsed['comment'],
+        ];
+    }
+
+    /**
+     * Convert a public key to the appropriate format
+     *
+     * @param array $options optional
+     */
+    public static function savePublicKey(BigInteger $n, BigInteger $e, array $options = []): string
+    {
+        $RSAPublicKey = Strings::packSSH2('sii', 'ssh-rsa', $e, $n);
+
+        if ($options['binary'] ?? self::$binary) {
+            return $RSAPublicKey;
+        }
+
+        $comment = $options['comment'] ?? self::$comment;
+        $RSAPublicKey = 'ssh-rsa ' . base64_encode($RSAPublicKey) . ' ' . $comment;
+
+        return $RSAPublicKey;
+    }
+
+    /**
+     * Convert a private key to the appropriate format.
+     */
+    public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $d, array $primes, array $exponents, array $coefficients, ?string $password = null, array $options = []): string
+    {
+        $publicKey = self::savePublicKey($n, $e, ['binary' => true]);
+        $privateKey = Strings::packSSH2('si6', 'ssh-rsa', $n, $e, $d, $coefficients[2], $primes[1], $primes[2]);
+
+        return self::wrapPrivateKey($publicKey, $privateKey, $password, $options);
+    }
+}
diff --git a/phpseclib/Crypt/RSA/Formats/Keys/PKCS1.php b/phpseclib/Crypt/RSA/Formats/Keys/PKCS1.php
new file mode 100644
index 000000000..15794b429
--- /dev/null
+++ b/phpseclib/Crypt/RSA/Formats/Keys/PKCS1.php
@@ -0,0 +1,152 @@
+<?php
+
+/**
+ * PKCS#1 Formatted RSA Key Handler
+ *
+ * PHP version 5
+ *
+ * Used by File/X509.php
+ *
+ * Processes keys with the following headers:
+ *
+ * -----BEGIN RSA PRIVATE KEY-----
+ * -----BEGIN RSA PUBLIC KEY-----
+ *
+ * Analogous to ssh-keygen's pem format (as specified by -m)
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\RSA\Formats\Keys;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Common\Formats\Keys\PKCS1 as Progenitor;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\File\ASN1;
+use phpseclib3\File\ASN1\Maps;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * PKCS#1 Formatted RSA Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PKCS1 extends Progenitor
+{
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param string|array $key
+     * @param string|false $password
+     */
+    public static function load($key, ?string $password = null): array
+    {
+        if (!Strings::is_stringable($key)) {
+            throw new UnexpectedValueException('Key should be a string - not a ' . gettype($key));
+        }
+
+        if (str_contains($key, 'PUBLIC')) {
+            $components = ['isPublicKey' => true];
+        } elseif (str_contains($key, 'PRIVATE')) {
+            $components = ['isPublicKey' => false];
+        } else {
+            $components = [];
+        }
+
+        $key = parent::load($key, $password);
+
+        $decoded = ASN1::decodeBER($key);
+        if (!$decoded) {
+            throw new RuntimeException('Unable to decode BER');
+        }
+
+        $key = ASN1::asn1map($decoded[0], Maps\RSAPrivateKey::MAP);
+        if (is_array($key)) {
+            $components += [
+                'modulus' => $key['modulus'],
+                'publicExponent' => $key['publicExponent'],
+                'privateExponent' => $key['privateExponent'],
+                'primes' => [1 => $key['prime1'], $key['prime2']],
+                'exponents' => [1 => $key['exponent1'], $key['exponent2']],
+                'coefficients' => [2 => $key['coefficient']],
+            ];
+            if ($key['version'] == 'multi') {
+                foreach ($key['otherPrimeInfos'] as $primeInfo) {
+                    $components['primes'][] = $primeInfo['prime'];
+                    $components['exponents'][] = $primeInfo['exponent'];
+                    $components['coefficients'][] = $primeInfo['coefficient'];
+                }
+            }
+            if (!isset($components['isPublicKey'])) {
+                $components['isPublicKey'] = false;
+            }
+            return $components;
+        }
+
+        $key = ASN1::asn1map($decoded[0], Maps\RSAPublicKey::MAP);
+
+        if (!is_array($key)) {
+            throw new RuntimeException('Unable to perform ASN1 mapping');
+        }
+
+        if (!isset($components['isPublicKey'])) {
+            $components['isPublicKey'] = true;
+        }
+
+        return $components + $key;
+    }
+
+    /**
+     * Convert a private key to the appropriate format.
+     *
+     * @param string|false $password
+     * @param array $options optional
+     */
+    public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $d, array $primes, array $exponents, array $coefficients, ?string $password = null, array $options = []): string
+    {
+        $num_primes = count($primes);
+        $key = [
+            'version' => $num_primes == 2 ? 'two-prime' : 'multi',
+            'modulus' => $n,
+            'publicExponent' => $e,
+            'privateExponent' => $d,
+            'prime1' => $primes[1],
+            'prime2' => $primes[2],
+            'exponent1' => $exponents[1],
+            'exponent2' => $exponents[2],
+            'coefficient' => $coefficients[2],
+        ];
+        for ($i = 3; $i <= $num_primes; $i++) {
+            $key['otherPrimeInfos'][] = [
+                'prime' => $primes[$i],
+                'exponent' => $exponents[$i],
+                'coefficient' => $coefficients[$i],
+            ];
+        }
+
+        $key = ASN1::encodeDER($key, Maps\RSAPrivateKey::MAP);
+
+        return self::wrapPrivateKey($key, 'RSA', $password, $options);
+    }
+
+    /**
+     * Convert a public key to the appropriate format
+     */
+    public static function savePublicKey(BigInteger $n, BigInteger $e): string
+    {
+        $key = [
+            'modulus' => $n,
+            'publicExponent' => $e,
+        ];
+
+        $key = ASN1::encodeDER($key, Maps\RSAPublicKey::MAP);
+
+        return self::wrapPublicKey($key, 'RSA');
+    }
+}
diff --git a/phpseclib/Crypt/RSA/Formats/Keys/PKCS8.php b/phpseclib/Crypt/RSA/Formats/Keys/PKCS8.php
new file mode 100644
index 000000000..c9696d2e9
--- /dev/null
+++ b/phpseclib/Crypt/RSA/Formats/Keys/PKCS8.php
@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * PKCS#8 Formatted RSA Key Handler
+ *
+ * PHP version 5
+ *
+ * Used by PHP's openssl_public_encrypt() and openssl's rsautl (when -pubin is set)
+ *
+ * Processes keys with the following headers:
+ *
+ * -----BEGIN ENCRYPTED PRIVATE KEY-----
+ * -----BEGIN PRIVATE KEY-----
+ * -----BEGIN PUBLIC KEY-----
+ *
+ * Analogous to ssh-keygen's pkcs8 format (as specified by -m). Although PKCS8
+ * is specific to private keys it's basically creating a DER-encoded wrapper
+ * for keys. This just extends that same concept to public keys (much like ssh-keygen)
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\RSA\Formats\Keys;
+
+use phpseclib3\Crypt\Common\Formats\Keys\PKCS8 as Progenitor;
+use phpseclib3\File\ASN1;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * PKCS#8 Formatted RSA Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PKCS8 extends Progenitor
+{
+    /**
+     * OID Name
+     *
+     * @var string
+     */
+    public const OID_NAME = 'rsaEncryption';
+
+    /**
+     * OID Value
+     *
+     * @var string
+     */
+    public const OID_VALUE = '1.2.840.113549.1.1.1';
+
+    /**
+     * Child OIDs loaded
+     *
+     * @var bool
+     */
+    protected static $childOIDsLoaded = false;
+
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param string|array $key
+     */
+    public static function load($key, ?string $password = null): array
+    {
+        $key = parent::load($key, $password);
+
+        if (isset($key['privateKey'])) {
+            $components['isPublicKey'] = false;
+            $type = 'private';
+        } else {
+            $components['isPublicKey'] = true;
+            $type = 'public';
+        }
+
+        $result = $components + PKCS1::load($key[$type . 'Key']);
+
+        if (isset($key['meta'])) {
+            $result['meta'] = $key['meta'];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Convert a private key to the appropriate format.
+     */
+    public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $d, array $primes, array $exponents, array $coefficients, ?string $password = null, array $options = []): string
+    {
+        $key = PKCS1::savePrivateKey($n, $e, $d, $primes, $exponents, $coefficients);
+        $key = ASN1::extractBER($key);
+        return self::wrapPrivateKey($key, [], null, $password, null, '', $options);
+    }
+
+    /**
+     * Convert a public key to the appropriate format
+     *
+     * @param array $options optional
+     */
+    public static function savePublicKey(BigInteger $n, BigInteger $e, array $options = []): string
+    {
+        $key = PKCS1::savePublicKey($n, $e);
+        $key = ASN1::extractBER($key);
+        return self::wrapPublicKey($key, null, null, $options);
+    }
+}
diff --git a/phpseclib/Crypt/RSA/Formats/Keys/PSS.php b/phpseclib/Crypt/RSA/Formats/Keys/PSS.php
new file mode 100644
index 000000000..eec73b23a
--- /dev/null
+++ b/phpseclib/Crypt/RSA/Formats/Keys/PSS.php
@@ -0,0 +1,225 @@
+<?php
+
+/**
+ * PKCS#8 Formatted RSA-PSS Key Handler
+ *
+ * PHP version 5
+ *
+ * Used by PHP's openssl_public_encrypt() and openssl's rsautl (when -pubin is set)
+ *
+ * Processes keys with the following headers:
+ *
+ * -----BEGIN ENCRYPTED PRIVATE KEY-----
+ * -----BEGIN PRIVATE KEY-----
+ * -----BEGIN PUBLIC KEY-----
+ *
+ * Analogous to "openssl genpkey -algorithm rsa-pss".
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\RSA\Formats\Keys;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Common\Formats\Keys\PKCS8 as Progenitor;
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\File\ASN1;
+use phpseclib3\File\ASN1\Maps;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * PKCS#8 Formatted RSA-PSS Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PSS extends Progenitor
+{
+    /**
+     * OID Name
+     *
+     * @var string
+     */
+    public const OID_NAME = 'id-RSASSA-PSS';
+
+    /**
+     * OID Value
+     *
+     * @var string
+     */
+    public const OID_VALUE = '1.2.840.113549.1.1.10';
+
+    /**
+     * OIDs loaded
+     *
+     * @var bool
+     */
+    private static $oidsLoaded = false;
+
+    /**
+     * Child OIDs loaded
+     *
+     * @var bool
+     */
+    protected static $childOIDsLoaded = false;
+
+    /**
+     * Initialize static variables
+     */
+    private static function initialize_static_variables(): void
+    {
+        if (!self::$oidsLoaded) {
+            ASN1::loadOIDs([
+                'md2' => '1.2.840.113549.2.2',
+                'md4' => '1.2.840.113549.2.4',
+                'md5' => '1.2.840.113549.2.5',
+                'id-sha1' => '1.3.14.3.2.26',
+                'id-sha256' => '2.16.840.1.101.3.4.2.1',
+                'id-sha384' => '2.16.840.1.101.3.4.2.2',
+                'id-sha512' => '2.16.840.1.101.3.4.2.3',
+                'id-sha224' => '2.16.840.1.101.3.4.2.4',
+                'id-sha512/224' => '2.16.840.1.101.3.4.2.5',
+                'id-sha512/256' => '2.16.840.1.101.3.4.2.6',
+
+                'id-mgf1' => '1.2.840.113549.1.1.8',
+            ]);
+            self::$oidsLoaded = true;
+        }
+    }
+
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param string|array $key
+     */
+    public static function load($key, ?string $password = null): array
+    {
+        self::initialize_static_variables();
+
+        if (!Strings::is_stringable($key)) {
+            throw new UnexpectedValueException('Key should be a string - not a ' . gettype($key));
+        }
+
+        $components = ['isPublicKey' => str_contains($key, 'PUBLIC')];
+
+        $key = parent::load($key, $password);
+
+        $type = isset($key['privateKey']) ? 'private' : 'public';
+
+        $result = $components + PKCS1::load($key[$type . 'Key']);
+
+        if (isset($key[$type . 'KeyAlgorithm']['parameters'])) {
+            $decoded = ASN1::decodeBER($key[$type . 'KeyAlgorithm']['parameters']);
+            if ($decoded === false) {
+                throw new UnexpectedValueException('Unable to decode parameters');
+            }
+            $params = ASN1::asn1map($decoded[0], Maps\RSASSA_PSS_params::MAP);
+        } else {
+            $params = [];
+        }
+
+        if (isset($params['maskGenAlgorithm']['parameters'])) {
+            $decoded = ASN1::decodeBER($params['maskGenAlgorithm']['parameters']);
+            if ($decoded === false) {
+                throw new UnexpectedValueException('Unable to decode parameters');
+            }
+            $params['maskGenAlgorithm']['parameters'] = ASN1::asn1map($decoded[0], Maps\HashAlgorithm::MAP);
+        } else {
+            $params['maskGenAlgorithm'] = [
+                'algorithm' => 'id-mgf1',
+                'parameters' => ['algorithm' => 'id-sha1'],
+            ];
+        }
+
+        if (!isset($params['hashAlgorithm']['algorithm'])) {
+            $params['hashAlgorithm']['algorithm'] = 'id-sha1';
+        }
+
+        $result['hash'] = str_replace('id-', '', $params['hashAlgorithm']['algorithm']);
+        $result['MGFHash'] = str_replace('id-', '', $params['maskGenAlgorithm']['parameters']['algorithm']);
+        if (isset($params['saltLength'])) {
+            $result['saltLength'] = (int) $params['saltLength']->toString();
+        }
+
+        if (isset($key['meta'])) {
+            $result['meta'] = $key['meta'];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Convert a private key to the appropriate format.
+     */
+    public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $d, array $primes, array $exponents, array $coefficients, ?string $password = null, array $options = []): string
+    {
+        self::initialize_static_variables();
+
+        $key = PKCS1::savePrivateKey($n, $e, $d, $primes, $exponents, $coefficients);
+        $key = ASN1::extractBER($key);
+        $params = self::savePSSParams($options);
+        return self::wrapPrivateKey($key, [], $params, $password, null, '', $options);
+    }
+
+    /**
+     * Convert a public key to the appropriate format
+     *
+     * @param array $options optional
+     */
+    public static function savePublicKey(BigInteger $n, BigInteger $e, array $options = []): string
+    {
+        self::initialize_static_variables();
+
+        $key = PKCS1::savePublicKey($n, $e);
+        $key = ASN1::extractBER($key);
+        $params = self::savePSSParams($options);
+        return self::wrapPublicKey($key, $params);
+    }
+
+    /**
+     * Encodes PSS parameters
+     *
+     * @return string
+     */
+    public static function savePSSParams(array $options)
+    {
+        /*
+         The trailerField field is an integer.  It provides
+         compatibility with IEEE Std 1363a-2004 [P1363A].  The value
+         MUST be 1, which represents the trailer field with hexadecimal
+         value 0xBC.  Other trailer fields, including the trailer field
+         composed of HashID concatenated with 0xCC that is specified in
+         IEEE Std 1363a, are not supported.  Implementations that
+         perform signature generation MUST omit the trailerField field,
+         indicating that the default trailer field value was used.
+         Implementations that perform signature validation MUST
+         recognize both a present trailerField field with value 1 and an
+         absent trailerField field.
+
+         source: https://tools.ietf.org/html/rfc4055#page-9
+        */
+        $params = [
+            'trailerField' => new BigInteger(1),
+        ];
+        if (isset($options['hash'])) {
+            $params['hashAlgorithm']['algorithm'] = 'id-' . $options['hash'];
+        }
+        if (isset($options['MGFHash'])) {
+            $temp = ['algorithm' => 'id-' . $options['MGFHash']];
+            $temp = ASN1::encodeDER($temp, Maps\HashAlgorithm::MAP);
+            $params['maskGenAlgorithm'] = [
+                'algorithm' => 'id-mgf1',
+                'parameters' => new ASN1\Element($temp),
+            ];
+        }
+        if (isset($options['saltLength'])) {
+            $params['saltLength'] = new BigInteger($options['saltLength']);
+        }
+
+        return new ASN1\Element(ASN1::encodeDER($params, Maps\RSASSA_PSS_params::MAP));
+    }
+}
diff --git a/phpseclib/Crypt/RSA/Formats/Keys/PuTTY.php b/phpseclib/Crypt/RSA/Formats/Keys/PuTTY.php
new file mode 100644
index 000000000..a810c8703
--- /dev/null
+++ b/phpseclib/Crypt/RSA/Formats/Keys/PuTTY.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * PuTTY Formatted RSA Key Handler
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\RSA\Formats\Keys;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Common\Formats\Keys\PuTTY as Progenitor;
+use phpseclib3\Exception\InvalidArgumentException;
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * PuTTY Formatted RSA Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PuTTY extends Progenitor
+{
+    /**
+     * Public Handler
+     *
+     * @var string
+     */
+    public const PUBLIC_HANDLER = 'phpseclib3\Crypt\RSA\Formats\Keys\OpenSSH';
+
+    /**
+     * Algorithm Identifier
+     *
+     * @var array
+     */
+    protected static $types = ['ssh-rsa'];
+
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param array|string $key
+     * @param string|false $password
+     * @return array|false
+     */
+    public static function load($key, $password)
+    {
+        static $one;
+        if (!isset($one)) {
+            $one = new BigInteger(1);
+        }
+
+        $components = parent::load($key, $password);
+        if (!isset($components['private'])) {
+            return $components;
+        }
+        [
+            'type' => $type,
+            'comment' => $comment,
+            'public' => $public,
+            'private' => $private
+        ] = $components;
+        unset($components['public'], $components['private']);
+
+        $isPublicKey = false;
+
+        $result = Strings::unpackSSH2('ii', $public);
+        if ($result === false) {
+            throw new UnexpectedValueException('Key appears to be malformed');
+        }
+        [$publicExponent, $modulus] = $result;
+
+        $result = Strings::unpackSSH2('iiii', $private);
+        if ($result === false) {
+            throw new UnexpectedValueException('Key appears to be malformed');
+        }
+        $primes = $coefficients = [];
+        [$privateExponent, $primes[1], $primes[2], $coefficients[2]] = $result;
+
+        $temp = $primes[1]->subtract($one);
+        $exponents = [1 => $publicExponent->modInverse($temp)];
+        $temp = $primes[2]->subtract($one);
+        $exponents[] = $publicExponent->modInverse($temp);
+
+        return compact('publicExponent', 'modulus', 'privateExponent', 'primes', 'coefficients', 'exponents', 'comment', 'isPublicKey');
+    }
+
+    /**
+     * Convert a private key to the appropriate format.
+     */
+    public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $d, array $primes, array $exponents, array $coefficients, ?string $password = null, array $options = []): string
+    {
+        if (count($primes) != 2) {
+            throw new InvalidArgumentException('PuTTY does not support multi-prime RSA keys');
+        }
+
+        $public =  Strings::packSSH2('ii', $e, $n);
+        $private = Strings::packSSH2('iiii', $d, $primes[1], $primes[2], $coefficients[2]);
+
+        return self::wrapPrivateKey($public, $private, 'ssh-rsa', $password, $options);
+    }
+
+    /**
+     * Convert a public key to the appropriate format
+     */
+    public static function savePublicKey(BigInteger $n, BigInteger $e): string
+    {
+        return self::wrapPublicKey(Strings::packSSH2('ii', $e, $n), 'ssh-rsa');
+    }
+}
diff --git a/phpseclib/Crypt/RSA/Formats/Keys/Raw.php b/phpseclib/Crypt/RSA/Formats/Keys/Raw.php
new file mode 100644
index 000000000..806f9bc3a
--- /dev/null
+++ b/phpseclib/Crypt/RSA/Formats/Keys/Raw.php
@@ -0,0 +1,166 @@
+<?php
+
+/**
+ * Raw RSA Key Handler
+ *
+ * PHP version 5
+ *
+ * An array containing two \phpseclib3\Math\BigInteger objects.
+ *
+ * The exponent can be indexed with any of the following:
+ *
+ * 0, e, exponent, publicExponent
+ *
+ * The modulus can be indexed with any of the following:
+ *
+ * 1, n, modulo, modulus
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\RSA\Formats\Keys;
+
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\Exception\UnsupportedFormatException;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * Raw RSA Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Raw
+{
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param string|array $key
+     */
+    public static function load($key, ?string $password = null): array
+    {
+        if (!is_array($key)) {
+            throw new UnexpectedValueException('Key should be a array - not a ' . gettype($key));
+        }
+
+        $key = array_change_key_case($key, CASE_LOWER);
+
+        $components = ['isPublicKey' => false];
+
+        foreach (['e', 'exponent', 'publicexponent', 0, 'privateexponent', 'd'] as $index) {
+            if (isset($key[$index])) {
+                $components['publicExponent'] = $key[$index];
+                break;
+            }
+        }
+
+        foreach (['n', 'modulo', 'modulus', 1] as $index) {
+            if (isset($key[$index])) {
+                $components['modulus'] = $key[$index];
+                break;
+            }
+        }
+
+        if (!isset($components['publicExponent']) || !isset($components['modulus'])) {
+            throw new UnexpectedValueException('Modulus / exponent not present');
+        }
+
+        if (isset($key['primes'])) {
+            $components['primes'] = $key['primes'];
+        } elseif (isset($key['p']) && isset($key['q'])) {
+            $indices = [
+                ['p', 'q'],
+                ['prime1', 'prime2'],
+            ];
+            foreach ($indices as $index) {
+                [$i0, $i1] = $index;
+                if (isset($key[$i0]) && isset($key[$i1])) {
+                    $components['primes'] = [1 => $key[$i0], $key[$i1]];
+                }
+            }
+        }
+
+        if (isset($key['exponents'])) {
+            $components['exponents'] = $key['exponents'];
+        } else {
+            $indices = [
+                ['dp', 'dq'],
+                ['exponent1', 'exponent2'],
+            ];
+            foreach ($indices as $index) {
+                [$i0, $i1] = $index;
+                if (isset($key[$i0]) && isset($key[$i1])) {
+                    $components['exponents'] = [1 => $key[$i0], $key[$i1]];
+                }
+            }
+        }
+
+        if (isset($key['coefficients'])) {
+            $components['coefficients'] = $key['coefficients'];
+        } else {
+            foreach (['inverseq', 'q\'', 'coefficient'] as $index) {
+                if (isset($key[$index])) {
+                    $components['coefficients'] = [2 => $key[$index]];
+                }
+            }
+        }
+
+        if (!isset($components['primes'])) {
+            $components['isPublicKey'] = true;
+            return $components;
+        }
+
+        if (!isset($components['exponents'])) {
+            $one = new BigInteger(1);
+            $temp = $components['primes'][1]->subtract($one);
+            $exponents = [1 => $components['publicExponent']->modInverse($temp)];
+            $temp = $components['primes'][2]->subtract($one);
+            $exponents[] = $components['publicExponent']->modInverse($temp);
+            $components['exponents'] = $exponents;
+        }
+
+        if (!isset($components['coefficients'])) {
+            $components['coefficients'] = [2 => $components['primes'][2]->modInverse($components['primes'][1])];
+        }
+
+        foreach (['privateexponent', 'd'] as $index) {
+            if (isset($key[$index])) {
+                $components['privateExponent'] = $key[$index];
+                break;
+            }
+        }
+
+        return $components;
+    }
+
+    /**
+     * Convert a private key to the appropriate format.
+     */
+    public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $d, array $primes, array $exponents, array $coefficients, ?string $password = null, array $options = []): string
+    {
+        if (!empty($password) && is_string($password)) {
+            throw new UnsupportedFormatException('Raw private keys do not support encryption');
+        }
+
+        return serialize([
+            'e' => clone $e,
+            'n' => clone $n,
+            'd' => clone $d,
+            'primes' => array_map(fn ($var) => clone $var, $primes),
+            'exponents' => array_map(fn ($var) => clone $var, $exponents),
+            'coefficients' => array_map(fn ($var) => clone $var, $coefficients),
+        ]);
+    }
+
+    /**
+     * Convert a public key to the appropriate format
+     */
+    public static function savePublicKey(BigInteger $n, BigInteger $e): array
+    {
+        return ['e' => clone $e, 'n' => clone $n];
+    }
+}
diff --git a/phpseclib/Crypt/RSA/Formats/Keys/XML.php b/phpseclib/Crypt/RSA/Formats/Keys/XML.php
new file mode 100644
index 000000000..bd0d8c7f2
--- /dev/null
+++ b/phpseclib/Crypt/RSA/Formats/Keys/XML.php
@@ -0,0 +1,162 @@
+<?php
+
+/**
+ * XML Formatted RSA Key Handler
+ *
+ * More info:
+ *
+ * http://www.w3.org/TR/xmldsig-core/#sec-RSAKeyValue
+ * http://www.w3.org/TR/xkms2/#XKMS_2_0_Paragraph_269
+ * http://en.wikipedia.org/wiki/XML_Signature
+ * http://en.wikipedia.org/wiki/XKMS
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\RSA\Formats\Keys;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Exception\BadConfigurationException;
+use phpseclib3\Exception\InvalidArgumentException;
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\Exception\UnsupportedFormatException;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * XML Formatted RSA Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class XML
+{
+    /**
+     * Break a public or private key down into its constituent components
+     *
+     * @param string|array $key
+     */
+    public static function load($key): array
+    {
+        if (!Strings::is_stringable($key)) {
+            throw new UnexpectedValueException('Key should be a string - not a ' . gettype($key));
+        }
+
+        if (!class_exists('DOMDocument')) {
+            throw new BadConfigurationException('The dom extension is not setup correctly on this system');
+        }
+
+        $components = [
+            'isPublicKey' => false,
+            'primes' => [],
+            'exponents' => [],
+            'coefficients' => [],
+        ];
+
+        $use_errors = libxml_use_internal_errors(true);
+
+        $dom = new \DOMDocument();
+        if (substr($key, 0, 5) != '<?xml') {
+            $key = '<xml>' . $key . '</xml>';
+        }
+        if (!$dom->loadXML($key)) {
+            libxml_use_internal_errors($use_errors);
+            throw new UnexpectedValueException('Key does not appear to contain XML');
+        }
+        $xpath = new \DOMXPath($dom);
+        $keys = ['modulus', 'exponent', 'p', 'q', 'dp', 'dq', 'inverseq', 'd'];
+        foreach ($keys as $key) {
+            // $dom->getElementsByTagName($key) is case-sensitive
+            $temp = $xpath->query("//*[translate(local-name(), 'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz')='$key']");
+            if (!$temp->length) {
+                continue;
+            }
+            $value = new BigInteger(Strings::base64_decode($temp->item(0)->nodeValue), 256);
+            switch ($key) {
+                case 'modulus':
+                    $components['modulus'] = $value;
+                    break;
+                case 'exponent':
+                    $components['publicExponent'] = $value;
+                    break;
+                case 'p':
+                    $components['primes'][1] = $value;
+                    break;
+                case 'q':
+                    $components['primes'][2] = $value;
+                    break;
+                case 'dp':
+                    $components['exponents'][1] = $value;
+                    break;
+                case 'dq':
+                    $components['exponents'][2] = $value;
+                    break;
+                case 'inverseq':
+                    $components['coefficients'][2] = $value;
+                    break;
+                case 'd':
+                    $components['privateExponent'] = $value;
+            }
+        }
+
+        libxml_use_internal_errors($use_errors);
+
+        foreach ($components as $key => $value) {
+            if (is_array($value) && !count($value)) {
+                unset($components[$key]);
+            }
+        }
+
+        if (isset($components['modulus']) && isset($components['publicExponent'])) {
+            if (count($components) == 3) {
+                $components['isPublicKey'] = true;
+            }
+            return $components;
+        }
+
+        throw new UnexpectedValueException('Modulus / exponent not present');
+    }
+
+    /**
+     * Convert a private key to the appropriate format.
+     *
+     * @param string $password optional
+     */
+    public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $d, array $primes, array $exponents, array $coefficients, string $password = ''): string
+    {
+        if (count($primes) != 2) {
+            throw new InvalidArgumentException('XML does not support multi-prime RSA keys');
+        }
+
+        if (!empty($password) && is_string($password)) {
+            throw new UnsupportedFormatException('XML private keys do not support encryption');
+        }
+
+        return "<RSAKeyPair>\r\n" .
+               '  <Modulus>' . Strings::base64_encode($n->toBytes()) . "</Modulus>\r\n" .
+               '  <Exponent>' . Strings::base64_encode($e->toBytes()) . "</Exponent>\r\n" .
+               '  <P>' . Strings::base64_encode($primes[1]->toBytes()) . "</P>\r\n" .
+               '  <Q>' . Strings::base64_encode($primes[2]->toBytes()) . "</Q>\r\n" .
+               '  <DP>' . Strings::base64_encode($exponents[1]->toBytes()) . "</DP>\r\n" .
+               '  <DQ>' . Strings::base64_encode($exponents[2]->toBytes()) . "</DQ>\r\n" .
+               '  <InverseQ>' . Strings::base64_encode($coefficients[2]->toBytes()) . "</InverseQ>\r\n" .
+               '  <D>' . Strings::base64_encode($d->toBytes()) . "</D>\r\n" .
+               '</RSAKeyPair>';
+    }
+
+    /**
+     * Convert a public key to the appropriate format
+     */
+    public static function savePublicKey(BigInteger $n, BigInteger $e): string
+    {
+        return "<RSAKeyValue>\r\n" .
+               '  <Modulus>' . Strings::base64_encode($n->toBytes()) . "</Modulus>\r\n" .
+               '  <Exponent>' . Strings::base64_encode($e->toBytes()) . "</Exponent>\r\n" .
+               '</RSAKeyValue>';
+    }
+}
diff --git a/phpseclib/Crypt/RSA/MSBLOB.php b/phpseclib/Crypt/RSA/MSBLOB.php
deleted file mode 100644
index 2f04a1c3e..000000000
--- a/phpseclib/Crypt/RSA/MSBLOB.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-/**
- * Miccrosoft BLOB Formatted RSA Key Handler
- *
- * More info:
- *
- * https://msdn.microsoft.com/en-us/library/windows/desktop/aa375601(v=vs.85).aspx
- *
- * PHP version 5
- *
- * @category  Crypt
- * @package   RSA
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Crypt\RSA;
-
-use phpseclib\Math\BigInteger;
-
-/**
- * Microsoft BLOB Formatted RSA Key Handler
- *
- * @package RSA
- * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
- */
-class MSBLOB
-{
-    /**#@+
-     * @access private
-     */
-    /**
-     * Public/Private Key Pair
-     */
-    const PRIVATEKEYBLOB = 0x7;
-    /**
-     * Public Key
-     */
-    const PUBLICKEYBLOB = 0x6;
-    /**
-     * Public Key
-     */
-    const PUBLICKEYBLOBEX = 0xA;
-    /**
-     * RSA public key exchange algorithm
-     */
-    const CALG_RSA_KEYX = 0x0000A400;
-    /**
-     * RSA public key exchange algorithm
-     */
-    const CALG_RSA_SIGN = 0x00002400;
-    /**
-     * Public Key
-     */
-    const RSA1 = 0x31415352;
-    /**
-     * Private Key
-     */
-    const RSA2 = 0x32415352;
-    /**#@-*/
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @access public
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    static function load($key, $password = '')
-    {
-        if (!is_string($key)) {
-            return false;
-        }
-
-        $key = base64_decode($key);
-
-        if (!is_string($key) || strlen($key) < 20) {
-            return false;
-        }
-
-        // PUBLICKEYSTRUC  publickeystruc
-        // https://msdn.microsoft.com/en-us/library/windows/desktop/aa387453(v=vs.85).aspx
-        extract(unpack('atype/aversion/vreserved/Valgo', self::_string_shift($key, 8)));
-        switch (ord($type)) {
-            case self::PUBLICKEYBLOB:
-            case self::PUBLICKEYBLOBEX:
-                $publickey = true;
-                break;
-            case self::PRIVATEKEYBLOB:
-                $publickey = false;
-                break;
-            default:
-                return false;
-        }
-
-        $components = array('isPublicKey' => $publickey);
-
-        // https://msdn.microsoft.com/en-us/library/windows/desktop/aa375549(v=vs.85).aspx
-        switch ($algo) {
-            case self::CALG_RSA_KEYX:
-            case self::CALG_RSA_SIGN:
-                break;
-            default:
-                return false;
-        }
-
-        // RSAPUBKEY rsapubkey
-        // https://msdn.microsoft.com/en-us/library/windows/desktop/aa387685(v=vs.85).aspx
-        // could do V for pubexp but that's unsigned 32-bit whereas some PHP installs only do signed 32-bit
-        extract(unpack('Vmagic/Vbitlen/a4pubexp', self::_string_shift($key, 12)));
-        switch ($magic) {
-            case self::RSA2:
-                $components['isPublicKey'] = false;
-            case self::RSA1:
-                break;
-            default:
-                return false;
-        }
-
-        $baseLength = $bitlen / 16;
-        if (strlen($key) != 2 * $baseLength && strlen($key) != 9 * $baseLength) {
-            return false;
-        }
-
-        $components[$components['isPublicKey'] ? 'publicExponent' : 'privateExponent'] = new BigInteger(strrev($pubexp), 256);
-        // BYTE modulus[rsapubkey.bitlen/8]
-        $components['modulus'] = new BigInteger(strrev(self::_string_shift($key, $bitlen / 8)), 256);
-
-        if ($publickey) {
-            return $components;
-        }
-
-        $components['isPublicKey'] = false;
-
-        // BYTE prime1[rsapubkey.bitlen/16]
-        $components['primes'] = array(1 => new BigInteger(strrev(self::_string_shift($key, $bitlen / 16)), 256));
-        // BYTE prime2[rsapubkey.bitlen/16]
-        $components['primes'][] = new BigInteger(strrev(self::_string_shift($key, $bitlen / 16)), 256);
-        // BYTE exponent1[rsapubkey.bitlen/16]
-        $components['exponents'] = array(1 => new BigInteger(strrev(self::_string_shift($key, $bitlen / 16)), 256));
-        // BYTE exponent2[rsapubkey.bitlen/16]
-        $components['exponents'][] = new BigInteger(strrev(self::_string_shift($key, $bitlen / 16)), 256);
-        // BYTE coefficient[rsapubkey.bitlen/16]
-        $components['coefficients'] = array(2 => new BigInteger(strrev(self::_string_shift($key, $bitlen / 16)), 256));
-        if (isset($components['privateExponent'])) {
-            $components['publicExponent'] = $components['privateExponent'];
-        }
-        // BYTE privateExponent[rsapubkey.bitlen/8]
-        $components['privateExponent'] = new BigInteger(strrev(self::_string_shift($key, $bitlen / 8)), 256);
-
-        return $components;
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @access public
-     * @param \phpseclib\Math\BigInteger $n
-     * @param \phpseclib\Math\BigInteger $e
-     * @param \phpseclib\Math\BigInteger $d
-     * @param array $primes
-     * @param array $exponents
-     * @param array $coefficients
-     * @param string $password optional
-     * @return string
-     */
-    static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $d, $primes, $exponents, $coefficients, $password = '')
-    {
-        $n = strrev($n->toBytes());
-        $e = str_pad(strrev($e->toBytes()), 4, "\0");
-        $key = pack('aavV', chr(self::PRIVATEKEYBLOB), chr(2), 0, self::CALG_RSA_KEYX);
-        $key.= pack('VVa*', self::RSA2, 8 * strlen($n), $e);
-        $key.= $n;
-        $key.= strrev($primes[1]->toBytes());
-        $key.= strrev($primes[2]->toBytes());
-        $key.= strrev($exponents[1]->toBytes());
-        $key.= strrev($exponents[2]->toBytes());
-        $key.= strrev($coefficients[1]->toBytes());
-        $key.= strrev($d->toBytes());
-
-        return base64_encode($key);
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @access public
-     * @param \phpseclib\Math\BigInteger $n
-     * @param \phpseclib\Math\BigInteger $e
-     * @return string
-     */
-    static function savePublicKey(BigInteger $n, BigInteger $e)
-    {
-        $n = strrev($n->toBytes());
-        $e = str_pad(strrev($e->toBytes()), 4, "\0");
-        $key = pack('aavV', chr(self::PUBLICKEYBLOB), chr(2), 0, self::CALG_RSA_KEYX);
-        $key.= pack('VVa*', self::RSA1, 8 * strlen($n), $e);
-        $key.= $n;
-
-        return base64_encode($key);
-    }
-
-    /**
-     * String Shift
-     *
-     * Inspired by array_shift
-     *
-     * @param string $string
-     * @param int $index
-     * @return string
-     * @access private
-     */
-    static function _string_shift(&$string, $index = 1)
-    {
-        $substr = substr($string, 0, $index);
-        $string = substr($string, $index);
-        return $substr;
-    }
-}
diff --git a/phpseclib/Crypt/RSA/OpenSSH.php b/phpseclib/Crypt/RSA/OpenSSH.php
deleted file mode 100644
index 765976ba8..000000000
--- a/phpseclib/Crypt/RSA/OpenSSH.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
- * OpenSSH Formatted RSA Key Handler
- *
- * PHP version 5
- *
- * Place in $HOME/.ssh/authorized_keys
- *
- * @category  Crypt
- * @package   RSA
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Crypt\RSA;
-
-use phpseclib\Math\BigInteger;
-
-/**
- * OpenSSH Formatted RSA Key Handler
- *
- * @package RSA
- * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
- */
-class OpenSSH
-{
-    /**
-     * Default comment
-     *
-     * @var string
-     * @access private
-     */
-    static $comment = 'phpseclib-generated-key';
-
-    /**
-     * Sets the default comment
-     *
-     * @access public
-     * @param string $comment
-     */
-    static function setComment($comment)
-    {
-        self::$comment = str_replace(array("\r", "\n"), '', $comment);
-    }
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @access public
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    static function load($key, $password = '')
-    {
-        if (!is_string($key)) {
-            return false;
-        }
-
-        $parts = explode(' ', $key, 3);
-
-        $key = isset($parts[1]) ? base64_decode($parts[1]) : base64_decode($parts[0]);
-        if ($key === false) {
-            return false;
-        }
-
-        $comment = isset($parts[2]) ? $parts[2] : false;
-
-        if (substr($key, 0, 11) != "\0\0\0\7ssh-rsa") {
-            return false;
-        }
-        self::_string_shift($key, 11);
-        if (strlen($key) <= 4) {
-            return false;
-        }
-        extract(unpack('Nlength', self::_string_shift($key, 4)));
-        if (strlen($key) <= $length) {
-            return false;
-        }
-        $publicExponent = new BigInteger(self::_string_shift($key, $length), -256);
-        if (strlen($key) <= 4) {
-            return false;
-        }
-        extract(unpack('Nlength', self::_string_shift($key, 4)));
-        if (strlen($key) != $length) {
-            return false;
-        }
-        $modulus = new BigInteger(self::_string_shift($key, $length), -256);
-
-        return array(
-            'isPublicKey' => true,
-            'modulus' => $modulus,
-            'publicExponent' => $publicExponent,
-            'comment' => $comment
-        );
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @access public
-     * @param \phpseclib\Math\BigInteger $n
-     * @param \phpseclib\Math\BigInteger $e
-     * @return string
-     */
-    function savePublicKey(BigInteger $n, BigInteger $e)
-    {
-        $publicExponent = $e->toBytes(true);
-        $modulus = $n->toBytes(true);
-
-        // from <http://tools.ietf.org/html/rfc4253#page-15>:
-        // string    "ssh-rsa"
-        // mpint     e
-        // mpint     n
-        $RSAPublicKey = pack('Na*Na*Na*', strlen('ssh-rsa'), 'ssh-rsa', strlen($publicExponent), $publicExponent, strlen($modulus), $modulus);
-        $RSAPublicKey = 'ssh-rsa ' . base64_encode($RSAPublicKey) . ' ' . self::$comment;
-
-        return $RSAPublicKey;
-    }
-
-    /**
-     * String Shift
-     *
-     * Inspired by array_shift
-     *
-     * @param string $string
-     * @param int $index
-     * @return string
-     * @access private
-     */
-    static function _string_shift(&$string, $index = 1)
-    {
-        $substr = substr($string, 0, $index);
-        $string = substr($string, $index);
-        return $substr;
-    }
-}
diff --git a/phpseclib/Crypt/RSA/PKCS.php b/phpseclib/Crypt/RSA/PKCS.php
deleted file mode 100644
index 6f5ba33bb..000000000
--- a/phpseclib/Crypt/RSA/PKCS.php
+++ /dev/null
@@ -1,485 +0,0 @@
-<?php
-/**
- * PKCS Formatted RSA Key Handler
- *
- * PHP version 5
- *
- * @category  Crypt
- * @package   RSA
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Crypt\RSA;
-
-use phpseclib\Crypt\Base;
-use phpseclib\Crypt\AES;
-use phpseclib\Crypt\TripleDES;
-use phpseclib\Crypt\DES;
-use phpseclib\Math\BigInteger;
-
-/**
- * PKCS Formatted RSA Key Handler
- *
- * @package RSA
- * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
- */
-abstract class PKCS
-{
-    /**#@+
-     * @access private
-     * @see \phpseclib\Crypt\RSA::createKey()
-     */
-    /**
-     * ASN1 Integer
-     */
-    const ASN1_INTEGER = 2;
-    /**
-     * ASN1 Bit String
-     */
-    const ASN1_BITSTRING = 3;
-    /**
-     * ASN1 Octet String
-     */
-    const ASN1_OCTETSTRING = 4;
-    /**
-     * ASN1 Object Identifier
-     */
-    const ASN1_OBJECT = 6;
-    /**
-     * ASN1 Sequence (with the constucted bit set)
-     */
-    const ASN1_SEQUENCE = 48;
-    /**#@-*/
-
-    /**#@+
-     * @access private
-     */
-    /**
-     * Auto-detect the format
-     */
-    const MODE_ANY = 0;
-    /**
-     * Require base64-encoded PEM's be supplied
-     */
-    const MODE_PEM = 1;
-    /**
-     * Require raw DER's be supplied
-     */
-    const MODE_DER = 2;
-    /**#@-*/
-
-    /**
-     * Is the key a base-64 encoded PEM, DER or should it be auto-detected?
-     *
-     * @access private
-     * @param int
-     */
-    static $format = self::MODE_ANY;
-
-    /**
-     * Returns the mode constant corresponding to the mode string
-     *
-     * @access public
-     * @param string $mode
-     * @return int
-     * @throws \UnexpectedValueException if the block cipher mode is unsupported
-     */
-    static function getEncryptionMode($mode)
-    {
-        switch ($mode) {
-            case 'CBC':
-                return Base::MODE_CBC;
-            case 'ECB':
-                return Base::MODE_ECB;
-            case 'CFB':
-                return Base::MODE_CFB;
-            case 'OFB':
-                return Base::MODE_OFB;
-            case 'CTR':
-                return Base::MODE_CTR;
-        }
-        throw new \UnexpectedValueException('Unsupported block cipher mode of operation');
-    }
-
-    /**
-     * Returns a cipher object corresponding to a string
-     *
-     * @access public
-     * @param string $algo
-     * @return string
-     * @throws \UnexpectedValueException if the encryption algorithm is unsupported
-     */
-    static function getEncryptionObject($algo)
-    {
-        $modes = '(CBC|ECB|CFB|OFB|CTR)';
-        switch (true) {
-            case preg_match("#^AES-(128|192|256)-$modes$#", $algo, $matches):
-                $cipher = new AES(self::getEncryptionMode($matches[2]));
-                $cipher->setKeyLength($matches[1]);
-                return $cipher;
-            case preg_match("#^DES-EDE3-$modes$#", $algo, $matches):
-                return new TripleDES(self::getEncryptionMode($matches[1]));
-            case preg_match("#^DES-$modes$#", $algo, $matches):
-                return new DES(self::getEncryptionMode($matches[1]));
-            default:
-                throw new \UnexpectedValueException('Unsupported encryption algorithmn');
-        }
-    }
-
-    /**
-     * Generate a symmetric key for PKCS#1 keys
-     *
-     * @access public
-     * @param string $password
-     * @param string $iv
-     * @param int $length
-     * @return string
-     */
-    static function generateSymmetricKey($password, $iv, $length)
-    {
-        $symkey = '';
-        $iv = substr($iv, 0, 8);
-        while (strlen($symkey) < $length) {
-            $symkey.= pack('H*', md5($symkey . $password . $iv));
-        }
-        return substr($symkey, 0, $length);
-    }
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @access public
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    static function load($key, $password = '')
-    {
-        if (!is_string($key)) {
-            return false;
-        }
-
-        $components = array('isPublicKey' => strpos($key, 'PUBLIC') !== false);
-
-        /* Although PKCS#1 proposes a format that public and private keys can use, encrypting them is
-           "outside the scope" of PKCS#1.  PKCS#1 then refers you to PKCS#12 and PKCS#15 if you're wanting to
-           protect private keys, however, that's not what OpenSSL* does.  OpenSSL protects private keys by adding
-           two new "fields" to the key - DEK-Info and Proc-Type.  These fields are discussed here:
-
-           http://tools.ietf.org/html/rfc1421#section-4.6.1.1
-           http://tools.ietf.org/html/rfc1421#section-4.6.1.3
-
-           DES-EDE3-CBC as an algorithm, however, is not discussed anywhere, near as I can tell.
-           DES-CBC and DES-EDE are discussed in RFC1423, however, DES-EDE3-CBC isn't, nor is its key derivation
-           function.  As is, the definitive authority on this encoding scheme isn't the IETF but rather OpenSSL's
-           own implementation.  ie. the implementation *is* the standard and any bugs that may exist in that
-           implementation are part of the standard, as well.
-
-           * OpenSSL is the de facto standard.  It's utilized by OpenSSH and other projects */
-        if (preg_match('#DEK-Info: (.+),(.+)#', $key, $matches)) {
-            $iv = pack('H*', trim($matches[2]));
-            // remove the Proc-Type / DEK-Info sections as they're no longer needed
-            $key = preg_replace('#^(?:Proc-Type|DEK-Info): .*#m', '', $key);
-            $ciphertext = self::_extractBER($key);
-            if ($ciphertext === false) {
-                $ciphertext = $key;
-            }
-            $crypto = self::getEncryptionObject($matches[1]);
-            $crypto->setKey(self::generateSymmetricKey($password, $iv, $crypto->getKeyLength() >> 3));
-            $crypto->setIV($iv);
-            $key = $crypto->decrypt($ciphertext);
-            if ($key === false) {
-                return false;
-            }
-        } else {
-            if (self::$format != self::MODE_DER) {
-                $decoded = self::_extractBER($key);
-                if ($decoded !== false) {
-                    $key = $decoded;
-                } elseif (self::$format == self::MODE_PEM) {
-                    return false;
-                }
-            }
-        }
-
-        if (ord(self::_string_shift($key)) != self::ASN1_SEQUENCE) {
-            return false;
-        }
-        if (self::_decodeLength($key) != strlen($key)) {
-            return false;
-        }
-
-        $tag = ord(self::_string_shift($key));
-        /* intended for keys for which OpenSSL's asn1parse returns the following:
-
-            0:d=0  hl=4 l= 631 cons: SEQUENCE
-            4:d=1  hl=2 l=   1 prim:  INTEGER           :00
-            7:d=1  hl=2 l=  13 cons:  SEQUENCE
-            9:d=2  hl=2 l=   9 prim:   OBJECT            :rsaEncryption
-           20:d=2  hl=2 l=   0 prim:   NULL
-           22:d=1  hl=4 l= 609 prim:  OCTET STRING
-
-           ie. PKCS8 keys */
-
-        if ($tag == self::ASN1_INTEGER && substr($key, 0, 3) == "\x01\x00\x30") {
-            self::_string_shift($key, 3);
-            $tag = self::ASN1_SEQUENCE;
-        }
-
-        if ($tag == self::ASN1_SEQUENCE) {
-            $temp = self::_string_shift($key, self::_decodeLength($key));
-            if (ord(self::_string_shift($temp)) != self::ASN1_OBJECT) {
-                return false;
-            }
-            $length = self::_decodeLength($temp);
-            switch (self::_string_shift($temp, $length)) {
-                case "\x2a\x86\x48\x86\xf7\x0d\x01\x01\x01": // rsaEncryption
-                    break;
-                case "\x2a\x86\x48\x86\xf7\x0d\x01\x05\x03": // pbeWithMD5AndDES-CBC
-                    /*
-                       PBEParameter ::= SEQUENCE {
-                           salt OCTET STRING (SIZE(8)),
-                           iterationCount INTEGER }
-                    */
-                    if (ord(self::_string_shift($temp)) != self::ASN1_SEQUENCE) {
-                        return false;
-                    }
-                    if (self::_decodeLength($temp) != strlen($temp)) {
-                        return false;
-                    }
-                    self::_string_shift($temp); // assume it's an octet string
-                    $salt = self::_string_shift($temp, self::_decodeLength($temp));
-                    if (ord(self::_string_shift($temp)) != self::ASN1_INTEGER) {
-                        return false;
-                    }
-                    self::_decodeLength($temp);
-                    list(, $iterationCount) = unpack('N', str_pad($temp, 4, chr(0), STR_PAD_LEFT));
-                    self::_string_shift($key); // assume it's an octet string
-                    $length = self::_decodeLength($key);
-                    if (strlen($key) != $length) {
-                        return false;
-                    }
-
-                    $crypto = new DES();
-                    $crypto->setPassword($password, 'pbkdf1', 'md5', $salt, $iterationCount);
-                    $key = $crypto->decrypt($key);
-                    if ($key === false) {
-                        return false;
-                    }
-                    return self::load($key);
-                default:
-                    return false;
-            }
-            /* intended for keys for which OpenSSL's asn1parse returns the following:
-
-                0:d=0  hl=4 l= 290 cons: SEQUENCE
-                4:d=1  hl=2 l=  13 cons:  SEQUENCE
-                6:d=2  hl=2 l=   9 prim:   OBJECT            :rsaEncryption
-               17:d=2  hl=2 l=   0 prim:   NULL
-               19:d=1  hl=4 l= 271 prim:  BIT STRING */
-            $tag = ord(self::_string_shift($key)); // skip over the BIT STRING / OCTET STRING tag
-            self::_decodeLength($key); // skip over the BIT STRING / OCTET STRING length
-            // "The initial octet shall encode, as an unsigned binary integer wtih bit 1 as the least significant bit, the number of
-            //  unused bits in the final subsequent octet. The number shall be in the range zero to seven."
-            //  -- http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf (section 8.6.2.2)
-            if ($tag == self::ASN1_BITSTRING) {
-                self::_string_shift($key);
-            }
-            if (ord(self::_string_shift($key)) != self::ASN1_SEQUENCE) {
-                return false;
-            }
-            if (self::_decodeLength($key) != strlen($key)) {
-                return false;
-            }
-            $tag = ord(self::_string_shift($key));
-        }
-        if ($tag != self::ASN1_INTEGER) {
-            return false;
-        }
-
-        $length = self::_decodeLength($key);
-        $temp = self::_string_shift($key, $length);
-        if (strlen($temp) != 1 || ord($temp) > 2) {
-            $components['modulus'] = new BigInteger($temp, 256);
-            self::_string_shift($key); // skip over self::ASN1_INTEGER
-            $length = self::_decodeLength($key);
-            $components[$components['isPublicKey'] ? 'publicExponent' : 'privateExponent'] = new BigInteger(self::_string_shift($key, $length), 256);
-
-            return $components;
-        }
-        if (ord(self::_string_shift($key)) != self::ASN1_INTEGER) {
-            return false;
-        }
-        $length = self::_decodeLength($key);
-        $components['modulus'] = new BigInteger(self::_string_shift($key, $length), 256);
-        self::_string_shift($key);
-        $length = self::_decodeLength($key);
-        $components['publicExponent'] = new BigInteger(self::_string_shift($key, $length), 256);
-        self::_string_shift($key);
-        $length = self::_decodeLength($key);
-        $components['privateExponent'] = new BigInteger(self::_string_shift($key, $length), 256);
-        self::_string_shift($key);
-        $length = self::_decodeLength($key);
-        $components['primes'] = array(1 => new BigInteger(self::_string_shift($key, $length), 256));
-        self::_string_shift($key);
-        $length = self::_decodeLength($key);
-        $components['primes'][] = new BigInteger(self::_string_shift($key, $length), 256);
-        self::_string_shift($key);
-        $length = self::_decodeLength($key);
-        $components['exponents'] = array(1 => new BigInteger(self::_string_shift($key, $length), 256));
-        self::_string_shift($key);
-        $length = self::_decodeLength($key);
-        $components['exponents'][] = new BigInteger(self::_string_shift($key, $length), 256);
-        self::_string_shift($key);
-        $length = self::_decodeLength($key);
-        $components['coefficients'] = array(2 => new BigInteger(self::_string_shift($key, $length), 256));
-
-        if (!empty($key)) {
-            if (ord(self::_string_shift($key)) != self::ASN1_SEQUENCE) {
-                return false;
-            }
-            self::_decodeLength($key);
-            while (!empty($key)) {
-                if (ord(self::_string_shift($key)) != self::ASN1_SEQUENCE) {
-                    return false;
-                }
-                self::_decodeLength($key);
-                $key = substr($key, 1);
-                $length = self::_decodeLength($key);
-                $components['primes'][] = new BigInteger(self::_string_shift($key, $length), 256);
-                self::_string_shift($key);
-                $length = self::_decodeLength($key);
-                $components['exponents'][] = new BigInteger(self::_string_shift($key, $length), 256);
-                self::_string_shift($key);
-                $length = self::_decodeLength($key);
-                $components['coefficients'][] = new BigInteger(self::_string_shift($key, $length), 256);
-            }
-        }
-
-        return $components;
-    }
-
-    /**
-     * Require base64-encoded PEM's be supplied
-     *
-     * @see self::load()
-     * @access public
-     */
-    static function requirePEM()
-    {
-        self::$format = self::MODE_PEM;
-    }
-
-    /**
-     * Require raw DER's be supplied
-     *
-     * @see self::load()
-     * @access public
-     */
-    static function requireDER()
-    {
-        self::$format = self::MODE_DER;
-    }
-
-    /**
-     * Accept any format and auto detect the format
-     *
-     * This is the default setting
-     *
-     * @see self::load()
-     * @access public
-     */
-    static function requireAny()
-    {
-        self::$format = self::MODE_ANY;
-    }
-
-    /**
-     * DER-decode the length
-     *
-     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
-     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
-     *
-     * @access private
-     * @param string $string
-     * @return int
-     */
-    static function _decodeLength(&$string)
-    {
-        $length = ord(self::_string_shift($string));
-        if ($length & 0x80) { // definite length, long form
-            $length&= 0x7F;
-            $temp = self::_string_shift($string, $length);
-            list(, $length) = unpack('N', substr(str_pad($temp, 4, chr(0), STR_PAD_LEFT), -4));
-        }
-        return $length;
-    }
-
-    /**
-     * DER-encode the length
-     *
-     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
-     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
-     *
-     * @access private
-     * @param int $length
-     * @return string
-     */
-    static function _encodeLength($length)
-    {
-        if ($length <= 0x7F) {
-            return chr($length);
-        }
-
-        $temp = ltrim(pack('N', $length), chr(0));
-        return pack('Ca*', 0x80 | strlen($temp), $temp);
-    }
-
-    /**
-     * String Shift
-     *
-     * Inspired by array_shift
-     *
-     * @param string $string
-     * @param int $index
-     * @return string
-     * @access private
-     */
-    static function _string_shift(&$string, $index = 1)
-    {
-        $substr = substr($string, 0, $index);
-        $string = substr($string, $index);
-        return $substr;
-    }
-
-    /**
-     * Extract raw BER from Base64 encoding
-     *
-     * @access private
-     * @param string $str
-     * @return string
-     */
-    static function _extractBER($str)
-    {
-        /* X.509 certs are assumed to be base64 encoded but sometimes they'll have additional things in them
-         * above and beyond the ceritificate.
-         * ie. some may have the following preceding the -----BEGIN CERTIFICATE----- line:
-         *
-         * Bag Attributes
-         *     localKeyID: 01 00 00 00
-         * subject=/O=organization/OU=org unit/CN=common name
-         * issuer=/O=organization/CN=common name
-         */
-        $temp = preg_replace('#.*?^-+[^-]+-+[\r\n ]*$#ms', '', $str, 1);
-        // remove the -----BEGIN CERTIFICATE----- and -----END CERTIFICATE----- stuff
-        $temp = preg_replace('#-+[^-]+-+#', '', $temp);
-        // remove new lines
-        $temp = str_replace(array("\r", "\n", ' '), '', $temp);
-        $temp = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $temp) ? base64_decode($temp) : false;
-        return $temp != false ? $temp : $str;
-    }
-}
diff --git a/phpseclib/Crypt/RSA/PKCS1.php b/phpseclib/Crypt/RSA/PKCS1.php
deleted file mode 100644
index 8ce8b1155..000000000
--- a/phpseclib/Crypt/RSA/PKCS1.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/**
- * PKCS#1 Formatted RSA Key Handler
- *
- * PHP version 5
- *
- * Used by File/X509.php
- *
- * Has the following header:
- *
- * -----BEGIN RSA PUBLIC KEY-----
- *
- * Analogous to ssh-keygen's pem format (as specified by -m)
- *
- * @category  Crypt
- * @package   RSA
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Crypt\RSA;
-
-use phpseclib\Math\BigInteger;
-use phpseclib\Crypt\RSA\PKCS;
-use phpseclib\Crypt\Random;
-use phpseclib\Crypt\AES;
-use phpseclib\Crypt\TripleDES;
-use phpseclib\Crypt\DES;
-
-/**
- * PKCS#1 Formatted RSA Key Handler
- *
- * @package RSA
- * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
- */
-class PKCS1 extends PKCS
-{
-    /**
-     * Default encryption algorithm
-     *
-     * @var string
-     * @access private
-     */
-    static $defaultEncryptionAlgorithm = 'DES-EDE3-CBC';
-
-    /**
-     * Sets the default encryption algorithm
-     *
-     * @access public
-     * @param string $algo
-     */
-    static function setEncryptionAlgorithm($algo)
-    {
-        self::$defaultEncryptionAlgorithm = $algo;
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @access public
-     * @param \phpseclib\Math\BigInteger $n
-     * @param \phpseclib\Math\BigInteger $e
-     * @param \phpseclib\Math\BigInteger $d
-     * @param array $primes
-     * @param array $exponents
-     * @param array $coefficients
-     * @param string $password optional
-     * @return string
-     */
-    static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $d, $primes, $exponents, $coefficients, $password = '')
-    {
-        $num_primes = count($primes);
-        $raw = array(
-            'version' => $num_primes == 2 ? chr(0) : chr(1), // two-prime vs. multi
-            'modulus' => $n->toBytes(true),
-            'publicExponent' => $e->toBytes(true),
-            'privateExponent' => $d->toBytes(true),
-            'prime1' => $primes[1]->toBytes(true),
-            'prime2' => $primes[2]->toBytes(true),
-            'exponent1' => $exponents[1]->toBytes(true),
-            'exponent2' => $exponents[2]->toBytes(true),
-            'coefficient' => $coefficients[2]->toBytes(true)
-        );
-
-        $components = array();
-        foreach ($raw as $name => $value) {
-            $components[$name] = pack('Ca*a*', self::ASN1_INTEGER, self::_encodeLength(strlen($value)), $value);
-        }
-
-        $RSAPrivateKey = implode('', $components);
-
-        if ($num_primes > 2) {
-            $OtherPrimeInfos = '';
-            for ($i = 3; $i <= $num_primes; $i++) {
-                // OtherPrimeInfos ::= SEQUENCE SIZE(1..MAX) OF OtherPrimeInfo
-                //
-                // OtherPrimeInfo ::= SEQUENCE {
-                //     prime             INTEGER,  -- ri
-                //     exponent          INTEGER,  -- di
-                //     coefficient       INTEGER   -- ti
-                // }
-                $OtherPrimeInfo = pack('Ca*a*', self::ASN1_INTEGER, self::_encodeLength(strlen($primes[$i]->toBytes(true))), $primes[$i]->toBytes(true));
-                $OtherPrimeInfo.= pack('Ca*a*', self::ASN1_INTEGER, self::_encodeLength(strlen($exponents[$i]->toBytes(true))), $exponents[$i]->toBytes(true));
-                $OtherPrimeInfo.= pack('Ca*a*', self::ASN1_INTEGER, self::_encodeLength(strlen($coefficients[$i]->toBytes(true))), $coefficients[$i]->toBytes(true));
-                $OtherPrimeInfos.= pack('Ca*a*', self::ASN1_SEQUENCE, self::_encodeLength(strlen($OtherPrimeInfo)), $OtherPrimeInfo);
-            }
-            $RSAPrivateKey.= pack('Ca*a*', self::ASN1_SEQUENCE, self::_encodeLength(strlen($OtherPrimeInfos)), $OtherPrimeInfos);
-        }
-
-        $RSAPrivateKey = pack('Ca*a*', self::ASN1_SEQUENCE, self::_encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey);
-
-        if (!empty($password) || is_string($password)) {
-            $cipher = self::getEncryptionObject(self::$defaultEncryptionAlgorithm);
-            $iv = Random::string($cipher->getBlockLength() >> 3);
-            $cipher->setKey(self::generateSymmetricKey($password, $iv, $cipher->getKeyLength()));
-            $cipher->setIV($iv);
-            $iv = strtoupper(bin2hex($iv));
-            $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n" .
-                     "Proc-Type: 4,ENCRYPTED\r\n" .
-                     "DEK-Info: " . self::$defaultEncryptionAlgorithm . ",$iv\r\n" .
-                     "\r\n" .
-                     chunk_split(base64_encode($cipher->encrypt($RSAPrivateKey)), 64) .
-                     '-----END RSA PRIVATE KEY-----';
-        } else {
-            $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n" .
-                     chunk_split(base64_encode($RSAPrivateKey), 64) .
-                     '-----END RSA PRIVATE KEY-----';
-        }
-
-        return $RSAPrivateKey;
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @access public
-     * @param \phpseclib\Math\BigInteger $n
-     * @param \phpseclib\Math\BigInteger $e
-     * @return string
-     */
-    static function savePublicKey(BigInteger $n, BigInteger $e)
-    {
-        $modulus = $n->toBytes(true);
-        $publicExponent = $e->toBytes(true);
-
-        // from <http://tools.ietf.org/html/rfc3447#appendix-A.1.1>:
-        // RSAPublicKey ::= SEQUENCE {
-        //     modulus           INTEGER,  -- n
-        //     publicExponent    INTEGER   -- e
-        // }
-        $components = array(
-            'modulus' => pack('Ca*a*', self::ASN1_INTEGER, self::_encodeLength(strlen($modulus)), $modulus),
-            'publicExponent' => pack('Ca*a*', self::ASN1_INTEGER, self::_encodeLength(strlen($publicExponent)), $publicExponent)
-        );
-
-        $RSAPublicKey = pack(
-            'Ca*a*a*',
-            self::ASN1_SEQUENCE,
-            self::_encodeLength(strlen($components['modulus']) + strlen($components['publicExponent'])),
-            $components['modulus'],
-            $components['publicExponent']
-        );
-
-        $RSAPublicKey = "-----BEGIN RSA PUBLIC KEY-----\r\n" .
-                        chunk_split(base64_encode($RSAPublicKey), 64) .
-                        '-----END RSA PUBLIC KEY-----';
-
-        return $RSAPublicKey;
-    }
-}
diff --git a/phpseclib/Crypt/RSA/PKCS8.php b/phpseclib/Crypt/RSA/PKCS8.php
deleted file mode 100644
index 84a473d3e..000000000
--- a/phpseclib/Crypt/RSA/PKCS8.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-/**
- * PKCS#8 Formatted RSA Key Handler
- *
- * PHP version 5
- *
- * Used by PHP's openssl_public_encrypt() and openssl's rsautl (when -pubin is set)
- *
- * Has the following header:
- *
- * -----BEGIN PUBLIC KEY-----
- *
- * Analogous to ssh-keygen's pkcs8 format (as specified by -m). Although PKCS8
- * is specific to private keys it's basically creating a DER-encoded wrapper
- * for keys. This just extends that same concept to public keys (much like ssh-keygen)
- *
- * @category  Crypt
- * @package   RSA
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Crypt\RSA;
-
-use phpseclib\Math\BigInteger;
-use phpseclib\Crypt\RSA\PKCS;
-use phpseclib\Crypt\Random;
-use phpseclib\Crypt\DES;
-
-/**
- * PKCS#8 Formatted RSA Key Handler
- *
- * @package RSA
- * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
- */
-class PKCS8 extends PKCS
-{
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @access public
-     * @param \phpseclib\Math\BigInteger $n
-     * @param \phpseclib\Math\BigInteger $e
-     * @param \phpseclib\Math\BigInteger $d
-     * @param array $primes
-     * @param array $exponents
-     * @param array $coefficients
-     * @param string $password optional
-     * @return string
-     */
-    static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $d, $primes, $exponents, $coefficients, $password = '')
-    {
-        $num_primes = count($primes);
-        $raw = array(
-            'version' => $num_primes == 2 ? chr(0) : chr(1), // two-prime vs. multi
-            'modulus' => $n->toBytes(true),
-            'publicExponent' => $e->toBytes(true),
-            'privateExponent' => $d->toBytes(true),
-            'prime1' => $primes[1]->toBytes(true),
-            'prime2' => $primes[2]->toBytes(true),
-            'exponent1' => $exponents[1]->toBytes(true),
-            'exponent2' => $exponents[2]->toBytes(true),
-            'coefficient' => $coefficients[2]->toBytes(true)
-        );
-
-        $components = array();
-        foreach ($raw as $name => $value) {
-            $components[$name] = pack('Ca*a*', self::ASN1_INTEGER, self::_encodeLength(strlen($value)), $value);
-        }
-
-        $RSAPrivateKey = implode('', $components);
-
-        if ($num_primes > 2) {
-            $OtherPrimeInfos = '';
-            for ($i = 3; $i <= $num_primes; $i++) {
-                // OtherPrimeInfos ::= SEQUENCE SIZE(1..MAX) OF OtherPrimeInfo
-                //
-                // OtherPrimeInfo ::= SEQUENCE {
-                //     prime             INTEGER,  -- ri
-                //     exponent          INTEGER,  -- di
-                //     coefficient       INTEGER   -- ti
-                // }
-                $OtherPrimeInfo = pack('Ca*a*', self::ASN1_INTEGER, self::_encodeLength(strlen($primes[$i]->toBytes(true))), $primes[$i]->toBytes(true));
-                $OtherPrimeInfo.= pack('Ca*a*', self::ASN1_INTEGER, self::_encodeLength(strlen($exponents[$i]->toBytes(true))), $exponents[$i]->toBytes(true));
-                $OtherPrimeInfo.= pack('Ca*a*', self::ASN1_INTEGER, self::_encodeLength(strlen($coefficients[$i]->toBytes(true))), $coefficients[$i]->toBytes(true));
-                $OtherPrimeInfos.= pack('Ca*a*', self::ASN1_SEQUENCE, self::_encodeLength(strlen($OtherPrimeInfo)), $OtherPrimeInfo);
-            }
-            $RSAPrivateKey.= pack('Ca*a*', self::ASN1_SEQUENCE, self::_encodeLength(strlen($OtherPrimeInfos)), $OtherPrimeInfos);
-        }
-
-        $RSAPrivateKey = pack('Ca*a*', self::ASN1_SEQUENCE, self::_encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey);
-
-        $rsaOID = pack('H*', '300d06092a864886f70d0101010500'); // hex version of MA0GCSqGSIb3DQEBAQUA
-        $RSAPrivateKey = pack(
-            'Ca*a*Ca*a*',
-            self::ASN1_INTEGER,
-            "\01\00",
-            $rsaOID,
-            4,
-            self::_encodeLength(strlen($RSAPrivateKey)),
-            $RSAPrivateKey
-        );
-        $RSAPrivateKey = pack('Ca*a*', self::ASN1_SEQUENCE, self::_encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey);
-        if (!empty($password) || is_string($password)) {
-            $salt = Random::string(8);
-            $iterationCount = 2048;
-
-            $crypto = new DES();
-            $crypto->setPassword($password, 'pbkdf1', 'md5', $salt, $iterationCount);
-            $RSAPrivateKey = $crypto->encrypt($RSAPrivateKey);
-
-            $parameters = pack(
-                'Ca*a*Ca*N',
-                self::ASN1_OCTETSTRING,
-                self::_encodeLength(strlen($salt)),
-                $salt,
-                self::ASN1_INTEGER,
-                self::_encodeLength(4),
-                $iterationCount
-            );
-            $pbeWithMD5AndDES_CBC = "\x2a\x86\x48\x86\xf7\x0d\x01\x05\x03";
-
-            $encryptionAlgorithm = pack(
-                'Ca*a*Ca*a*',
-                self::ASN1_OBJECT,
-                self::_encodeLength(strlen($pbeWithMD5AndDES_CBC)),
-                $pbeWithMD5AndDES_CBC,
-                self::ASN1_SEQUENCE,
-                self::_encodeLength(strlen($parameters)),
-                $parameters
-            );
-
-            $RSAPrivateKey = pack(
-                'Ca*a*Ca*a*',
-                self::ASN1_SEQUENCE,
-                self::_encodeLength(strlen($encryptionAlgorithm)),
-                $encryptionAlgorithm,
-                self::ASN1_OCTETSTRING,
-                self::_encodeLength(strlen($RSAPrivateKey)),
-                $RSAPrivateKey
-            );
-
-            $RSAPrivateKey = pack('Ca*a*', self::ASN1_SEQUENCE, self::_encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey);
-
-            $RSAPrivateKey = "-----BEGIN ENCRYPTED PRIVATE KEY-----\r\n" .
-                 chunk_split(base64_encode($RSAPrivateKey), 64) .
-                 '-----END ENCRYPTED PRIVATE KEY-----';
-        } else {
-            $RSAPrivateKey = "-----BEGIN PRIVATE KEY-----\r\n" .
-                 chunk_split(base64_encode($RSAPrivateKey), 64) .
-                 '-----END PRIVATE KEY-----';
-        }
-
-        return $RSAPrivateKey;
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @access public
-     * @param \phpseclib\Math\BigInteger $n
-     * @param \phpseclib\Math\BigInteger $e
-     * @return string
-     */
-    static function savePublicKey(BigInteger $n, BigInteger $e)
-    {
-        $modulus = $n->toBytes(true);
-        $publicExponent = $e->toBytes(true);
-
-        // from <http://tools.ietf.org/html/rfc3447#appendix-A.1.1>:
-        // RSAPublicKey ::= SEQUENCE {
-        //     modulus           INTEGER,  -- n
-        //     publicExponent    INTEGER   -- e
-        // }
-        $components = array(
-            'modulus' => pack('Ca*a*', self::ASN1_INTEGER, self::_encodeLength(strlen($modulus)), $modulus),
-            'publicExponent' => pack('Ca*a*', self::ASN1_INTEGER, self::_encodeLength(strlen($publicExponent)), $publicExponent)
-        );
-
-        $RSAPublicKey = pack(
-            'Ca*a*a*',
-            self::ASN1_SEQUENCE,
-            self::_encodeLength(strlen($components['modulus']) + strlen($components['publicExponent'])),
-            $components['modulus'],
-            $components['publicExponent']
-        );
-
-        // sequence(oid(1.2.840.113549.1.1.1), null)) = rsaEncryption.
-        $rsaOID = pack('H*', '300d06092a864886f70d0101010500'); // hex version of MA0GCSqGSIb3DQEBAQUA
-        $RSAPublicKey = chr(0) . $RSAPublicKey;
-        $RSAPublicKey = chr(3) . self::_encodeLength(strlen($RSAPublicKey)) . $RSAPublicKey;
-
-        $RSAPublicKey = pack(
-            'Ca*a*',
-            self::ASN1_SEQUENCE,
-            self::_encodeLength(strlen($rsaOID . $RSAPublicKey)),
-            $rsaOID . $RSAPublicKey
-        );
-
-        $RSAPublicKey = "-----BEGIN PUBLIC KEY-----\r\n" .
-                        chunk_split(base64_encode($RSAPublicKey), 64) .
-                        '-----END PUBLIC KEY-----';
-
-        return $RSAPublicKey;
-    }
-}
diff --git a/phpseclib/Crypt/RSA/PrivateKey.php b/phpseclib/Crypt/RSA/PrivateKey.php
new file mode 100644
index 000000000..08bcf45ed
--- /dev/null
+++ b/phpseclib/Crypt/RSA/PrivateKey.php
@@ -0,0 +1,514 @@
+<?php
+
+/**
+ * RSA Private Key
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\RSA;
+
+use phpseclib3\Crypt\Common;
+use phpseclib3\Crypt\Random;
+use phpseclib3\Crypt\RSA;
+use phpseclib3\Crypt\RSA\Formats\Keys\PSS;
+use phpseclib3\Exception\LengthException;
+use phpseclib3\Exception\OutOfRangeException;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Exception\UnsupportedFormatException;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * Raw RSA Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+final class PrivateKey extends RSA implements Common\PrivateKey
+{
+    use Common\Traits\PasswordProtected;
+
+    /**
+     * Primes for Chinese Remainder Theorem (ie. p and q)
+     *
+     * @var array
+     */
+    protected $primes;
+
+    /**
+     * Exponents for Chinese Remainder Theorem (ie. dP and dQ)
+     *
+     * @var array
+     */
+    protected $exponents;
+
+    /**
+     * Coefficients for Chinese Remainder Theorem (ie. qInv)
+     *
+     * @var array
+     */
+    protected $coefficients;
+
+    /**
+     * Private Exponent
+     *
+     * @var BigInteger
+     */
+    protected $privateExponent;
+
+    /**
+     * RSADP
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-5.1.2 RFC3447#section-5.1.2}.
+     *
+     * @return bool|BigInteger
+     */
+    private function rsadp(BigInteger $c)
+    {
+        if ($c->compare(self::$zero) < 0 || $c->compare($this->modulus) > 0) {
+            throw new OutOfRangeException('Ciphertext representative out of range');
+        }
+        return $this->exponentiate($c);
+    }
+
+    /**
+     * RSASP1
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-5.2.1 RFC3447#section-5.2.1}.
+     *
+     * @return bool|BigInteger
+     */
+    private function rsasp1(BigInteger $m)
+    {
+        if ($m->compare(self::$zero) < 0 || $m->compare($this->modulus) > 0) {
+            throw new OutOfRangeException('Signature representative out of range');
+        }
+        return $this->exponentiate($m);
+    }
+
+    /**
+     * Exponentiate
+     */
+    protected function exponentiate(BigInteger $x): BigInteger
+    {
+        switch (true) {
+            case empty($this->primes):
+            case $this->primes[1]->equals(self::$zero):
+            case empty($this->coefficients):
+            case $this->coefficients[2]->equals(self::$zero):
+            case empty($this->exponents):
+            case $this->exponents[1]->equals(self::$zero):
+                return $x->modPow($this->exponent, $this->modulus);
+        }
+
+        $num_primes = count($this->primes);
+
+        if (!static::$enableBlinding) {
+            $m_i = [
+                1 => $x->modPow($this->exponents[1], $this->primes[1]),
+                2 => $x->modPow($this->exponents[2], $this->primes[2]),
+            ];
+            $h = $m_i[1]->subtract($m_i[2]);
+            $h = $h->multiply($this->coefficients[2]);
+            [, $h] = $h->divide($this->primes[1]);
+            $m = $m_i[2]->add($h->multiply($this->primes[2]));
+
+            $r = $this->primes[1];
+            for ($i = 3; $i <= $num_primes; $i++) {
+                $m_i = $x->modPow($this->exponents[$i], $this->primes[$i]);
+
+                $r = $r->multiply($this->primes[$i - 1]);
+
+                $h = $m_i->subtract($m);
+                $h = $h->multiply($this->coefficients[$i]);
+                [, $h] = $h->divide($this->primes[$i]);
+
+                $m = $m->add($r->multiply($h));
+            }
+        } else {
+            $smallest = $this->primes[1];
+            for ($i = 2; $i <= $num_primes; $i++) {
+                if ($smallest->compare($this->primes[$i]) > 0) {
+                    $smallest = $this->primes[$i];
+                }
+            }
+
+            $r = BigInteger::randomRange(self::$one, $smallest->subtract(self::$one));
+
+            $m_i = [
+                1 => $this->blind($x, $r, 1),
+                2 => $this->blind($x, $r, 2),
+            ];
+            $h = $m_i[1]->subtract($m_i[2]);
+            $h = $h->multiply($this->coefficients[2]);
+            [, $h] = $h->divide($this->primes[1]);
+            $m = $m_i[2]->add($h->multiply($this->primes[2]));
+
+            $r = $this->primes[1];
+            for ($i = 3; $i <= $num_primes; $i++) {
+                $m_i = $this->blind($x, $r, $i);
+
+                $r = $r->multiply($this->primes[$i - 1]);
+
+                $h = $m_i->subtract($m);
+                $h = $h->multiply($this->coefficients[$i]);
+                [, $h] = $h->divide($this->primes[$i]);
+
+                $m = $m->add($r->multiply($h));
+            }
+        }
+
+        return $m;
+    }
+
+    /**
+     * Performs RSA Blinding
+     *
+     * Protects against timing attacks by employing RSA Blinding.
+     * Returns $x->modPow($this->exponents[$i], $this->primes[$i])
+     */
+    private function blind(BigInteger $x, BigInteger $r, int $i): BigInteger
+    {
+        $x = $x->multiply($r->modPow($this->publicExponent, $this->primes[$i]));
+        $x = $x->modPow($this->exponents[$i], $this->primes[$i]);
+
+        $r = $r->modInverse($this->primes[$i]);
+        $x = $x->multiply($r);
+        [, $x] = $x->divide($this->primes[$i]);
+
+        return $x;
+    }
+
+    /**
+     * EMSA-PSS-ENCODE
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-9.1.1 RFC3447#section-9.1.1}.
+     *
+     * @throws RuntimeException on encoding error
+     */
+    private function emsa_pss_encode(string $m, int $emBits): string
+    {
+        // if $m is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
+        // be output.
+
+        $emLen = ($emBits + 1) >> 3; // ie. ceil($emBits / 8)
+        $sLen = $this->sLen !== null ? $this->sLen : $this->hLen;
+
+        $mHash = $this->hash->hash($m);
+        if ($emLen < $this->hLen + $sLen + 2) {
+            throw new LengthException('RSA modulus too short');
+        }
+
+        $salt = Random::string($sLen);
+        $m2 = "\0\0\0\0\0\0\0\0" . $mHash . $salt;
+        $h = $this->hash->hash($m2);
+        $ps = str_repeat(chr(0), $emLen - $sLen - $this->hLen - 2);
+        $db = $ps . chr(1) . $salt;
+        $dbMask = $this->mgf1($h, $emLen - $this->hLen - 1); // ie. stlren($db)
+        $maskedDB = $db ^ $dbMask;
+        $maskedDB[0] = ~chr(0xFF << ($emBits & 7)) & $maskedDB[0];
+        $em = $maskedDB . $h . chr(0xBC);
+
+        return $em;
+    }
+
+    /**
+     * RSASSA-PSS-SIGN
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-8.1.1 RFC3447#section-8.1.1}.
+     *
+     * @return bool|string
+     */
+    private function rsassa_pss_sign(string $m)
+    {
+        // EMSA-PSS encoding
+
+        $em = $this->emsa_pss_encode($m, 8 * $this->k - 1);
+
+        // RSA signature
+
+        $m = $this->os2ip($em);
+        $s = $this->rsasp1($m);
+        $s = $this->i2osp($s, $this->k);
+
+        // Output the signature S
+
+        return $s;
+    }
+
+    /**
+     * RSASSA-PKCS1-V1_5-SIGN
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-8.2.1 RFC3447#section-8.2.1}.
+     *
+     * @return bool|string
+     * @throws LengthException if the RSA modulus is too short
+     */
+    private function rsassa_pkcs1_v1_5_sign(string $m)
+    {
+        // EMSA-PKCS1-v1_5 encoding
+
+        // If the encoding operation outputs "intended encoded message length too short," output "RSA modulus
+        // too short" and stop.
+        try {
+            $em = $this->emsa_pkcs1_v1_5_encode($m, $this->k);
+        } catch (\LengthException $e) {
+            throw new LengthException('RSA modulus too short');
+        }
+
+        // RSA signature
+
+        $m = $this->os2ip($em);
+        $s = $this->rsasp1($m);
+        $s = $this->i2osp($s, $this->k);
+
+        // Output the signature S
+
+        return $s;
+    }
+
+    /**
+     * Create a signature
+     *
+     * @see self::verify()
+     * @param string $message
+     * @return string
+     */
+    public function sign($message)
+    {
+        switch ($this->signaturePadding) {
+            case self::SIGNATURE_PKCS1:
+            case self::SIGNATURE_RELAXED_PKCS1:
+                return $this->rsassa_pkcs1_v1_5_sign($message);
+            //case self::SIGNATURE_PSS:
+            default:
+                return $this->rsassa_pss_sign($message);
+        }
+    }
+
+    /**
+     * RSAES-PKCS1-V1_5-DECRYPT
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-7.2.2 RFC3447#section-7.2.2}.
+     *
+     * @return bool|string
+     */
+    private function rsaes_pkcs1_v1_5_decrypt(string $c)
+    {
+        // Length checking
+
+        if (strlen($c) != $this->k) { // or if k < 11
+            throw new LengthException('Ciphertext representative too long');
+        }
+
+        // RSA decryption
+
+        $c = $this->os2ip($c);
+        $m = $this->rsadp($c);
+        $em = $this->i2osp($m, $this->k);
+
+        // EME-PKCS1-v1_5 decoding
+
+        if (ord($em[0]) != 0 || ord($em[1]) > 2) {
+            throw new RuntimeException('Decryption error');
+        }
+
+        $ps = substr($em, 2, strpos($em, chr(0), 2) - 2);
+        $m = substr($em, strlen($ps) + 3);
+
+        if (strlen($ps) < 8) {
+            throw new RuntimeException('Decryption error');
+        }
+
+        // Output M
+
+        return $m;
+    }
+
+    /**
+     * RSAES-OAEP-DECRYPT
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-7.1.2 RFC3447#section-7.1.2}.  The fact that the error
+     * messages aren't distinguishable from one another hinders debugging, but, to quote from RFC3447#section-7.1.2:
+     *
+     *    Note.  Care must be taken to ensure that an opponent cannot
+     *    distinguish the different error conditions in Step 3.g, whether by
+     *    error message or timing, or, more generally, learn partial
+     *    information about the encoded message EM.  Otherwise an opponent may
+     *    be able to obtain useful information about the decryption of the
+     *    ciphertext C, leading to a chosen-ciphertext attack such as the one
+     *    observed by Manger [36].
+     *
+     * @return bool|string
+     */
+    private function rsaes_oaep_decrypt(string $c)
+    {
+        // Length checking
+
+        // if $l is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
+        // be output.
+
+        if (strlen($c) != $this->k || $this->k < 2 * $this->hLen + 2) {
+            throw new LengthException('Ciphertext representative too long');
+        }
+
+        // RSA decryption
+
+        $c = $this->os2ip($c);
+        $m = $this->rsadp($c);
+        $em = $this->i2osp($m, $this->k);
+
+        // EME-OAEP decoding
+
+        $lHash = $this->hash->hash($this->label);
+        $y = ord($em[0]);
+        $maskedSeed = substr($em, 1, $this->hLen);
+        $maskedDB = substr($em, $this->hLen + 1);
+        $seedMask = $this->mgf1($maskedDB, $this->hLen);
+        $seed = $maskedSeed ^ $seedMask;
+        $dbMask = $this->mgf1($seed, $this->k - $this->hLen - 1);
+        $db = $maskedDB ^ $dbMask;
+        $lHash2 = substr($db, 0, $this->hLen);
+        $m = substr($db, $this->hLen);
+        $hashesMatch = hash_equals($lHash, $lHash2);
+        $leadingZeros = 1;
+        $patternMatch = 0;
+        $offset = 0;
+        for ($i = 0; $i < strlen($m); $i++) {
+            $patternMatch |= $leadingZeros & ($m[$i] === "\1");
+            $leadingZeros &= $m[$i] === "\0";
+            $offset += $patternMatch ? 0 : 1;
+        }
+
+        // we do | instead of || to avoid https://en.wikipedia.org/wiki/Short-circuit_evaluation
+        // to protect against timing attacks
+        if (!$hashesMatch | !$patternMatch) {
+            throw new RuntimeException('Decryption error');
+        }
+
+        // Output the message M
+
+        return substr($m, $offset + 1);
+    }
+
+    /**
+     * Raw Encryption / Decryption
+     *
+     * Doesn't use padding and is not recommended.
+     *
+     * @return bool|string
+     * @throws LengthException if strlen($m) > $this->k
+     */
+    private function raw_encrypt(string $m)
+    {
+        if (strlen($m) > $this->k) {
+            throw new LengthException('Ciphertext representative too long');
+        }
+
+        $temp = $this->os2ip($m);
+        $temp = $this->rsadp($temp);
+        return  $this->i2osp($temp, $this->k);
+    }
+
+    /**
+     * Decryption
+     *
+     * @return bool|string
+     * @see self::encrypt()
+     */
+    public function decrypt(string $ciphertext)
+    {
+        switch ($this->encryptionPadding) {
+            case self::ENCRYPTION_NONE:
+                return $this->raw_encrypt($ciphertext);
+            case self::ENCRYPTION_PKCS1:
+                return $this->rsaes_pkcs1_v1_5_decrypt($ciphertext);
+            //case self::ENCRYPTION_OAEP:
+            default:
+                return $this->rsaes_oaep_decrypt($ciphertext);
+        }
+    }
+
+    /**
+     * Returns the public key
+     */
+    public function getPublicKey(): RSA
+    {
+        $type = self::validatePlugin('Keys', 'PKCS8', 'savePublicKey');
+        if (empty($this->modulus) || empty($this->publicExponent)) {
+            throw new RuntimeException('Public key components not found');
+        }
+
+        $key = $type::savePublicKey($this->modulus, $this->publicExponent);
+        return RSA::loadFormat('PKCS8', $key)
+            ->withHash($this->hash->getHash())
+            ->withMGFHash($this->mgfHash->getHash())
+            ->withSaltLength($this->sLen)
+            ->withLabel($this->label)
+            ->withPadding($this->signaturePadding | $this->encryptionPadding);
+    }
+
+    /**
+     * Returns the private key
+     *
+     * @param array $options optional
+     */
+    public function toString(string $type, array $options = []): string
+    {
+        $type = self::validatePlugin(
+            'Keys',
+            $type,
+            empty($this->primes) ? 'savePublicKey' : 'savePrivateKey'
+        );
+
+        if ($type == PSS::class) {
+            if ($this->signaturePadding == self::SIGNATURE_PSS) {
+                $options += [
+                    'hash' => $this->hash->getHash(),
+                    'MGFHash' => $this->mgfHash->getHash(),
+                    'saltLength' => $this->getSaltLength(),
+                ];
+            } else {
+                throw new UnsupportedFormatException('The PSS format can only be used when the signature method has been explicitly set to PSS');
+            }
+        }
+
+        if (empty($this->primes)) {
+            return $type::savePublicKey($this->modulus, $this->exponent, $options);
+        }
+
+        return $type::savePrivateKey($this->modulus, $this->publicExponent, $this->exponent, $this->primes, $this->exponents, $this->coefficients, $this->password, $options);
+
+        /*
+        $key = $type::savePrivateKey($this->modulus, $this->publicExponent, $this->exponent, $this->primes, $this->exponents, $this->coefficients, $this->password, $options);
+        if ($key !== false || count($this->primes) == 2) {
+            return $key;
+        }
+
+        $nSize = $this->getSize() >> 1;
+
+        $primes = [1 => clone self::$one, clone self::$one];
+        $i = 1;
+        foreach ($this->primes as $prime) {
+            $primes[$i] = $primes[$i]->multiply($prime);
+            if ($primes[$i]->getLength() >= $nSize) {
+                $i++;
+            }
+        }
+
+        $exponents = [];
+        $coefficients = [2 => $primes[2]->modInverse($primes[1])];
+
+        foreach ($primes as $i => $prime) {
+            $temp = $prime->subtract(self::$one);
+            $exponents[$i] = $this->modulus->modInverse($temp);
+        }
+
+        return $type::savePrivateKey($this->modulus, $this->publicExponent, $this->exponent, $primes, $exponents, $coefficients, $this->password, $options);
+        */
+    }
+}
diff --git a/phpseclib/Crypt/RSA/PuTTY.php b/phpseclib/Crypt/RSA/PuTTY.php
deleted file mode 100644
index 5e8596dbc..000000000
--- a/phpseclib/Crypt/RSA/PuTTY.php
+++ /dev/null
@@ -1,310 +0,0 @@
-<?php
-/**
- * PuTTY Formatted RSA Key Handler
- *
- * PHP version 5
- *
- * @category  Crypt
- * @package   RSA
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Crypt\RSA;
-
-use phpseclib\Math\BigInteger;
-use phpseclib\Crypt\AES;
-use phpseclib\Crypt\Hash;
-use phpseclib\Crypt\RSA\OpenSSH;
-
-/**
- * PuTTY Formatted RSA Key Handler
- *
- * @package RSA
- * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
- */
-class PuTTY
-{
-    /**
-     * Default comment
-     *
-     * @var string
-     * @access private
-     */
-    static $comment = 'phpseclib-generated-key';
-
-    /**
-     * Sets the default comment
-     *
-     * @access public
-     * @param string $comment
-     */
-    static function setComment($comment)
-    {
-        self::$comment = str_replace(array("\r", "\n"), '', $comment);
-    }
-
-    /**
-     * Generate a symmetric key for PuTTY keys
-     *
-     * @access public
-     * @param string $password
-     * @param string $iv
-     * @param int $length
-     * @return string
-     */
-    static function generateSymmetricKey($password, $length)
-    {
-        $symkey = '';
-        $sequence = 0;
-        while (strlen($symkey) < $length) {
-            $temp = pack('Na*', $sequence++, $password);
-            $symkey.= pack('H*', sha1($temp));
-        }
-        return substr($symkey, 0, $length);
-    }
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @access public
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    static function load($key, $password = '')
-    {
-        if (!is_string($key)) {
-            return false;
-        }
-
-        static $one;
-        if (!isset($one)) {
-            $one = new BigInteger(1);
-        }
-
-        if (strpos($key, 'BEGIN SSH2 PUBLIC KEY')) {
-            $data = preg_split('#[\r\n]+#', $key);
-            $data = array_splice($data, 2, -1);
-            $data = implode('', $data);
-
-            $components = OpenSSH::load($data);
-            if ($components === false) {
-                return false;
-            }
-
-            if (!preg_match('#Comment: "(.+)"#', $key, $matches)) {
-                return false;
-            }
-            $components['comment'] = str_replace(array('\\\\', '\"'), array('\\', '"'), $matches[1]);
-
-            return $components;
-        }
-
-        $components = array('isPublicKey' => false);
-        $key = preg_split('#\r\n|\r|\n#', $key);
-        $type = trim(preg_replace('#PuTTY-User-Key-File-2: (.+)#', '$1', $key[0]));
-        if ($type != 'ssh-rsa') {
-            return false;
-        }
-        $encryption = trim(preg_replace('#Encryption: (.+)#', '$1', $key[1]));
-        $components['comment'] = trim(preg_replace('#Comment: (.+)#', '$1', $key[2]));
-
-        $publicLength = trim(preg_replace('#Public-Lines: (\d+)#', '$1', $key[3]));
-        $public = base64_decode(implode('', array_map('trim', array_slice($key, 4, $publicLength))));
-        $public = substr($public, 11);
-        extract(unpack('Nlength', self::_string_shift($public, 4)));
-        $components['publicExponent'] = new BigInteger(self::_string_shift($public, $length), -256);
-        extract(unpack('Nlength', self::_string_shift($public, 4)));
-        $components['modulus'] = new BigInteger(self::_string_shift($public, $length), -256);
-
-        $privateLength = trim(preg_replace('#Private-Lines: (\d+)#', '$1', $key[$publicLength + 4]));
-        $private = base64_decode(implode('', array_map('trim', array_slice($key, $publicLength + 5, $privateLength))));
-
-        switch ($encryption) {
-            case 'aes256-cbc':
-                $symkey = static::generateSymmetricKey($password, 32);
-                $crypto = new AES();
-        }
-
-        if ($encryption != 'none') {
-            $crypto->setKey($symkey);
-            $crypto->disablePadding();
-            $private = $crypto->decrypt($private);
-            if ($private === false) {
-                return false;
-            }
-        }
-
-        extract(unpack('Nlength', self::_string_shift($private, 4)));
-        if (strlen($private) < $length) {
-            return false;
-        }
-        $components['privateExponent'] = new BigInteger(self::_string_shift($private, $length), -256);
-        extract(unpack('Nlength', self::_string_shift($private, 4)));
-        if (strlen($private) < $length) {
-            return false;
-        }
-        $components['primes'] = array(1 => new BigInteger(self::_string_shift($private, $length), -256));
-        extract(unpack('Nlength', self::_string_shift($private, 4)));
-        if (strlen($private) < $length) {
-            return false;
-        }
-        $components['primes'][] = new BigInteger(self::_string_shift($private, $length), -256);
-
-        $temp = $components['primes'][1]->subtract($one);
-        $components['exponents'] = array(1 => $components['publicExponent']->modInverse($temp));
-        $temp = $components['primes'][2]->subtract($one);
-        $components['exponents'][] = $components['publicExponent']->modInverse($temp);
-
-        extract(unpack('Nlength', self::_string_shift($private, 4)));
-        if (strlen($private) < $length) {
-            return false;
-        }
-        $components['coefficients'] = array(2 => new BigInteger(self::_string_shift($private, $length), -256));
-
-        return $components;
-    }
-
-    /**
-     * String Shift
-     *
-     * Inspired by array_shift
-     *
-     * @param string $string
-     * @param int $index
-     * @return string
-     * @access private
-     */
-    static function _string_shift(&$string, $index = 1)
-    {
-        $substr = substr($string, 0, $index);
-        $string = substr($string, $index);
-        return $substr;
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @access public
-     * @param \phpseclib\Math\BigInteger $n
-     * @param \phpseclib\Math\BigInteger $e
-     * @param \phpseclib\Math\BigInteger $d
-     * @param array $primes
-     * @param array $exponents
-     * @param array $coefficients
-     * @param string $password optional
-     * @return string
-     */
-    static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $d, $primes, $exponents, $coefficients, $password = '')
-    {
-        if (count($primes) != 2) {
-            return false;
-        }
-
-        $raw = array(
-            'modulus' => $n->toBytes(true),
-            'publicExponent' => $e->toBytes(true),
-            'privateExponent' => $d->toBytes(true),
-            'prime1' => $primes[1]->toBytes(true),
-            'prime2' => $primes[2]->toBytes(true),
-            'exponent1' => $exponents[1]->toBytes(true),
-            'exponent2' => $exponents[2]->toBytes(true),
-            'coefficient' => $coefficients[2]->toBytes(true)
-        );
-
-        $key = "PuTTY-User-Key-File-2: ssh-rsa\r\nEncryption: ";
-        $encryption = (!empty($password) || is_string($password)) ? 'aes256-cbc' : 'none';
-        $key.= $encryption;
-        $key.= "\r\nComment: " . self::$comment . "\r\n";
-        $public = pack(
-            'Na*Na*Na*',
-            strlen('ssh-rsa'),
-            'ssh-rsa',
-            strlen($raw['publicExponent']),
-            $raw['publicExponent'],
-            strlen($raw['modulus']),
-            $raw['modulus']
-        );
-        $source = pack(
-            'Na*Na*Na*Na*',
-            strlen('ssh-rsa'),
-            'ssh-rsa',
-            strlen($encryption),
-            $encryption,
-            strlen(self::$comment),
-            self::$comment,
-            strlen($public),
-            $public
-        );
-        $public = base64_encode($public);
-        $key.= "Public-Lines: " . ((strlen($public) + 63) >> 6) . "\r\n";
-        $key.= chunk_split($public, 64);
-        $private = pack(
-            'Na*Na*Na*Na*',
-            strlen($raw['privateExponent']),
-            $raw['privateExponent'],
-            strlen($raw['prime1']),
-            $raw['prime1'],
-            strlen($raw['prime2']),
-            $raw['prime2'],
-            strlen($raw['coefficient']),
-            $raw['coefficient']
-        );
-        if (empty($password) && !is_string($password)) {
-            $source.= pack('Na*', strlen($private), $private);
-            $hashkey = 'putty-private-key-file-mac-key';
-        } else {
-            $private.= Random::string(16 - (strlen($private) & 15));
-            $source.= pack('Na*', strlen($private), $private);
-            $crypto = new AES();
-
-            $crypto->setKey(static::generateSymmetricKey($password, 32));
-            $crypto->disablePadding();
-            $private = $crypto->encrypt($private);
-            $hashkey = 'putty-private-key-file-mac-key' . $password;
-        }
-
-        $private = base64_encode($private);
-        $key.= 'Private-Lines: ' . ((strlen($private) + 63) >> 6) . "\r\n";
-        $key.= chunk_split($private, 64);
-        $hash = new Hash('sha1');
-        $hash->setKey(pack('H*', sha1($hashkey)));
-        $key.= 'Private-MAC: ' . bin2hex($hash->hash($source)) . "\r\n";
-
-        return $key;
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @access public
-     * @param \phpseclib\Math\BigInteger $n
-     * @param \phpseclib\Math\BigInteger $e
-     * @return string
-     */
-    static function savePublicKey(BigInteger $n, BigInteger $e)
-    {
-        $n = $n->toBytes(true);
-        $e = $e->toBytes(true);
-
-        $key = pack(
-            'Na*Na*Na*',
-            strlen('ssh-rsa'),
-            'ssh-rsa',
-            strlen($e),
-            $e,
-            strlen($n),
-            $n
-        );
-        $key = "---- BEGIN SSH2 PUBLIC KEY ----\r\n" .
-               'Comment: "' . str_replace(array('\\', '"'), array('\\\\', '\"'), self::$comment) . "\"\r\n";
-               chunk_split(base64_encode($key), 64) .
-               '---- END SSH2 PUBLIC KEY ----';
-
-        return $key;
-    }
-}
diff --git a/phpseclib/Crypt/RSA/PublicKey.php b/phpseclib/Crypt/RSA/PublicKey.php
new file mode 100644
index 000000000..ef9e1247d
--- /dev/null
+++ b/phpseclib/Crypt/RSA/PublicKey.php
@@ -0,0 +1,491 @@
+<?php
+
+/**
+ * RSA Public Key
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt\RSA;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Common;
+use phpseclib3\Crypt\Hash;
+use phpseclib3\Crypt\Random;
+use phpseclib3\Crypt\RSA;
+use phpseclib3\Crypt\RSA\Formats\Keys\PSS;
+use phpseclib3\Exception\LengthException;
+use phpseclib3\Exception\OutOfRangeException;
+use phpseclib3\Exception\UnsupportedAlgorithmException;
+use phpseclib3\Exception\UnsupportedFormatException;
+use phpseclib3\File\ASN1;
+use phpseclib3\File\ASN1\Maps\DigestInfo;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * Raw RSA Key Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+final class PublicKey extends RSA implements Common\PublicKey
+{
+    use Common\Traits\Fingerprint;
+
+    /**
+     * Exponentiate
+     */
+    private function exponentiate(BigInteger $x): BigInteger
+    {
+        return $x->modPow($this->exponent, $this->modulus);
+    }
+
+    /**
+     * RSAVP1
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-5.2.2 RFC3447#section-5.2.2}.
+     *
+     * @return bool|BigInteger
+     */
+    private function rsavp1(BigInteger $s)
+    {
+        if ($s->compare(self::$zero) < 0 || $s->compare($this->modulus) > 0) {
+            return false;
+        }
+        return $this->exponentiate($s);
+    }
+
+    /**
+     * RSASSA-PKCS1-V1_5-VERIFY
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-8.2.2 RFC3447#section-8.2.2}.
+     *
+     * @throws LengthException if the RSA modulus is too short
+     */
+    private function rsassa_pkcs1_v1_5_verify(string $m, string $s): bool
+    {
+        // Length checking
+
+        if (strlen($s) != $this->k) {
+            return false;
+        }
+
+        // RSA verification
+
+        $s = $this->os2ip($s);
+        $m2 = $this->rsavp1($s);
+        if ($m2 === false) {
+            return false;
+        }
+        $em = $this->i2osp($m2, $this->k);
+        if ($em === false) {
+            return false;
+        }
+
+        // EMSA-PKCS1-v1_5 encoding
+
+        $exception = false;
+
+        // If the encoding operation outputs "intended encoded message length too short," output "RSA modulus
+        // too short" and stop.
+        try {
+            $em2 = $this->emsa_pkcs1_v1_5_encode($m, $this->k);
+            $r1 = hash_equals($em, $em2);
+        } catch (\LengthException $e) {
+            $exception = true;
+        }
+
+        try {
+            $em3 = $this->emsa_pkcs1_v1_5_encode_without_null($m, $this->k);
+            $r2 = hash_equals($em, $em3);
+        } catch (\LengthException $e) {
+            $exception = true;
+        } catch (UnsupportedAlgorithmException $e) {
+            $r2 = false;
+        }
+
+        if ($exception) {
+            throw new LengthException('RSA modulus too short');
+        }
+
+        // Compare
+        return $r1 || $r2;
+    }
+
+    /**
+     * RSASSA-PKCS1-V1_5-VERIFY (relaxed matching)
+     *
+     * Per {@link http://tools.ietf.org/html/rfc3447#page-43 RFC3447#page-43} PKCS1 v1.5
+     * specified the use BER encoding rather than DER encoding that PKCS1 v2.0 specified.
+     * This means that under rare conditions you can have a perfectly valid v1.5 signature
+     * that fails to validate with _rsassa_pkcs1_v1_5_verify(). PKCS1 v2.1 also recommends
+     * that if you're going to validate these types of signatures you "should indicate
+     * whether the underlying BER encoding is a DER encoding and hence whether the signature
+     * is valid with respect to the specification given in [PKCS1 v2.0+]". so if you do
+     * $rsa->getLastPadding() and get RSA::PADDING_RELAXED_PKCS1 back instead of
+     * RSA::PADDING_PKCS1... that means BER encoding was used.
+     */
+    private function rsassa_pkcs1_v1_5_relaxed_verify(string $m, string $s): bool
+    {
+        // Length checking
+
+        if (strlen($s) != $this->k) {
+            return false;
+        }
+
+        // RSA verification
+
+        $s = $this->os2ip($s);
+        $m2 = $this->rsavp1($s);
+        if ($m2 === false) {
+            return false;
+        }
+        $em = $this->i2osp($m2, $this->k);
+        if ($em === false) {
+            return false;
+        }
+
+        if (Strings::shift($em, 2) != "\0\1") {
+            return false;
+        }
+
+        $em = ltrim($em, "\xFF");
+        if (Strings::shift($em) != "\0") {
+            return false;
+        }
+
+        $decoded = ASN1::decodeBER($em);
+        if (!is_array($decoded) || empty($decoded[0]) || strlen($em) > $decoded[0]['length']) {
+            return false;
+        }
+
+        static $oids;
+        if (!isset($oids)) {
+            $oids = [
+                'md2' => '1.2.840.113549.2.2',
+                'md4' => '1.2.840.113549.2.4', // from PKCS1 v1.5
+                'md5' => '1.2.840.113549.2.5',
+                'id-sha1' => '1.3.14.3.2.26',
+                'id-sha256' => '2.16.840.1.101.3.4.2.1',
+                'id-sha384' => '2.16.840.1.101.3.4.2.2',
+                'id-sha512' => '2.16.840.1.101.3.4.2.3',
+                // from PKCS1 v2.2
+                'id-sha224' => '2.16.840.1.101.3.4.2.4',
+                'id-sha512/224' => '2.16.840.1.101.3.4.2.5',
+                'id-sha512/256' => '2.16.840.1.101.3.4.2.6',
+            ];
+            ASN1::loadOIDs($oids);
+        }
+
+        $decoded = ASN1::asn1map($decoded[0], DigestInfo::MAP);
+        if (!isset($decoded) || $decoded === false) {
+            return false;
+        }
+
+        if (!isset($oids[$decoded['digestAlgorithm']['algorithm']])) {
+            return false;
+        }
+
+        if (isset($decoded['digestAlgorithm']['parameters']) && $decoded['digestAlgorithm']['parameters'] !== ['null' => '']) {
+            return false;
+        }
+
+        $hash = $decoded['digestAlgorithm']['algorithm'];
+        $hash = substr($hash, 0, 3) == 'id-' ?
+            substr($hash, 3) :
+            $hash;
+        $hash = new Hash($hash);
+        $em = $hash->hash($m);
+        $em2 = $decoded['digest'];
+
+        return hash_equals($em, $em2);
+    }
+
+    /**
+     * EMSA-PSS-VERIFY
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-9.1.2 RFC3447#section-9.1.2}.
+     *
+     * @return string
+     */
+    private function emsa_pss_verify(string $m, string $em, int $emBits)
+    {
+        // if $m is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
+        // be output.
+
+        $emLen = ($emBits + 7) >> 3; // ie. ceil($emBits / 8);
+        $sLen = $this->sLen !== null ? $this->sLen : $this->hLen;
+
+        $mHash = $this->hash->hash($m);
+        if ($emLen < $this->hLen + $sLen + 2) {
+            return false;
+        }
+
+        if ($em[-1] != chr(0xBC)) {
+            return false;
+        }
+
+        $maskedDB = substr($em, 0, -$this->hLen - 1);
+        $h = substr($em, -$this->hLen - 1, $this->hLen);
+        $temp = chr(0xFF << ($emBits & 7));
+        if ((~$maskedDB[0] & $temp) != $temp) {
+            return false;
+        }
+        $dbMask = $this->mgf1($h, $emLen - $this->hLen - 1);
+        $db = $maskedDB ^ $dbMask;
+        $db[0] = ~chr(0xFF << ($emBits & 7)) & $db[0];
+        $temp = $emLen - $this->hLen - $sLen - 2;
+        if (substr($db, 0, $temp) != str_repeat(chr(0), $temp) || ord($db[$temp]) != 1) {
+            return false;
+        }
+        $salt = substr($db, $temp + 1); // should be $sLen long
+        $m2 = "\0\0\0\0\0\0\0\0" . $mHash . $salt;
+        $h2 = $this->hash->hash($m2);
+        return hash_equals($h, $h2);
+    }
+
+    /**
+     * RSASSA-PSS-VERIFY
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-8.1.2 RFC3447#section-8.1.2}.
+     *
+     * @return bool|string
+     */
+    private function rsassa_pss_verify(string $m, string $s)
+    {
+        // Length checking
+
+        if (strlen($s) != $this->k) {
+            return false;
+        }
+
+        // RSA verification
+
+        $modBits = strlen($this->modulus->toBits());
+
+        $s2 = $this->os2ip($s);
+        $m2 = $this->rsavp1($s2);
+        $em = $this->i2osp($m2, $this->k);
+        if ($em === false) {
+            return false;
+        }
+
+        // EMSA-PSS verification
+
+        return $this->emsa_pss_verify($m, $em, $modBits - 1);
+    }
+
+    /**
+     * Verifies a signature
+     *
+     * @see self::sign()
+     * @param string $message
+     * @param string $signature
+     * @return bool
+     */
+    public function verify($message, $signature)
+    {
+        switch ($this->signaturePadding) {
+            case self::SIGNATURE_RELAXED_PKCS1:
+                return $this->rsassa_pkcs1_v1_5_relaxed_verify($message, $signature);
+            case self::SIGNATURE_PKCS1:
+                return $this->rsassa_pkcs1_v1_5_verify($message, $signature);
+            //case self::SIGNATURE_PSS:
+            default:
+                return $this->rsassa_pss_verify($message, $signature);
+        }
+    }
+
+    /**
+     * RSAES-PKCS1-V1_5-ENCRYPT
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-7.2.1 RFC3447#section-7.2.1}.
+     *
+     * @param bool $pkcs15_compat optional
+     * @return bool|string
+     * @throws LengthException if strlen($m) > $this->k - 11
+     */
+    private function rsaes_pkcs1_v1_5_encrypt(string $m, bool $pkcs15_compat = false)
+    {
+        $mLen = strlen($m);
+
+        // Length checking
+
+        if ($mLen > $this->k - 11) {
+            throw new LengthException('Message too long');
+        }
+
+        // EME-PKCS1-v1_5 encoding
+
+        $psLen = $this->k - $mLen - 3;
+        $ps = '';
+        while (strlen($ps) != $psLen) {
+            $temp = Random::string($psLen - strlen($ps));
+            $temp = str_replace("\x00", '', $temp);
+            $ps .= $temp;
+        }
+        $type = 2;
+        $em = chr(0) . chr($type) . $ps . chr(0) . $m;
+
+        // RSA encryption
+        $m = $this->os2ip($em);
+        $c = $this->rsaep($m);
+        $c = $this->i2osp($c, $this->k);
+
+        // Output the ciphertext C
+
+        return $c;
+    }
+
+    /**
+     * RSAES-OAEP-ENCRYPT
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-7.1.1 RFC3447#section-7.1.1} and
+     * {http://en.wikipedia.org/wiki/Optimal_Asymmetric_Encryption_Padding OAES}.
+     *
+     * @throws LengthException if strlen($m) > $this->k - 2 * $this->hLen - 2
+     */
+    private function rsaes_oaep_encrypt(string $m): string
+    {
+        $mLen = strlen($m);
+
+        // Length checking
+
+        // if $l is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
+        // be output.
+
+        if ($mLen > $this->k - 2 * $this->hLen - 2) {
+            throw new LengthException('Message too long');
+        }
+
+        // EME-OAEP encoding
+
+        $lHash = $this->hash->hash($this->label);
+        $ps = str_repeat(chr(0), $this->k - $mLen - 2 * $this->hLen - 2);
+        $db = $lHash . $ps . chr(1) . $m;
+        $seed = Random::string($this->hLen);
+        $dbMask = $this->mgf1($seed, $this->k - $this->hLen - 1);
+        $maskedDB = $db ^ $dbMask;
+        $seedMask = $this->mgf1($maskedDB, $this->hLen);
+        $maskedSeed = $seed ^ $seedMask;
+        $em = chr(0) . $maskedSeed . $maskedDB;
+
+        // RSA encryption
+
+        $m = $this->os2ip($em);
+        $c = $this->rsaep($m);
+        $c = $this->i2osp($c, $this->k);
+
+        // Output the ciphertext C
+
+        return $c;
+    }
+
+    /**
+     * RSAEP
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-5.1.1 RFC3447#section-5.1.1}.
+     *
+     * @return bool|BigInteger
+     */
+    private function rsaep(BigInteger $m)
+    {
+        if ($m->compare(self::$zero) < 0 || $m->compare($this->modulus) > 0) {
+            throw new OutOfRangeException('Message representative out of range');
+        }
+        return $this->exponentiate($m);
+    }
+
+    /**
+     * Raw Encryption / Decryption
+     *
+     * Doesn't use padding and is not recommended.
+     *
+     * @return bool|string
+     * @throws LengthException if strlen($m) > $this->k
+     */
+    private function raw_encrypt(string $m)
+    {
+        if (strlen($m) > $this->k) {
+            throw new LengthException('Message too long');
+        }
+
+        $temp = $this->os2ip($m);
+        $temp = $this->rsaep($temp);
+        return  $this->i2osp($temp, $this->k);
+    }
+
+    /**
+     * Encryption
+     *
+     * Both self::PADDING_OAEP and self::PADDING_PKCS1 both place limits on how long $plaintext can be.
+     * If $plaintext exceeds those limits it will be broken up so that it does and the resultant ciphertext's will
+     * be concatenated together.
+     *
+     * @return bool|string
+     * @throws LengthException if the RSA modulus is too short
+     * @see self::decrypt()
+     */
+    public function encrypt(string $plaintext)
+    {
+        switch ($this->encryptionPadding) {
+            case self::ENCRYPTION_NONE:
+                return $this->raw_encrypt($plaintext);
+            case self::ENCRYPTION_PKCS1:
+                return $this->rsaes_pkcs1_v1_5_encrypt($plaintext);
+            //case self::ENCRYPTION_OAEP:
+            default:
+                return $this->rsaes_oaep_encrypt($plaintext);
+        }
+    }
+
+    /**
+     * Returns the public key
+     *
+     * The public key is only returned under two circumstances - if the private key had the public key embedded within it
+     * or if the public key was set via setPublicKey().  If the currently loaded key is supposed to be the public key this
+     * function won't return it since this library, for the most part, doesn't distinguish between public and private keys.
+     *
+     * @param array $options optional
+     */
+    public function toString(string $type, array $options = []): string
+    {
+        $type = self::validatePlugin('Keys', $type, 'savePublicKey');
+
+        if ($type == PSS::class) {
+            if ($this->signaturePadding == self::SIGNATURE_PSS) {
+                $options += [
+                    'hash' => $this->hash->getHash(),
+                    'MGFHash' => $this->mgfHash->getHash(),
+                    'saltLength' => $this->getSaltLength(),
+                ];
+            } else {
+                throw new UnsupportedFormatException('The PSS format can only be used when the signature method has been explicitly set to PSS');
+            }
+        }
+
+        return $type::savePublicKey($this->modulus, $this->publicExponent, $options);
+    }
+
+    /**
+     * Converts a public key to a private key
+     */
+    public function asPrivateKey(): RSA
+    {
+        $new = new PrivateKey();
+        $new->exponent = $this->exponent;
+        $new->modulus = $this->modulus;
+        $new->k = $this->k;
+        $new->format = $this->format;
+        return $new
+            ->withHash($this->hash->getHash())
+            ->withMGFHash($this->mgfHash->getHash())
+            ->withSaltLength($this->sLen)
+            ->withLabel($this->label)
+            ->withPadding($this->signaturePadding | $this->encryptionPadding);
+    }
+}
diff --git a/phpseclib/Crypt/RSA/Raw.php b/phpseclib/Crypt/RSA/Raw.php
deleted file mode 100644
index d39925216..000000000
--- a/phpseclib/Crypt/RSA/Raw.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Raw RSA Key Handler
- *
- * PHP version 5
- *
- * An array containing two \phpseclib\Math\BigInteger objects.
- *
- * The exponent can be indexed with any of the following:
- *
- * 0, e, exponent, publicExponent
- *
- * The modulus can be indexed with any of the following:
- *
- * 1, n, modulo, modulus
- *
- * @category  Crypt
- * @package   RSA
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Crypt\RSA;
-
-use phpseclib\Math\BigInteger;
-
-/**
- * Raw RSA Key Handler
- *
- * @package RSA
- * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
- */
-class Raw
-{
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @access public
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    static function load($key, $password = '')
-    {
-        if (!is_array($key)) {
-            return false;
-        }
-        if (isset($key['isPublicKey']) && isset($key['modulus'])) {
-            if (isset($key['privateExponent']) || isset($key['publicExponent'])) {
-                if (!isset($key['primes'])) {
-                    return $key;
-                }
-                if (isset($key['exponents']) && isset($key['coefficients']) && isset($key['publicExponent']) && isset($key['privateExponent'])) {
-                    return $key;
-                }
-            }
-        }
-        $components = array('isPublicKey' => true);
-        switch (true) {
-            case isset($key['e']):
-                $components['publicExponent'] = $key['e'];
-                break;
-            case isset($key['exponent']):
-                $components['publicExponent'] = $key['exponent'];
-                break;
-            case isset($key['publicExponent']):
-                $components['publicExponent'] = $key['publicExponent'];
-                break;
-            case isset($key[0]):
-                $components['publicExponent'] = $key[0];
-        }
-        switch (true) {
-            case isset($key['n']):
-                $components['modulus'] = $key['n'];
-                break;
-            case isset($key['modulo']):
-                $components['modulus'] = $key['modulo'];
-                break;
-            case isset($key['modulus']):
-                $components['modulus'] = $key['modulus'];
-                break;
-            case isset($key[1]):
-                $components['modulus'] = $key[1];
-        }
-        return isset($components['modulus']) && isset($components['publicExponent']) ? $components : false;
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @access public
-     * @param \phpseclib\Math\BigInteger $n
-     * @param \phpseclib\Math\BigInteger $e
-     * @return string
-     */
-    static function savePublicKey(BigInteger $n, BigInteger $e)
-    {
-        return array('e' => clone $e, 'n' => clone $n);
-    }
-}
diff --git a/phpseclib/Crypt/RSA/XML.php b/phpseclib/Crypt/RSA/XML.php
deleted file mode 100644
index 00b4d9107..000000000
--- a/phpseclib/Crypt/RSA/XML.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/**
- * XML Formatted RSA Key Handler
- *
- * More info:
- *
- * http://www.w3.org/TR/xmldsig-core/#sec-RSAKeyValue
- * http://en.wikipedia.org/wiki/XML_Signature
- *
- * PHP version 5
- *
- * @category  Crypt
- * @package   RSA
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Crypt\RSA;
-
-use phpseclib\Math\BigInteger;
-
-/**
- * XML Formatted RSA Key Handler
- *
- * @package RSA
- * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
- */
-class XML
-{
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @access public
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    static function load($key, $password = '')
-    {
-        if (!is_string($key)) {
-            return false;
-        }
-
-        $components = array(
-            'isPublicKey' => false,
-            'primes' => array(),
-            'exponents' => array(),
-            'coefficients' => array()
-        );
-
-        $use_errors = libxml_use_internal_errors(true);
-
-        $dom = new \DOMDocument();
-        if (!$dom->loadXML('<xml>' . $key . '</xml>')) {
-            return false;
-        }
-        $xpath = new \DOMXPath($dom);
-        $keys = array('modulus', 'exponent', 'p', 'q', 'dp', 'dq', 'inverseq', 'd');
-        foreach ($keys as $key) {
-            // $dom->getElementsByTagName($key) is case-sensitive
-            $temp = $xpath->query("//*[translate(local-name(), 'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz')='$key']");
-            if (!$temp->length) {
-                continue;
-            }
-            $value = new BigInteger(base64_decode($temp->item(0)->nodeValue), 256);
-            switch ($key) {
-                case 'modulus':
-                    $components['modulus'] = $value;
-                    break;
-                case 'exponent':
-                    $components['publicExponent'] = $value;
-                    break;
-                case 'p':
-                    $components['primes'][1] = $value;
-                    break;
-                case 'q':
-                    $components['primes'][2] = $value;
-                    break;
-                case 'dp':
-                    $components['exponents'][1] = $value;
-                    break;
-                case 'dq':
-                    $components['exponents'][2] = $value;
-                    break;
-                case 'inverseq':
-                    $components['coefficients'][2] = $value;
-                    break;
-                case 'd':
-                    $components['privateExponent'] = $value;
-            }
-        }
-
-        libxml_use_internal_errors($use_errors);
-
-        return isset($components['modulus']) && isset($components['publicExponent']) ? $components : false;
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @access public
-     * @param \phpseclib\Math\BigInteger $n
-     * @param \phpseclib\Math\BigInteger $e
-     * @param \phpseclib\Math\BigInteger $d
-     * @param array $primes
-     * @param array $exponents
-     * @param array $coefficients
-     * @param string $password optional
-     * @return string
-     */
-    static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $d, $primes, $exponents, $coefficients, $password = '')
-    {
-        if (count($primes) != 2) {
-            return false;
-        }
-        return "<RSAKeyValue>\r\n" .
-               '  <Modulus>' . base64_encode($n->toBytes()) . "</Modulus>\r\n" .
-               '  <Exponent>' . base64_encode($e->toBytes()) . "</Exponent>\r\n" .
-               '  <P>' . base64_encode($primes[1]->toBytes()) . "</P>\r\n" .
-               '  <Q>' . base64_encode($primes[2]->toBytes()) . "</Q>\r\n" .
-               '  <DP>' . base64_encode($exponents[1]->toBytes()) . "</DP>\r\n" .
-               '  <DQ>' . base64_encode($exponents[2]->toBytes()) . "</DQ>\r\n" .
-               '  <InverseQ>' . base64_encode($coefficients[2]->toBytes()) . "</InverseQ>\r\n" .
-               '  <D>' . base64_encode($d->toBytes()) . "</D>\r\n" .
-               '</RSAKeyValue>';
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @access public
-     * @param \phpseclib\Math\BigInteger $n
-     * @param \phpseclib\Math\BigInteger $e
-     * @return string
-     */
-    static function savePublicKey(BigInteger $n, BigInteger $e)
-    {
-        return "<RSAKeyValue>\r\n" .
-               '  <Modulus>' . base64_encode($n->toBytes()) . "</Modulus>\r\n" .
-               '  <Exponent>' . base64_encode($e->toBytes()) . "</Exponent>\r\n" .
-               '</RSAKeyValue>';
-    }
-}
diff --git a/phpseclib/Crypt/Random.php b/phpseclib/Crypt/Random.php
index 84972d627..56852e77e 100644
--- a/phpseclib/Crypt/Random.php
+++ b/phpseclib/Crypt/Random.php
@@ -10,36 +10,28 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    echo bin2hex(\phpseclib\Crypt\Random::string(8));
+ *    echo bin2hex(\phpseclib3\Crypt\Random::string(8));
  * ?>
  * </code>
  *
- * @category  Crypt
- * @package   Random
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2007 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\Crypt;
+declare(strict_types=1);
 
-use phpseclib\Crypt\AES;
-use phpseclib\Crypt\Base;
-use phpseclib\Crypt\Blowfish;
-use phpseclib\Crypt\DES;
-use phpseclib\Crypt\RC4;
-use phpseclib\Crypt\TripleDES;
-use phpseclib\Crypt\Twofish;
+namespace phpseclib3\Crypt;
+
+use phpseclib3\Exception\RuntimeException;
 
 /**
  * Pure-PHP Random Number Generator
  *
- * @package Random
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
-class Random
+abstract class Random
 {
     /**
      * Generate a random string.
@@ -48,70 +40,25 @@ class Random
      * microoptimizations because this function has the potential of being called a huge number of times.
      * eg. for RSA key generation.
      *
-     * @param int $length
-     * @throws \RuntimeException if a symmetric cipher is needed but not loaded
-     * @return string
+     * @throws RuntimeException if a symmetric cipher is needed but not loaded
      */
-    static function string($length)
+    public static function string(int $length): string
     {
-        if (version_compare(PHP_VERSION, '7.0.0', '>=')) {
-            try {
-                return \random_bytes($length);
-            } catch (\Throwable $e) {
-                // If a sufficient source of randomness is unavailable, random_bytes() will throw an
-                // object that implements the Throwable interface (Exception, TypeError, Error).
-                // We don't actually need to do anything here. The string() method should just continue
-                // as normal. Note, however, that if we don't have a sufficient source of randomness for
-                // random_bytes(), most of the other calls here will fail too, so we'll end up using
-                // the PHP implementation.
-            }
+        if (!$length) {
+            return '';
         }
 
-        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-            // method 1. prior to PHP 5.3 this would call rand() on windows hence the function_exists('class_alias') call.
-            // ie. class_alias is a function that was introduced in PHP 5.3
-            if (extension_loaded('mcrypt') && function_exists('class_alias')) {
-                return mcrypt_create_iv($length);
-            }
-            // method 2. openssl_random_pseudo_bytes was introduced in PHP 5.3.0 but prior to PHP 5.3.4 there was,
-            // to quote <http://php.net/ChangeLog-5.php#5.3.4>, "possible blocking behavior". as of 5.3.4
-            // openssl_random_pseudo_bytes and mcrypt_create_iv do the exact same thing on Windows. ie. they both
-            // call php_win32_get_random_bytes():
-            //
-            // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/ext/openssl/openssl.c#L5008
-            // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/ext/mcrypt/mcrypt.c#L1392
-            //
-            // php_win32_get_random_bytes() is defined thusly:
-            //
-            // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/win32/winutil.c#L80
-            //
-            // we're calling it, all the same, in the off chance that the mcrypt extension is not available
-            if (extension_loaded('openssl') && version_compare(PHP_VERSION, '5.3.4', '>=')) {
-                return openssl_random_pseudo_bytes($length);
-            }
-        } else {
-            // method 1. the fastest
-            if (extension_loaded('openssl')) {
-                return openssl_random_pseudo_bytes($length);
-            }
-            // method 2
-            static $fp = true;
-            if ($fp === true) {
-                // warning's will be output unles the error suppression operator is used. errors such as
-                // "open_basedir restriction in effect", "Permission denied", "No such file or directory", etc.
-                $fp = @fopen('/dev/urandom', 'rb');
-            }
-            if ($fp !== true && $fp !== false) { // surprisingly faster than !is_bool() or is_resource()
-                return fread($fp, $length);
-            }
-            // method 3. pretty much does the same thing as method 2 per the following url:
-            // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/ext/mcrypt/mcrypt.c#L1391
-            // surprisingly slower than method 2. maybe that's because mcrypt_create_iv does a bunch of error checking that we're
-            // not doing. regardless, this'll only be called if this PHP script couldn't open /dev/urandom due to open_basedir
-            // restrictions or some such
-            if (extension_loaded('mcrypt')) {
-                return mcrypt_create_iv($length, MCRYPT_DEV_URANDOM);
-            }
+        try {
+            return random_bytes($length);
+        } catch (\Exception $e) {
+            // random_compat will throw an Exception, which in PHP 5 does not implement Throwable
+        } catch (\Throwable $e) {
+            // If a sufficient source of randomness is unavailable, random_bytes() will throw an
+            // object that implements the Throwable interface (Exception, TypeError, Error).
+            // We don't actually need to do anything here. The string() method should just continue
+            // as normal. Note, however, that if we don't have a sufficient source of randomness for
+            // random_bytes(), most of the other calls here will fail too, so we'll end up using
+            // the PHP implementation.
         }
         // at this point we have no choice but to use a pure-PHP CSPRNG
 
@@ -124,11 +71,11 @@ static function string($length)
         // PHP isn't low level to be able to use those as sources and on a web server there's not likely
         // going to be a ton of keyboard or mouse action. web servers do have one thing that we can use
         // however, a ton of people visiting the website. obviously you don't want to base your seeding
-        // soley on parameters a potential attacker sends but (1) not everything in $_SERVER is controlled
+        // solely on parameters a potential attacker sends but (1) not everything in $_SERVER is controlled
         // by the user and (2) this isn't just looking at the data sent by the current user - it's based
         // on the data sent by all users. one user requests the page and a hash of their info is saved.
         // another user visits the page and the serialization of their data is utilized along with the
-        // server envirnment stuff and a hash of the previous http request data (which itself utilizes
+        // server environment stuff and a hash of the previous http request data (which itself utilizes
         // a hash of the session data before that). certainly an attacker should be assumed to have
         // full control over his own http requests. he, however, is not going to have control over
         // everyone's http requests.
@@ -138,7 +85,7 @@ static function string($length)
             $old_session_id = session_id();
             $old_use_cookies = ini_get('session.use_cookies');
             $old_session_cache_limiter = session_cache_limiter();
-            $_OLD_SESSION = isset($_SESSION) ? $_SESSION : false;
+            $_OLD_SESSION = $_SESSION ?? false;
             if ($old_session_id != '') {
                 session_write_close();
             }
@@ -148,15 +95,17 @@ static function string($length)
             session_cache_limiter('');
             session_start();
 
-            $v = $seed = $_SESSION['seed'] = pack('H*', sha1(
-                serialize($_SERVER) .
-                serialize($_POST) .
-                serialize($_GET) .
-                serialize($_COOKIE) .
-                serialize($GLOBALS) .
-                serialize($_SESSION) .
-                serialize($_OLD_SESSION)
-            ));
+            $v = (isset($_SERVER) ? self::safe_serialize($_SERVER) : '') .
+                 (isset($_POST) ? self::safe_serialize($_POST) : '') .
+                 (isset($_GET) ? self::safe_serialize($_GET) : '') .
+                 (isset($_COOKIE) ? self::safe_serialize($_COOKIE) : '') .
+                 // as of PHP 8.1 $GLOBALS can't be accessed by reference, which eliminates
+                 // the need for phpseclib_safe_serialize. see https://wiki.php.net/rfc/restrict_globals_usage
+                 // for more info
+                 serialize($GLOBALS) .
+                 self::safe_serialize($_SESSION) .
+                 self::safe_serialize($_OLD_SESSION);
+            $v = $seed = $_SESSION['seed'] = sha1($v, true);
             if (!isset($_SESSION['count'])) {
                 $_SESSION['count'] = 0;
             }
@@ -187,37 +136,37 @@ static function string($length)
             // http://tools.ietf.org/html/rfc4253#section-7.2
             //
             // see the is_string($crypto) part for an example of how to expand the keys
-            $key = pack('H*', sha1($seed . 'A'));
-            $iv = pack('H*', sha1($seed . 'C'));
+            $key = sha1($seed . 'A', true);
+            $iv = sha1($seed . 'C', true);
 
             // ciphers are used as per the nist.gov link below. also, see this link:
             //
             // http://en.wikipedia.org/wiki/Cryptographically_secure_pseudorandom_number_generator#Designs_based_on_cryptographic_primitives
             switch (true) {
-                case class_exists('\phpseclib\Crypt\AES'):
-                    $crypto = new AES(Base::MODE_CTR);
+                case class_exists('\phpseclib3\Crypt\AES'):
+                    $crypto = new AES('ctr');
                     break;
-                case class_exists('\phpseclib\Crypt\Twofish'):
-                    $crypto = new Twofish(Base::MODE_CTR);
+                case class_exists('\phpseclib3\Crypt\Twofish'):
+                    $crypto = new Twofish('ctr');
                     break;
-                case class_exists('\phpseclib\Crypt\Blowfish'):
-                    $crypto = new Blowfish(Base::MODE_CTR);
+                case class_exists('\phpseclib3\Crypt\Blowfish'):
+                    $crypto = new Blowfish('ctr');
                     break;
-                case class_exists('\phpseclib\Crypt\TripleDES'):
-                    $crypto = new TripleDES(Base::MODE_CTR);
+                case class_exists('\phpseclib3\Crypt\TripleDES'):
+                    $crypto = new TripleDES('ctr');
                     break;
-                case class_exists('\phpseclib\Crypt\DES'):
-                    $crypto = new DES(Base::MODE_CTR);
+                case class_exists('\phpseclib3\Crypt\DES'):
+                    $crypto = new DES('ctr');
                     break;
-                case class_exists('\phpseclib\Crypt\RC4'):
+                case class_exists('\phpseclib3\Crypt\RC4'):
                     $crypto = new RC4();
                     break;
                 default:
-                    throw new \RuntimeException(__CLASS__ . ' requires at least one symmetric cipher be loaded');
+                    throw new RuntimeException(__CLASS__ . ' requires at least one symmetric cipher be loaded');
             }
 
-            $crypto->setKey($key);
-            $crypto->setIV($iv);
+            $crypto->setKey(substr($key, 0, $crypto->getKeyLength() >> 3));
+            $crypto->setIV(substr($iv, 0, $crypto->getBlockLength() >> 3));
             $crypto->enableContinuousBuffer();
         }
 
@@ -236,8 +185,38 @@ static function string($length)
             $i = $crypto->encrypt(microtime()); // strlen(microtime()) == 21
             $r = $crypto->encrypt($i ^ $v); // strlen($v) == 20
             $v = $crypto->encrypt($r ^ $i); // strlen($r) == 20
-            $result.= $r;
+            $result .= $r;
         }
+
         return substr($result, 0, $length);
     }
+
+    /**
+     * Safely serialize variables
+     *
+     * If a class has a private __sleep() it'll emit a warning
+     */
+    private static function safe_serialize(&$arr): string
+    {
+        if (is_object($arr)) {
+            return '';
+        }
+        if (!is_array($arr)) {
+            return serialize($arr);
+        }
+        // prevent circular array recursion
+        if (isset($arr['__phpseclib_marker'])) {
+            return '';
+        }
+        $safearr = [];
+        $arr['__phpseclib_marker'] = true;
+        foreach (array_keys($arr) as $key) {
+            // do not recurse on the '__phpseclib_marker' key itself, for smaller memory usage
+            if ($key !== '__phpseclib_marker') {
+                $safearr[$key] = self::safe_serialize($arr[$key]);
+            }
+        }
+        unset($arr['__phpseclib_marker']);
+        return serialize($safearr);
+    }
 }
diff --git a/phpseclib/Crypt/Rijndael.php b/phpseclib/Crypt/Rijndael.php
index e97239321..ef49dce81 100644
--- a/phpseclib/Crypt/Rijndael.php
+++ b/phpseclib/Crypt/Rijndael.php
@@ -3,7 +3,7 @@
 /**
  * Pure-PHP implementation of Rijndael.
  *
- * Uses mcrypt, if available/possible, and an internal implementation, otherwise.
+ * Uses OpenSSL, if available/possible, and an internal implementation, otherwise
  *
  * PHP version 5
  *
@@ -13,8 +13,8 @@
  * 136-bits it'll be null-padded to 192-bits and 192 bits will be the key length until
  * {@link self::setKey() setKey()} is called, again, at which point, it'll be recalculated.
  *
- * Not all Rijndael implementations may support 160-bits or 224-bits as the block length / key length.  mcrypt, for example,
- * does not.  AES, itself, only supports block lengths of 128 and key lengths of 128, 192, and 256.
+ * Not all Rijndael implementations may support 160-bits or 224-bits as the block length / key length. AES, itself, only
+ * supports block lengths of 128 and key lengths of 128, 192, and 256.
  * {@link http://csrc.nist.gov/archive/aes/rijndael/Rijndael-ammended.pdf#page=10 Rijndael-ammended.pdf#page=10} defines the
  * algorithm for block lengths of 192 and 256 but not for block lengths / key lengths of 160 and 224.  Indeed, 160 and 224
  * are first defined as valid key / block lengths in
@@ -30,7 +30,7 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $rijndael = new \phpseclib\Crypt\Rijndael();
+ *    $rijndael = new \phpseclib3\Crypt\Rijndael('ctr');
  *
  *    $rijndael->setKey('abcdefghijklmnop');
  *
@@ -44,240 +44,245 @@
  * ?>
  * </code>
  *
- * @category  Crypt
- * @package   Rijndael
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2008 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\Crypt;
+declare(strict_types=1);
 
-use phpseclib\Crypt\Base;
+namespace phpseclib3\Crypt;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Common\BlockCipher;
+use phpseclib3\Exception\BadDecryptionException;
+use phpseclib3\Exception\BadModeException;
+use phpseclib3\Exception\InconsistentSetupException;
+use phpseclib3\Exception\InsufficientSetupException;
+use phpseclib3\Exception\InvalidArgumentException;
+use phpseclib3\Exception\LengthException;
 
 /**
  * Pure-PHP implementation of Rijndael.
  *
- * @package Rijndael
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
-class Rijndael extends Base
+class Rijndael extends BlockCipher
 {
-    /**
-     * The mcrypt specific name of the cipher
-     *
-     * Mcrypt is useable for 128/192/256-bit $block_size/$key_length. For 160/224 not.
-     * \phpseclib\Crypt\Rijndael determines automatically whether mcrypt is useable
-     * or not for the current $block_size/$key_length.
-     * In case of, $cipher_name_mcrypt will be set dynamically at run time accordingly.
-     *
-     * @see \phpseclib\Crypt\Base::cipher_name_mcrypt
-     * @see \phpseclib\Crypt\Base::engine
-     * @see self::isValidEngine()
-     * @var string
-     * @access private
-     */
-    var $cipher_name_mcrypt = 'rijndael-128';
-
-    /**
-     * The default salt used by setPassword()
-     *
-     * @see \phpseclib\Crypt\Base::password_default_salt
-     * @see \phpseclib\Crypt\Base::setPassword()
-     * @var string
-     * @access private
-     */
-    var $password_default_salt = 'phpseclib';
-
     /**
      * The Key Schedule
      *
-     * @see self::_setup()
+     * @see self::setup()
      * @var array
-     * @access private
      */
-    var $w;
+    private $w;
 
     /**
      * The Inverse Key Schedule
      *
-     * @see self::_setup()
+     * @see self::setup()
      * @var array
-     * @access private
      */
-    var $dw;
+    private $dw;
 
     /**
      * The Block Length divided by 32
      *
-     * @see self::setBlockLength()
-     * @var int
-     * @access private
-     * @internal The max value is 256 / 32 = 8, the min value is 128 / 32 = 4.  Exists in conjunction with $block_size
+     * {@internal The max value is 256 / 32 = 8, the min value is 128 / 32 = 4.  Exists in conjunction with $block_size
      *    because the encryption / decryption / key schedule creation requires this number and not $block_size.  We could
      *    derive this from $block_size or vice versa, but that'd mean we'd have to do multiple shift operations, so in lieu
-     *    of that, we'll just precompute it once.
+     *    of that, we'll just precompute it once.}
+     *
+     * @see self::setBlockLength()
+     * @var int
      */
-    var $Nb = 4;
+    private $Nb = 4;
 
     /**
      * The Key Length (in bytes)
      *
-     * @see self::setKeyLength()
-     * @var int
-     * @access private
-     * @internal The max value is 256 / 8 = 32, the min value is 128 / 8 = 16.  Exists in conjunction with $Nk
+     * {@internal The max value is 256 / 8 = 32, the min value is 128 / 8 = 16.  Exists in conjunction with $Nk
      *    because the encryption / decryption / key schedule creation requires this number and not $key_length.  We could
      *    derive this from $key_length or vice versa, but that'd mean we'd have to do multiple shift operations, so in lieu
-     *    of that, we'll just precompute it once.
+     *    of that, we'll just precompute it once.}
+     *
+     * @see self::setKeyLength()
+     * @var int
      */
-    var $key_length = 16;
+    protected $key_length = 16;
 
     /**
      * The Key Length divided by 32
      *
      * @see self::setKeyLength()
      * @var int
-     * @access private
      * @internal The max value is 256 / 32 = 8, the min value is 128 / 32 = 4
      */
-    var $Nk = 4;
+    private $Nk = 4;
 
     /**
      * The Number of Rounds
      *
+     * {@internal The max value is 14, the min value is 10.}
+     *
      * @var int
-     * @access private
-     * @internal The max value is 14, the min value is 10.
      */
-    var $Nr;
+    private $Nr;
 
     /**
      * Shift offsets
      *
      * @var array
-     * @access private
      */
-    var $c;
+    private $c;
 
     /**
      * Holds the last used key- and block_size information
      *
      * @var array
-     * @access private
      */
-    var $kl;
+    private $kl;
+
+    /**
+     * Default Constructor.
+     *
+     * @throws InvalidArgumentException if an invalid / unsupported mode is provided
+     */
+    public function __construct(string $mode)
+    {
+        parent::__construct($mode);
+
+        if ($this->mode == self::MODE_STREAM) {
+            throw new BadModeException('Block ciphers cannot be ran in stream mode');
+        }
+    }
 
     /**
      * Sets the key length.
      *
-     * Valid key lengths are 128, 160, 192, 224, and 256.  If the length is less than 128, it will be rounded up to
-     * 128.  If the length is greater than 128 and invalid, it will be rounded down to the closest valid amount.
+     * Valid key lengths are 128, 160, 192, 224, and 256.
      *
      * Note: phpseclib extends Rijndael (and AES) for using 160- and 224-bit keys but they are officially not defined
      *       and the most (if not all) implementations are not able using 160/224-bit keys but round/pad them up to
-     *       192/256 bits as, for example, mcrypt will do.
+     *       192/256 bits as.
      *
      *       That said, if you want be compatible with other Rijndael and AES implementations,
      *       you should not setKeyLength(160) or setKeyLength(224).
      *
-     * Additional: In case of 160- and 224-bit keys, phpseclib will/can, for that reason, not use
-     *             the mcrypt php extension, even if available.
-     *             This results then in slower encryption.
-     *
-     * @access public
-     * @param int $length
+     * @throws LengthException if the key length is invalid
      */
-    function setKeyLength($length)
+    public function setKeyLength(int $length): void
     {
-        switch (true) {
-            case $length <= 128:
-                $this->key_length = 16;
-                break;
-            case $length <= 160:
-                $this->key_length = 20;
-                break;
-            case $length <= 192:
-                $this->key_length = 24;
-                break;
-            case $length <= 224:
-                $this->key_length = 28;
+        switch ($length) {
+            case 128:
+            case 160:
+            case 192:
+            case 224:
+            case 256:
+                $this->key_length = $length >> 3;
                 break;
             default:
-                $this->key_length = 32;
+                throw new LengthException('Key size of ' . $length . ' bits is not supported by this algorithm. Only keys of sizes 128, 160, 192, 224 or 256 bits are supported');
         }
 
         parent::setKeyLength($length);
     }
 
     /**
-     * Sets the block length
+     * Sets the key.
      *
-     * Valid block lengths are 128, 160, 192, 224, and 256.  If the length is less than 128, it will be rounded up to
-     * 128.  If the length is greater than 128 and invalid, it will be rounded down to the closest valid amount.
+     * Rijndael supports five different key lengths
      *
-     * @access public
-     * @param int $length
+     * @throws LengthException if the key length isn't supported
+     * @see setKeyLength()
      */
-    function setBlockLength($length)
+    public function setKey(string $key): void
     {
-        $length >>= 5;
-        if ($length > 8) {
-            $length = 8;
-        } elseif ($length < 4) {
-            $length = 4;
-        }
-        $this->Nb = $length;
-        $this->block_size = $length << 2;
-        $this->changed = true;
-        $this->_setEngine();
+        switch (strlen($key)) {
+            case 16:
+            case 20:
+            case 24:
+            case 28:
+            case 32:
+                break;
+            default:
+                throw new LengthException('Key of size ' . strlen($key) . ' not supported by this algorithm. Only keys of sizes 16, 20, 24, 28 or 32 are supported');
+        }
+
+        parent::setKey($key);
+    }
+
+    /**
+     * Sets the block length
+     *
+     * Valid block lengths are 128, 160, 192, 224, and 256.
+     */
+    public function setBlockLength(int $length): void
+    {
+        switch ($length) {
+            case 128:
+            case 160:
+            case 192:
+            case 224:
+            case 256:
+                break;
+            default:
+                throw new LengthException('Key size of ' . $length . ' bits is not supported by this algorithm. Only keys of sizes 128, 160, 192, 224 or 256 bits are supported');
+        }
+
+        $this->Nb = $length >> 5;
+        $this->block_size = $length >> 3;
+        $this->changed = $this->nonIVChanged = true;
+        $this->setEngine();
     }
 
     /**
      * Test for engine validity
      *
-     * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
+     * This is mainly just a wrapper to set things up for \phpseclib3\Crypt\Common\SymmetricKey::isValidEngine()
      *
-     * @see \phpseclib\Crypt\Base::__construct()
-     * @param int $engine
-     * @access public
-     * @return bool
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
      */
-    function isValidEngine($engine)
+    protected function isValidEngineHelper(int $engine): bool
     {
         switch ($engine) {
+            case self::ENGINE_LIBSODIUM:
+                return function_exists('sodium_crypto_aead_aes256gcm_is_available') &&
+                       sodium_crypto_aead_aes256gcm_is_available() &&
+                       $this->mode == self::MODE_GCM &&
+                       $this->key_length == 32 &&
+                       $this->nonce && strlen($this->nonce) == 12 &&
+                       $this->block_size == 16;
+            case self::ENGINE_OPENSSL_GCM:
+                if (!extension_loaded('openssl')) {
+                    return false;
+                }
+                $methods = openssl_get_cipher_methods();
+                return $this->mode == self::MODE_GCM &&
+                       version_compare(PHP_VERSION, '7.1.0', '>=') &&
+                       in_array('aes-' . $this->getKeyLength() . '-gcm', $methods) &&
+                       $this->block_size == 16;
             case self::ENGINE_OPENSSL:
                 if ($this->block_size != 16) {
                     return false;
                 }
                 $this->cipher_name_openssl_ecb = 'aes-' . ($this->key_length << 3) . '-ecb';
-                $this->cipher_name_openssl = 'aes-' . ($this->key_length << 3) . '-' . $this->_openssl_translate_mode();
+                $this->cipher_name_openssl = 'aes-' . ($this->key_length << 3) . '-' . $this->openssl_translate_mode();
                 break;
-            case self::ENGINE_MCRYPT:
-                $this->cipher_name_mcrypt = 'rijndael-' . ($this->block_size << 3);
-                if ($this->key_length % 8) { // is it a 160/224-bit key?
-                    // mcrypt is not usable for them, only for 128/192/256-bit keys
-                    return false;
-                }
         }
 
-        return parent::isValidEngine($engine);
+        return parent::isValidEngineHelper($engine);
     }
 
     /**
      * Encrypts a block
-     *
-     * @access private
-     * @param string $in
-     * @return string
      */
-    function _encryptBlock($in)
+    protected function encryptBlock(string $in): string
     {
         static $tables;
         if (empty($tables)) {
-            $tables = &$this->_getTables();
+            $tables = &$this->getTables();
         }
         $t0   = $tables[0];
         $t1   = $tables[1];
@@ -285,7 +290,7 @@ function _encryptBlock($in)
         $t3   = $tables[3];
         $sbox = $tables[4];
 
-        $state = array();
+        $state = [];
         $words = unpack('N*', $in);
 
         $c = $this->c;
@@ -307,7 +312,7 @@ function _encryptBlock($in)
         // equation (7.4.7) is supposed to use addition instead of subtraction, so we'll do that here, as well.
 
         // [1] http://fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.v316.pdf
-        $temp = array();
+        $temp = [];
         for ($round = 1; $round < $Nr; ++$round) {
             $i = 0; // $c[0] == 0
             $j = $c[1];
@@ -342,7 +347,7 @@ function _encryptBlock($in)
         $k = $c[2];
         $l = $c[3];
         while ($i < $Nb) {
-            $temp[$i] = ($state[$i] & 0xFF000000) ^
+            $temp[$i] = ($state[$i] & intval(0xFF000000)) ^
                         ($state[$j] & 0x00FF0000) ^
                         ($state[$k] & 0x0000FF00) ^
                         ($state[$l] & 0x000000FF) ^
@@ -353,32 +358,17 @@ function _encryptBlock($in)
             $l = ($l + 1) % $Nb;
         }
 
-        switch ($Nb) {
-            case 8:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6], $temp[7]);
-            case 7:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6]);
-            case 6:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5]);
-            case 5:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4]);
-            default:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3]);
-        }
+        return pack('N*', ...$temp);
     }
 
     /**
      * Decrypts a block
-     *
-     * @access private
-     * @param string $in
-     * @return string
      */
-    function _decryptBlock($in)
+    protected function decryptBlock(string $in): string
     {
         static $invtables;
         if (empty($invtables)) {
-            $invtables = &$this->_getInvTables();
+            $invtables = &$this->getInvTables();
         }
         $dt0   = $invtables[0];
         $dt1   = $invtables[1];
@@ -386,7 +376,7 @@ function _decryptBlock($in)
         $dt3   = $invtables[3];
         $isbox = $invtables[4];
 
-        $state = array();
+        $state = [];
         $words = unpack('N*', $in);
 
         $c  = $this->c;
@@ -400,7 +390,7 @@ function _decryptBlock($in)
             $state[] = $word ^ $dw[++$wc];
         }
 
-        $temp = array();
+        $temp = [];
         for ($round = $Nr - 1; $round > 0; --$round) {
             $i = 0; // $c[0] == 0
             $j = $Nb - $c[1];
@@ -428,7 +418,7 @@ function _decryptBlock($in)
         $l = $Nb - $c[3];
 
         while ($i < $Nb) {
-            $word = ($state[$i] & 0xFF000000) |
+            $word = ($state[$i] & intval(0xFF000000)) |
                     ($state[$j] & 0x00FF0000) |
                     ($state[$k] & 0x0000FF00) |
                     ($state[$l] & 0x000000FF);
@@ -443,44 +433,75 @@ function _decryptBlock($in)
             $l = ($l + 1) % $Nb;
         }
 
-        switch ($Nb) {
-            case 8:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6], $temp[7]);
-            case 7:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6]);
-            case 6:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5]);
-            case 5:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4]);
-            default:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3]);
+        return pack('N*', ...$temp);
+    }
+
+    /**
+     * Setup the self::ENGINE_INTERNAL $engine
+     *
+     * (re)init, if necessary, the internal cipher $engine and flush all $buffers
+     * Used (only) if $engine == self::ENGINE_INTERNAL
+     *
+     * _setup() will be called each time if $changed === true
+     * typically this happens when using one or more of following public methods:
+     *
+     * - setKey()
+     *
+     * - setIV()
+     *
+     * - disableContinuousBuffer()
+     *
+     * - First run of encrypt() / decrypt() with no init-settings
+     *
+     * {@internal setup() is always called before en/decryption.}
+     *
+     * {@internal Could, but not must, extend by the child Crypt_* class}
+     *
+     * @see self::setKey()
+     * @see self::setIV()
+     * @see self::disableContinuousBuffer()
+     */
+    protected function setup(): void
+    {
+        if (!$this->changed) {
+            return;
+        }
+
+        parent::setup();
+
+        if (is_string($this->iv) && strlen($this->iv) != $this->block_size) {
+            throw new InconsistentSetupException('The IV length (' . strlen($this->iv) . ') does not match the block size (' . $this->block_size . ')');
         }
     }
 
     /**
      * Setup the key (expansion)
      *
-     * @see \phpseclib\Crypt\Base::_setupKey()
-     * @access private
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::setupKey()
      */
-    function _setupKey()
+    protected function setupKey(): void
     {
         // Each number in $rcon is equal to the previous number multiplied by two in Rijndael's finite field.
         // See http://en.wikipedia.org/wiki/Finite_field_arithmetic#Multiplicative_inverse
-        static $rcon = array(0,
-            0x01000000, 0x02000000, 0x04000000, 0x08000000, 0x10000000,
-            0x20000000, 0x40000000, 0x80000000, 0x1B000000, 0x36000000,
-            0x6C000000, 0xD8000000, 0xAB000000, 0x4D000000, 0x9A000000,
-            0x2F000000, 0x5E000000, 0xBC000000, 0x63000000, 0xC6000000,
-            0x97000000, 0x35000000, 0x6A000000, 0xD4000000, 0xB3000000,
-            0x7D000000, 0xFA000000, 0xEF000000, 0xC5000000, 0x91000000
-        );
+        static $rcon;
+
+        if (!isset($rcon)) {
+            $rcon = [0,
+                0x01000000, 0x02000000, 0x04000000, 0x08000000, 0x10000000,
+                0x20000000, 0x40000000, 0x80000000, 0x1B000000, 0x36000000,
+                0x6C000000, 0xD8000000, 0xAB000000, 0x4D000000, 0x9A000000,
+                0x2F000000, 0x5E000000, 0xBC000000, 0x63000000, 0xC6000000,
+                0x97000000, 0x35000000, 0x6A000000, 0xD4000000, 0xB3000000,
+                0x7D000000, 0xFA000000, 0xEF000000, 0xC5000000, 0x91000000,
+            ];
+            $rcon = array_map('intval', $rcon);
+        }
 
         if (isset($this->kl['key']) && $this->key === $this->kl['key'] && $this->key_length === $this->kl['key_length'] && $this->block_size === $this->kl['block_size']) {
             // already expanded
             return;
         }
-        $this->kl = array('key' => $this->key, 'key_length' => $this->key_length, 'block_size' => $this->block_size);
+        $this->kl = ['key' => $this->key, 'key_length' => $this->key_length, 'block_size' => $this->block_size];
 
         $this->Nk = $this->key_length >> 2;
         // see Rijndael-ammended.pdf#page=44
@@ -494,13 +515,13 @@ function _setupKey()
             case 4:
             case 5:
             case 6:
-                $this->c = array(0, 1, 2, 3);
+                $this->c = [0, 1, 2, 3];
                 break;
             case 7:
-                $this->c = array(0, 1, 2, 4);
+                $this->c = [0, 1, 2, 4];
                 break;
             case 8:
-                $this->c = array(0, 1, 3, 4);
+                $this->c = [0, 1, 3, 4];
         }
 
         $w = array_values(unpack('N*words', $this->key));
@@ -513,10 +534,10 @@ function _setupKey()
                 // on a 32-bit machine, it's 32-bits, and on a 64-bit machine, it's 64-bits. on a 32-bit machine,
                 // 0xFFFFFFFF << 8 == 0xFFFFFF00, but on a 64-bit machine, it equals 0xFFFFFFFF00. as such, doing 'and'
                 // with 0xFFFFFFFF (or 0xFFFFFF00) on a 32-bit machine is unnecessary, but on a 64-bit machine, it is.
-                $temp = (($temp << 8) & 0xFFFFFF00) | (($temp >> 24) & 0x000000FF); // rotWord
-                $temp = $this->_subWord($temp) ^ $rcon[$i / $this->Nk];
+                $temp = (($temp << 8) & intval(0xFFFFFF00)) | (($temp >> 24) & 0x000000FF); // rotWord
+                $temp = $this->subWord($temp) ^ $rcon[$i / $this->Nk];
             } elseif ($this->Nk > 6 && $i % $this->Nk == 4) {
-                $temp = $this->_subWord($temp);
+                $temp = $this->subWord($temp);
             }
             $w[$i] = $w[$i - $this->Nk] ^ $temp;
         }
@@ -528,8 +549,8 @@ function _setupKey()
         //        1. Apply the Key Expansion.
         //        2. Apply InvMixColumn to all Round Keys except the first and the last one."
         // also, see fips-197.pdf#page=27, "5.3.5 Equivalent Inverse Cipher"
-        list($dt0, $dt1, $dt2, $dt3) = $this->_getInvTables();
-        $temp = $this->w = $this->dw = array();
+        [$dt0, $dt1, $dt2, $dt3] = $this->getInvTables();
+        $temp = $this->w = $this->dw = [];
         for ($i = $row = $col = 0; $i < $length; $i++, $col++) {
             if ($col == $this->Nb) {
                 if ($row == 0) {
@@ -538,7 +559,7 @@ function _setupKey()
                     // subWord + invMixColumn + invSubWord = invMixColumn
                     $j = 0;
                     while ($j < $this->Nb) {
-                        $dw = $this->_subWord($this->w[$row][$j]);
+                        $dw = $this->subWord($this->w[$row][$j]);
                         $temp[$j] = $dt0[$dw >> 24 & 0x000000FF] ^
                                     $dt1[$dw >> 16 & 0x000000FF] ^
                                     $dt2[$dw >>  8 & 0x000000FF] ^
@@ -573,14 +594,13 @@ function _setupKey()
     /**
      * Performs S-Box substitutions
      *
-     * @access private
-     * @param int $word
+     * @return array
      */
-    function _subWord($word)
+    private function subWord(int $word)
     {
         static $sbox;
         if (empty($sbox)) {
-            list(, , , , $sbox) = $this->_getTables();
+            [, , , , $sbox] = self::getTables();
         }
 
         return  $sbox[$word       & 0x000000FF]        |
@@ -592,20 +612,19 @@ function _subWord($word)
     /**
      * Provides the mixColumns and sboxes tables
      *
-     * @see self::_encryptBlock()
-     * @see self::_setupInlineCrypt()
-     * @see self::_subWord()
-     * @access private
+     * @see self::encryptBlock()
+     * @see self::setupInlineCrypt()
+     * @see self::subWord()
      * @return array &$tables
      */
-    function &_getTables()
+    protected function &getTables(): array
     {
         static $tables;
         if (empty($tables)) {
             // according to <http://csrc.nist.gov/archive/aes/rijndael/Rijndael-ammended.pdf#page=19> (section 5.2.1),
             // precomputed tables can be used in the mixColumns phase. in that example, they're assigned t0...t3, so
             // those are the names we'll use.
-            $t3 = array_map('intval', array(
+            $t3 = array_map('intval', [
                 // with array_map('intval', ...) we ensure we have only int's and not
                 // some slower floats converted by php automatically on high values
                 0x6363A5C6, 0x7C7C84F8, 0x777799EE, 0x7B7B8DF6, 0xF2F20DFF, 0x6B6BBDD6, 0x6F6FB1DE, 0xC5C55491,
@@ -639,23 +658,23 @@ function &_getTables()
                 0xE1E138D9, 0xF8F813EB, 0x9898B32B, 0x11113322, 0x6969BBD2, 0xD9D970A9, 0x8E8E8907, 0x9494A733,
                 0x9B9BB62D, 0x1E1E223C, 0x87879215, 0xE9E920C9, 0xCECE4987, 0x5555FFAA, 0x28287850, 0xDFDF7AA5,
                 0x8C8C8F03, 0xA1A1F859, 0x89898009, 0x0D0D171A, 0xBFBFDA65, 0xE6E631D7, 0x4242C684, 0x6868B8D0,
-                0x4141C382, 0x9999B029, 0x2D2D775A, 0x0F0F111E, 0xB0B0CB7B, 0x5454FCA8, 0xBBBBD66D, 0x16163A2C
-            ));
+                0x4141C382, 0x9999B029, 0x2D2D775A, 0x0F0F111E, 0xB0B0CB7B, 0x5454FCA8, 0xBBBBD66D, 0x16163A2C,
+            ]);
 
             foreach ($t3 as $t3i) {
-                $t0[] = (($t3i << 24) & 0xFF000000) | (($t3i >>  8) & 0x00FFFFFF);
-                $t1[] = (($t3i << 16) & 0xFFFF0000) | (($t3i >> 16) & 0x0000FFFF);
-                $t2[] = (($t3i <<  8) & 0xFFFFFF00) | (($t3i >> 24) & 0x000000FF);
+                $t0[] = (($t3i << 24) & intval(0xFF000000)) | (($t3i >>  8) & 0x00FFFFFF);
+                $t1[] = (($t3i << 16) & intval(0xFFFF0000)) | (($t3i >> 16) & 0x0000FFFF);
+                $t2[] = (($t3i <<  8) & intval(0xFFFFFF00)) | (($t3i >> 24) & 0x000000FF);
             }
 
-            $tables = array(
+            $tables = [
                 // The Precomputed mixColumns tables t0 - t3
                 $t0,
                 $t1,
                 $t2,
                 $t3,
                 // The SubByte S-Box
-                array(
+                [
                     0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5, 0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76,
                     0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0, 0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0,
                     0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC, 0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15,
@@ -671,9 +690,9 @@ function &_getTables()
                     0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6, 0xE8, 0xDD, 0x74, 0x1F, 0x4B, 0xBD, 0x8B, 0x8A,
                     0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E, 0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E,
                     0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94, 0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF,
-                    0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68, 0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16
-                )
-            );
+                    0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68, 0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16,
+                ],
+            ];
         }
         return $tables;
     }
@@ -681,17 +700,16 @@ function &_getTables()
     /**
      * Provides the inverse mixColumns and inverse sboxes tables
      *
-     * @see self::_decryptBlock()
-     * @see self::_setupInlineCrypt()
-     * @see self::_setupKey()
-     * @access private
+     * @see self::decryptBlock()
+     * @see self::setupInlineCrypt()
+     * @see self::setupKey()
      * @return array &$tables
      */
-    function &_getInvTables()
+    protected function &getInvTables(): array
     {
         static $tables;
         if (empty($tables)) {
-            $dt3 = array_map('intval', array(
+            $dt3 = array_map('intval', [
                 0xF4A75051, 0x4165537E, 0x17A4C31A, 0x275E963A, 0xAB6BCB3B, 0x9D45F11F, 0xFA58ABAC, 0xE303934B,
                 0x30FA5520, 0x766DF6AD, 0xCC769188, 0x024C25F5, 0xE5D7FC4F, 0x2ACBD7C5, 0x35448026, 0x62A38FB5,
                 0xB15A49DE, 0xBA1B6725, 0xEA0E9845, 0xFEC0E15D, 0x2F7502C3, 0x4CF01281, 0x4697A38D, 0xD3F9C66B,
@@ -723,23 +741,23 @@ function &_getInvTables()
                 0xD7618C9A, 0xA10C7A37, 0xF8148E59, 0x133C89EB, 0xA927EECE, 0x61C935B7, 0x1CE5EDE1, 0x47B13C7A,
                 0xD2DF599C, 0xF2733F55, 0x14CE7918, 0xC737BF73, 0xF7CDEA53, 0xFDAA5B5F, 0x3D6F14DF, 0x44DB8678,
                 0xAFF381CA, 0x68C43EB9, 0x24342C38, 0xA3405FC2, 0x1DC37216, 0xE2250CBC, 0x3C498B28, 0x0D9541FF,
-                0xA8017139, 0x0CB3DE08, 0xB4E49CD8, 0x56C19064, 0xCB84617B, 0x32B670D5, 0x6C5C7448, 0xB85742D0
-            ));
+                0xA8017139, 0x0CB3DE08, 0xB4E49CD8, 0x56C19064, 0xCB84617B, 0x32B670D5, 0x6C5C7448, 0xB85742D0,
+            ]);
 
             foreach ($dt3 as $dt3i) {
-                $dt0[] = (($dt3i << 24) & 0xFF000000) | (($dt3i >>  8) & 0x00FFFFFF);
-                $dt1[] = (($dt3i << 16) & 0xFFFF0000) | (($dt3i >> 16) & 0x0000FFFF);
-                $dt2[] = (($dt3i <<  8) & 0xFFFFFF00) | (($dt3i >> 24) & 0x000000FF);
+                $dt0[] = (($dt3i << 24) & intval(0xFF000000)) | (($dt3i >>  8) & 0x00FFFFFF);
+                $dt1[] = (($dt3i << 16) & intval(0xFFFF0000)) | (($dt3i >> 16) & 0x0000FFFF);
+                $dt2[] = (($dt3i <<  8) & intval(0xFFFFFF00)) | (($dt3i >> 24) & 0x000000FF);
             };
 
-            $tables = array(
+            $tables = [
                 // The Precomputed inverse mixColumns tables dt0 - dt3
                 $dt0,
                 $dt1,
                 $dt2,
                 $dt3,
                 // The inverse SubByte S-Box
-                array(
+                [
                     0x52, 0x09, 0x6A, 0xD5, 0x30, 0x36, 0xA5, 0x38, 0xBF, 0x40, 0xA3, 0x9E, 0x81, 0xF3, 0xD7, 0xFB,
                     0x7C, 0xE3, 0x39, 0x82, 0x9B, 0x2F, 0xFF, 0x87, 0x34, 0x8E, 0x43, 0x44, 0xC4, 0xDE, 0xE9, 0xCB,
                     0x54, 0x7B, 0x94, 0x32, 0xA6, 0xC2, 0x23, 0x3D, 0xEE, 0x4C, 0x95, 0x0B, 0x42, 0xFA, 0xC3, 0x4E,
@@ -755,9 +773,9 @@ function &_getInvTables()
                     0x1F, 0xDD, 0xA8, 0x33, 0x88, 0x07, 0xC7, 0x31, 0xB1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xEC, 0x5F,
                     0x60, 0x51, 0x7F, 0xA9, 0x19, 0xB5, 0x4A, 0x0D, 0x2D, 0xE5, 0x7A, 0x9F, 0x93, 0xC9, 0x9C, 0xEF,
                     0xA0, 0xE0, 0x3B, 0x4D, 0xAE, 0x2A, 0xF5, 0xB0, 0xC8, 0xEB, 0xBB, 0x3C, 0x83, 0x53, 0x99, 0x61,
-                    0x17, 0x2B, 0x04, 0x7E, 0xBA, 0x77, 0xD6, 0x26, 0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D
-                )
-            );
+                    0x17, 0x2B, 0x04, 0x7E, 0xBA, 0x77, 0xD6, 0x26, 0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D,
+                ],
+            ];
         }
         return $tables;
     }
@@ -765,174 +783,215 @@ function &_getInvTables()
     /**
      * Setup the performance-optimized function for de/encrypt()
      *
-     * @see \phpseclib\Crypt\Base::_setupInlineCrypt()
-     * @access private
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::setupInlineCrypt()
      */
-    function _setupInlineCrypt()
+    protected function setupInlineCrypt(): void
     {
-        // Note: _setupInlineCrypt() will be called only if $this->changed === true
-        // So here we are'nt under the same heavy timing-stress as we are in _de/encryptBlock() or de/encrypt().
-        // However...the here generated function- $code, stored as php callback in $this->inline_crypt, must work as fast as even possible.
-
-        $lambda_functions =& self::_getLambdaFunctions();
-
-        // We create max. 10 hi-optimized code for memory reason. Means: For each $key one ultra fast inline-crypt function.
-        // (Currently, for Crypt_Rijndael/AES, one generated $lambda_function cost on php5.5@32bit ~80kb unfreeable mem and ~130kb on php5.5@64bit)
-        // After that, we'll still create very fast optimized code but not the hi-ultimative code, for each $mode one.
-        $gen_hi_opt_code = (bool)(count($lambda_functions) < 10);
-
-        // Generation of a uniqe hash for our generated code
-        $code_hash = "Crypt_Rijndael, {$this->mode}, {$this->Nr}, {$this->Nb}";
-        if ($gen_hi_opt_code) {
-            $code_hash = str_pad($code_hash, 32) . $this->_hashInlineCryptFunction($this->key);
-        }
-
-        if (!isset($lambda_functions[$code_hash])) {
-            switch (true) {
-                case $gen_hi_opt_code:
-                    // The hi-optimized $lambda_functions will use the key-words hardcoded for better performance.
-                    $w  = $this->w;
-                    $dw = $this->dw;
-                    $init_encrypt = '';
-                    $init_decrypt = '';
-                    break;
-                default:
-                    for ($i = 0, $cw = count($this->w); $i < $cw; ++$i) {
-                        $w[]  = '$w['  . $i . ']';
-                        $dw[] = '$dw[' . $i . ']';
-                    }
-                    $init_encrypt = '$w  = $self->w;';
-                    $init_decrypt = '$dw = $self->dw;';
-            }
+        $w  = $this->w;
+        $dw = $this->dw;
+        $init_encrypt = '';
+        $init_decrypt = '';
 
-            $Nr = $this->Nr;
-            $Nb = $this->Nb;
-            $c  = $this->c;
+        $Nr = $this->Nr;
+        $Nb = $this->Nb;
+        $c  = $this->c;
 
-            // Generating encrypt code:
-            $init_encrypt.= '
-                static $tables;
-                if (empty($tables)) {
-                    $tables = &$self->_getTables();
-                }
-                $t0   = $tables[0];
-                $t1   = $tables[1];
-                $t2   = $tables[2];
-                $t3   = $tables[3];
-                $sbox = $tables[4];
-            ';
-
-            $s  = 'e';
-            $e  = 's';
-            $wc = $Nb - 1;
-
-            // Preround: addRoundKey
-            $encrypt_block = '$in = unpack("N*", $in);'."\n";
-            for ($i = 0; $i < $Nb; ++$i) {
-                $encrypt_block .= '$s'.$i.' = $in['.($i + 1).'] ^ '.$w[++$wc].";\n";
+        // Generating encrypt code:
+        $init_encrypt .= '
+            if (empty($tables)) {
+                $tables = &$this->getTables();
             }
+            $t0   = $tables[0];
+            $t1   = $tables[1];
+            $t2   = $tables[2];
+            $t3   = $tables[3];
+            $sbox = $tables[4];
+        ';
+
+        $s  = 'e';
+        $e  = 's';
+        $wc = $Nb - 1;
 
-            // Mainrounds: shiftRows + subWord + mixColumns + addRoundKey
-            for ($round = 1; $round < $Nr; ++$round) {
-                list($s, $e) = array($e, $s);
-                for ($i = 0; $i < $Nb; ++$i) {
-                    $encrypt_block.=
-                        '$'.$e.$i.' =
-                        $t0[($'.$s.$i                  .' >> 24) & 0xff] ^
-                        $t1[($'.$s.(($i + $c[1]) % $Nb).' >> 16) & 0xff] ^
-                        $t2[($'.$s.(($i + $c[2]) % $Nb).' >>  8) & 0xff] ^
-                        $t3[ $'.$s.(($i + $c[3]) % $Nb).'        & 0xff] ^
-                        '.$w[++$wc].";\n";
-                }
-            }
+        // Preround: addRoundKey
+        $encrypt_block = '$in = unpack("N*", $in);' . "\n";
+        for ($i = 0; $i < $Nb; ++$i) {
+            $encrypt_block .= '$s' . $i . ' = $in[' . ($i + 1) . '] ^ ' . $w[++$wc] . ";\n";
+        }
 
-            // Finalround: subWord + shiftRows + addRoundKey
+        // Mainrounds: shiftRows + subWord + mixColumns + addRoundKey
+        for ($round = 1; $round < $Nr; ++$round) {
+            [$s, $e] = [$e, $s];
             for ($i = 0; $i < $Nb; ++$i) {
-                $encrypt_block.=
-                    '$'.$e.$i.' =
-                     $sbox[ $'.$e.$i.'        & 0xff]        |
-                    ($sbox[($'.$e.$i.' >>  8) & 0xff] <<  8) |
-                    ($sbox[($'.$e.$i.' >> 16) & 0xff] << 16) |
-                    ($sbox[($'.$e.$i.' >> 24) & 0xff] << 24);'."\n";
+                $encrypt_block .=
+                    '$' . $e . $i . ' =
+                    $t0[($' . $s . $i                  . ' >> 24) & 0xff] ^
+                    $t1[($' . $s . (($i + $c[1]) % $Nb) . ' >> 16) & 0xff] ^
+                    $t2[($' . $s . (($i + $c[2]) % $Nb) . ' >>  8) & 0xff] ^
+                    $t3[ $' . $s . (($i + $c[3]) % $Nb) . '        & 0xff] ^
+                    ' . $w[++$wc] . ";\n";
             }
-            $encrypt_block .= '$in = pack("N*"'."\n";
-            for ($i = 0; $i < $Nb; ++$i) {
-                $encrypt_block.= ',
-                    ($'.$e.$i                  .' & '.((int)0xFF000000).') ^
-                    ($'.$e.(($i + $c[1]) % $Nb).' &         0x00FF0000   ) ^
-                    ($'.$e.(($i + $c[2]) % $Nb).' &         0x0000FF00   ) ^
-                    ($'.$e.(($i + $c[3]) % $Nb).' &         0x000000FF   ) ^
-                    '.$w[$i]."\n";
+        }
+
+        // Finalround: subWord + shiftRows + addRoundKey
+        for ($i = 0; $i < $Nb; ++$i) {
+            $encrypt_block .=
+                '$' . $e . $i . ' =
+                 $sbox[ $' . $e . $i . '        & 0xff]        |
+                ($sbox[($' . $e . $i . ' >>  8) & 0xff] <<  8) |
+                ($sbox[($' . $e . $i . ' >> 16) & 0xff] << 16) |
+                ($sbox[($' . $e . $i . ' >> 24) & 0xff] << 24);' . "\n";
+        }
+        $encrypt_block .= '$in = pack("N*"' . "\n";
+        for ($i = 0; $i < $Nb; ++$i) {
+            $encrypt_block .= ',
+                ($' . $e . $i                  . ' & ' . ((int)0xFF000000) . ') ^
+                ($' . $e . (($i + $c[1]) % $Nb) . ' &         0x00FF0000   ) ^
+                ($' . $e . (($i + $c[2]) % $Nb) . ' &         0x0000FF00   ) ^
+                ($' . $e . (($i + $c[3]) % $Nb) . ' &         0x000000FF   ) ^
+                ' . $w[$i] . "\n";
+        }
+        $encrypt_block .= ');';
+
+        // Generating decrypt code:
+        $init_decrypt .= '
+            if (empty($invtables)) {
+                $invtables = &$this->getInvTables();
             }
-            $encrypt_block .= ');';
+            $dt0   = $invtables[0];
+            $dt1   = $invtables[1];
+            $dt2   = $invtables[2];
+            $dt3   = $invtables[3];
+            $isbox = $invtables[4];
+        ';
+
+        $s  = 'e';
+        $e  = 's';
+        $wc = $Nb - 1;
 
-            // Generating decrypt code:
-            $init_decrypt.= '
-                static $invtables;
-                if (empty($invtables)) {
-                    $invtables = &$self->_getInvTables();
-                }
-                $dt0   = $invtables[0];
-                $dt1   = $invtables[1];
-                $dt2   = $invtables[2];
-                $dt3   = $invtables[3];
-                $isbox = $invtables[4];
-            ';
-
-            $s  = 'e';
-            $e  = 's';
-            $wc = $Nb - 1;
-
-            // Preround: addRoundKey
-            $decrypt_block = '$in = unpack("N*", $in);'."\n";
+        // Preround: addRoundKey
+        $decrypt_block = '$in = unpack("N*", $in);' . "\n";
+        for ($i = 0; $i < $Nb; ++$i) {
+            $decrypt_block .= '$s' . $i . ' = $in[' . ($i + 1) . '] ^ ' . $dw[++$wc] . ';' . "\n";
+        }
+
+        // Mainrounds: shiftRows + subWord + mixColumns + addRoundKey
+        for ($round = 1; $round < $Nr; ++$round) {
+            [$s, $e] = [$e, $s];
             for ($i = 0; $i < $Nb; ++$i) {
-                $decrypt_block .= '$s'.$i.' = $in['.($i + 1).'] ^ '.$dw[++$wc].';'."\n";
+                $decrypt_block .=
+                    '$' . $e . $i . ' =
+                    $dt0[($' . $s . $i                        . ' >> 24) & 0xff] ^
+                    $dt1[($' . $s . (($Nb + $i - $c[1]) % $Nb) . ' >> 16) & 0xff] ^
+                    $dt2[($' . $s . (($Nb + $i - $c[2]) % $Nb) . ' >>  8) & 0xff] ^
+                    $dt3[ $' . $s . (($Nb + $i - $c[3]) % $Nb) . '        & 0xff] ^
+                    ' . $dw[++$wc] . ";\n";
             }
+        }
+
+        // Finalround: subWord + shiftRows + addRoundKey
+        for ($i = 0; $i < $Nb; ++$i) {
+            $decrypt_block .=
+                '$' . $e . $i . ' =
+                 $isbox[ $' . $e . $i . '        & 0xff]        |
+                ($isbox[($' . $e . $i . ' >>  8) & 0xff] <<  8) |
+                ($isbox[($' . $e . $i . ' >> 16) & 0xff] << 16) |
+                ($isbox[($' . $e . $i . ' >> 24) & 0xff] << 24);' . "\n";
+        }
+        $decrypt_block .= '$in = pack("N*"' . "\n";
+        for ($i = 0; $i < $Nb; ++$i) {
+            $decrypt_block .= ',
+                ($' . $e . $i .                        ' & ' . ((int)0xFF000000) . ') ^
+                ($' . $e . (($Nb + $i - $c[1]) % $Nb) . ' &         0x00FF0000   ) ^
+                ($' . $e . (($Nb + $i - $c[2]) % $Nb) . ' &         0x0000FF00   ) ^
+                ($' . $e . (($Nb + $i - $c[3]) % $Nb) . ' &         0x000000FF   ) ^
+                ' . $dw[$i] . "\n";
+        }
+        $decrypt_block .= ');';
+
+        $this->inline_crypt = $this->createInlineCryptFunction(
+            [
+               'init_crypt'    => 'static $tables; static $invtables;',
+               'init_encrypt'  => $init_encrypt,
+               'init_decrypt'  => $init_decrypt,
+               'encrypt_block' => $encrypt_block,
+               'decrypt_block' => $decrypt_block,
+            ]
+        );
+    }
+
+    /**
+     * Encrypts a message.
+     *
+     * @see self::decrypt()
+     * @see parent::encrypt()
+     */
+    public function encrypt(string $plaintext): string
+    {
+        $this->setup();
+
+        switch ($this->engine) {
+            case self::ENGINE_LIBSODIUM:
+                $this->newtag = sodium_crypto_aead_aes256gcm_encrypt($plaintext, $this->aad, $this->nonce, $this->key);
+                return Strings::shift($this->newtag, strlen($plaintext));
+            case self::ENGINE_OPENSSL_GCM:
+                return openssl_encrypt(
+                    $plaintext,
+                    'aes-' . $this->getKeyLength() . '-gcm',
+                    $this->key,
+                    OPENSSL_RAW_DATA,
+                    $this->nonce,
+                    $this->newtag,
+                    $this->aad
+                );
+        }
 
-            // Mainrounds: shiftRows + subWord + mixColumns + addRoundKey
-            for ($round = 1; $round < $Nr; ++$round) {
-                list($s, $e) = array($e, $s);
-                for ($i = 0; $i < $Nb; ++$i) {
-                    $decrypt_block.=
-                        '$'.$e.$i.' =
-                        $dt0[($'.$s.$i                        .' >> 24) & 0xff] ^
-                        $dt1[($'.$s.(($Nb + $i - $c[1]) % $Nb).' >> 16) & 0xff] ^
-                        $dt2[($'.$s.(($Nb + $i - $c[2]) % $Nb).' >>  8) & 0xff] ^
-                        $dt3[ $'.$s.(($Nb + $i - $c[3]) % $Nb).'        & 0xff] ^
-                        '.$dw[++$wc].";\n";
+        return parent::encrypt($plaintext);
+    }
+
+    /**
+     * Decrypts a message.
+     *
+     * @see self::encrypt()
+     * @see parent::decrypt()
+     */
+    public function decrypt(string $ciphertext): string
+    {
+        $this->setup();
+
+        switch ($this->engine) {
+            case self::ENGINE_LIBSODIUM:
+                if ($this->oldtag === false) {
+                    throw new InsufficientSetupException('Authentication Tag has not been set');
                 }
-            }
+                if (strlen($this->oldtag) != 16) {
+                    break;
+                }
+                $plaintext = sodium_crypto_aead_aes256gcm_decrypt($ciphertext . $this->oldtag, $this->aad, $this->nonce, $this->key);
+                if ($plaintext === false) {
+                    $this->oldtag = false;
+                    throw new BadDecryptionException('Error decrypting ciphertext with libsodium');
+                }
+                return $plaintext;
+            case self::ENGINE_OPENSSL_GCM:
+                if ($this->oldtag === false) {
+                    throw new InsufficientSetupException('Authentication Tag has not been set');
+                }
+                $plaintext = openssl_decrypt(
+                    $ciphertext,
+                    'aes-' . $this->getKeyLength() . '-gcm',
+                    $this->key,
+                    OPENSSL_RAW_DATA,
+                    $this->nonce,
+                    $this->oldtag,
+                    $this->aad
+                );
+                if ($plaintext === false) {
+                    $this->oldtag = false;
+                    throw new BadDecryptionException('Error decrypting ciphertext with OpenSSL');
+                }
+                return $plaintext;
+        }
 
-            // Finalround: subWord + shiftRows + addRoundKey
-            for ($i = 0; $i < $Nb; ++$i) {
-                $decrypt_block.=
-                    '$'.$e.$i.' =
-                     $isbox[ $'.$e.$i.'        & 0xff]        |
-                    ($isbox[($'.$e.$i.' >>  8) & 0xff] <<  8) |
-                    ($isbox[($'.$e.$i.' >> 16) & 0xff] << 16) |
-                    ($isbox[($'.$e.$i.' >> 24) & 0xff] << 24);'."\n";
-            }
-            $decrypt_block .= '$in = pack("N*"'."\n";
-            for ($i = 0; $i < $Nb; ++$i) {
-                $decrypt_block.= ',
-                    ($'.$e.$i.                        ' & '.((int)0xFF000000).') ^
-                    ($'.$e.(($Nb + $i - $c[1]) % $Nb).' &         0x00FF0000   ) ^
-                    ($'.$e.(($Nb + $i - $c[2]) % $Nb).' &         0x0000FF00   ) ^
-                    ($'.$e.(($Nb + $i - $c[3]) % $Nb).' &         0x000000FF   ) ^
-                    '.$dw[$i]."\n";
-            }
-            $decrypt_block .= ');';
-
-            $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
-                array(
-                   'init_crypt'    => '',
-                   'init_encrypt'  => $init_encrypt,
-                   'init_decrypt'  => $init_decrypt,
-                   'encrypt_block' => $encrypt_block,
-                   'decrypt_block' => $decrypt_block
-                )
-            );
-        }
-        $this->inline_crypt = $lambda_functions[$code_hash];
+        return parent::decrypt($ciphertext);
     }
 }
diff --git a/phpseclib/Crypt/Salsa20.php b/phpseclib/Crypt/Salsa20.php
new file mode 100644
index 000000000..a7949a1db
--- /dev/null
+++ b/phpseclib/Crypt/Salsa20.php
@@ -0,0 +1,505 @@
+<?php
+
+/**
+ * Pure-PHP implementation of Salsa20.
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2019 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Common\StreamCipher;
+use phpseclib3\Exception\BadDecryptionException;
+use phpseclib3\Exception\InsufficientSetupException;
+use phpseclib3\Exception\LengthException;
+
+/**
+ * Pure-PHP implementation of Salsa20.
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class Salsa20 extends StreamCipher
+{
+    /**
+     * Part 1 of the state
+     *
+     * @var string|false
+     */
+    protected $p1 = false;
+
+    /**
+     * Part 2 of the state
+     *
+     * @var string|false
+     */
+    protected $p2 = false;
+
+    /**
+     * Key Length (in bytes)
+     *
+     * @var int
+     */
+    protected $key_length = 32; // = 256 bits
+
+    /**
+     * @see \phpseclib3\Crypt\Salsa20::crypt()
+     */
+    public const ENCRYPT = 0;
+
+    /**
+     * @see \phpseclib3\Crypt\Salsa20::crypt()
+     */
+    public const DECRYPT = 1;
+
+    /**
+     * Encryption buffer for continuous mode
+     *
+     * @var array
+     */
+    protected $enbuffer;
+
+    /**
+     * Decryption buffer for continuous mode
+     *
+     * @var array
+     */
+    protected $debuffer;
+
+    /**
+     * Counter
+     *
+     * @var int
+     */
+    protected $counter = 0;
+
+    /**
+     * Using Generated Poly1305 Key
+     *
+     * @var boolean
+     */
+    protected $usingGeneratedPoly1305Key = false;
+
+    /**
+     * Salsa20 uses a nonce
+     */
+    public function usesNonce(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Sets the key.
+     *
+     * @throws LengthException if the key length isn't supported
+     */
+    public function setKey(string $key): void
+    {
+        switch (strlen($key)) {
+            case 16:
+            case 32:
+                break;
+            default:
+                throw new LengthException('Key of size ' . strlen($key) . ' not supported by this algorithm. Only keys of sizes 16 or 32 are supported');
+        }
+
+        parent::setKey($key);
+    }
+
+    /**
+     * Sets the nonce.
+     */
+    public function setNonce(string $nonce): void
+    {
+        if (strlen($nonce) != 8) {
+            throw new LengthException('Nonce of size ' . strlen($key) . ' not supported by this algorithm. Only an 64-bit nonce is supported');
+        }
+
+        $this->nonce = $nonce;
+        $this->changed = true;
+        $this->setEngine();
+    }
+
+    /**
+     * Sets the counter.
+     */
+    public function setCounter(int $counter): void
+    {
+        $this->counter = $counter;
+        $this->setEngine();
+    }
+
+    /**
+     * Creates a Poly1305 key using the method discussed in RFC8439
+     *
+     * See https://tools.ietf.org/html/rfc8439#section-2.6.1
+     */
+    protected function createPoly1305Key(): void
+    {
+        if ($this->nonce === false) {
+            throw new InsufficientSetupException('No nonce has been defined');
+        }
+
+        if ($this->key === false) {
+            throw new InsufficientSetupException('No key has been defined');
+        }
+
+        $c = clone $this;
+        $c->setCounter(0);
+        $c->usePoly1305 = false;
+        $block = $c->encrypt(str_repeat("\0", 256));
+        $this->setPoly1305Key(substr($block, 0, 32));
+
+        if ($this->counter == 0) {
+            $this->counter++;
+        }
+    }
+
+    /**
+     * Setup the self::ENGINE_INTERNAL $engine
+     *
+     * (re)init, if necessary, the internal cipher $engine
+     *
+     * _setup() will be called each time if $changed === true
+     * typically this happens when using one or more of following public methods:
+     *
+     * - setKey()
+     *
+     * - setNonce()
+     *
+     * - First run of encrypt() / decrypt() with no init-settings
+     *
+     * @see self::setKey()
+     * @see self::setNonce()
+     * @see self::disableContinuousBuffer()
+     */
+    protected function setup(): void
+    {
+        if (!$this->changed) {
+            return;
+        }
+
+        $this->enbuffer = $this->debuffer = ['ciphertext' => '', 'counter' => $this->counter];
+
+        $this->changed = $this->nonIVChanged = false;
+
+        if ($this->nonce === false) {
+            throw new InsufficientSetupException('No nonce has been defined');
+        }
+
+        if ($this->key === false) {
+            throw new InsufficientSetupException('No key has been defined');
+        }
+
+        if ($this->usePoly1305 && !isset($this->poly1305Key)) {
+            $this->usingGeneratedPoly1305Key = true;
+            $this->createPoly1305Key();
+        }
+
+        $key = $this->key;
+        if (strlen($key) == 16) {
+            $constant = 'expand 16-byte k';
+            $key .= $key;
+        } else {
+            $constant = 'expand 32-byte k';
+        }
+
+        $this->p1 = substr($constant, 0, 4) .
+                    substr($key, 0, 16) .
+                    substr($constant, 4, 4) .
+                    $this->nonce .
+                    "\0\0\0\0";
+        $this->p2 = substr($constant, 8, 4) .
+                    substr($key, 16, 16) .
+                    substr($constant, 12, 4);
+    }
+
+    /**
+     * Setup the key (expansion)
+     */
+    protected function setupKey(): void
+    {
+        // Salsa20 does not utilize this method
+    }
+
+    /**
+     * Encrypts a message.
+     *
+     * @return string $ciphertext
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
+     * @see self::crypt()
+     */
+    public function encrypt(string $plaintext): string
+    {
+        $ciphertext = $this->crypt($plaintext, self::ENCRYPT);
+        if (isset($this->poly1305Key)) {
+            $this->newtag = $this->poly1305($ciphertext);
+        }
+        return $ciphertext;
+    }
+
+    /**
+     * Decrypts a message.
+     *
+     * $this->decrypt($this->encrypt($plaintext)) == $this->encrypt($this->encrypt($plaintext)).
+     * At least if the continuous buffer is disabled.
+     *
+     * @return string $plaintext
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
+     * @see self::crypt()
+     */
+    public function decrypt(string $ciphertext): string
+    {
+        if (isset($this->poly1305Key)) {
+            if ($this->oldtag === false) {
+                throw new InsufficientSetupException('Authentication Tag has not been set');
+            }
+            $newtag = $this->poly1305($ciphertext);
+            if ($this->oldtag != substr($newtag, 0, strlen($this->oldtag))) {
+                $this->oldtag = false;
+                throw new BadDecryptionException('Derived authentication tag and supplied authentication tag do not match');
+            }
+            $this->oldtag = false;
+        }
+
+        return $this->crypt($ciphertext, self::DECRYPT);
+    }
+
+    /**
+     * Encrypts a block
+     */
+    protected function encryptBlock(string $in): string
+    {
+        // Salsa20 does not utilize this method
+        return '';
+    }
+
+    /**
+     * Decrypts a block
+     */
+    protected function decryptBlock(string $in): string
+    {
+        // Salsa20 does not utilize this method
+        return '';
+    }
+
+    /**
+     * Encrypts or decrypts a message.
+     *
+     * @return string $text
+     * @see self::decrypt()
+     * @see self::encrypt()
+     */
+    private function crypt(string $text, int $mode): string
+    {
+        $this->setup();
+        if (!$this->continuousBuffer) {
+            if ($this->engine == self::ENGINE_OPENSSL) {
+                $iv = pack('V', $this->counter) . $this->p2;
+                return openssl_encrypt(
+                    $text,
+                    $this->cipher_name_openssl,
+                    $this->key,
+                    OPENSSL_RAW_DATA,
+                    $iv
+                );
+            }
+            $i = $this->counter;
+            $blocks = str_split($text, 64);
+            foreach ($blocks as &$block) {
+                $block ^= static::salsa20($this->p1 . pack('V', $i++) . $this->p2);
+            }
+            unset($block);
+            return implode('', $blocks);
+        }
+
+        if ($mode == self::ENCRYPT) {
+            $buffer = &$this->enbuffer;
+        } else {
+            $buffer = &$this->debuffer;
+        }
+        if (!strlen($buffer['ciphertext'])) {
+            $ciphertext = '';
+        } else {
+            $ciphertext = $text ^ Strings::shift($buffer['ciphertext'], strlen($text));
+            $text = substr($text, strlen($ciphertext));
+            if (!strlen($text)) {
+                return $ciphertext;
+            }
+        }
+
+        $overflow = strlen($text) % 64; // & 0x3F
+        if ($overflow) {
+            $text2 = Strings::pop($text, $overflow);
+            if ($this->engine == self::ENGINE_OPENSSL) {
+                $iv = pack('V', $buffer['counter']) . $this->p2;
+                // at this point $text should be a multiple of 64
+                $buffer['counter'] += (strlen($text) >> 6) + 1; // ie. divide by 64
+                $encrypted = openssl_encrypt(
+                    $text . str_repeat("\0", 64),
+                    $this->cipher_name_openssl,
+                    $this->key,
+                    OPENSSL_RAW_DATA,
+                    $iv
+                );
+                $temp = Strings::pop($encrypted, 64);
+            } else {
+                $blocks = str_split($text, 64);
+                if (strlen($text)) {
+                    foreach ($blocks as &$block) {
+                        $block ^= static::salsa20($this->p1 . pack('V', $buffer['counter']++) . $this->p2);
+                    }
+                    unset($block);
+                }
+                $encrypted = implode('', $blocks);
+                $temp = static::salsa20($this->p1 . pack('V', $buffer['counter']++) . $this->p2);
+            }
+            $ciphertext .= $encrypted . ($text2 ^ $temp);
+            $buffer['ciphertext'] = substr($temp, $overflow);
+        } elseif (!strlen($buffer['ciphertext'])) {
+            if ($this->engine == self::ENGINE_OPENSSL) {
+                $iv = pack('V', $buffer['counter']) . $this->p2;
+                $buffer['counter'] += (strlen($text) >> 6);
+                $ciphertext .= openssl_encrypt(
+                    $text,
+                    $this->cipher_name_openssl,
+                    $this->key,
+                    OPENSSL_RAW_DATA,
+                    $iv
+                );
+            } else {
+                $blocks = str_split($text, 64);
+                foreach ($blocks as &$block) {
+                    $block ^= static::salsa20($this->p1 . pack('V', $buffer['counter']++) . $this->p2);
+                }
+                unset($block);
+                $ciphertext .= implode('', $blocks);
+            }
+        }
+
+        return $ciphertext;
+    }
+
+    /**
+     * Left Rotate
+     */
+    protected static function leftRotate(int $x, int $n): int
+    {
+        if (PHP_INT_SIZE == 8) {
+            $r1 = $x << $n;
+            $r1 &= 0xFFFFFFFF;
+            $r2 = ($x & 0xFFFFFFFF) >> (32 - $n);
+        } else {
+            $x = (int) $x;
+            $r1 = $x << $n;
+            $r2 = $x >> (32 - $n);
+            $r2 &= (1 << $n) - 1;
+        }
+        return $r1 | $r2;
+    }
+
+    /**
+     * The quarterround function
+     */
+    protected static function quarterRound(int &$a, int &$b, int &$c, int &$d): void
+    {
+        $b ^= self::leftRotate($a + $d, 7);
+        $c ^= self::leftRotate($b + $a, 9);
+        $d ^= self::leftRotate($c + $b, 13);
+        $a ^= self::leftRotate($d + $c, 18);
+    }
+
+    /**
+     * The doubleround function
+     *
+     * @param int $x0 (by reference)
+     * @param int $x1 (by reference)
+     * @param int $x2 (by reference)
+     * @param int $x3 (by reference)
+     * @param int $x4 (by reference)
+     * @param int $x5 (by reference)
+     * @param int $x6 (by reference)
+     * @param int $x7 (by reference)
+     * @param int $x8 (by reference)
+     * @param int $x9 (by reference)
+     * @param int $x10 (by reference)
+     * @param int $x11 (by reference)
+     * @param int $x12 (by reference)
+     * @param int $x13 (by reference)
+     * @param int $x14 (by reference)
+     * @param int $x15 (by reference)
+     */
+    protected static function doubleRound(int &$x0, int &$x1, int &$x2, int &$x3, int &$x4, int &$x5, int &$x6, int &$x7, int &$x8, int &$x9, int &$x10, int &$x11, int &$x12, int &$x13, int &$x14, int &$x15): void
+    {
+        // columnRound
+        static::quarterRound($x0, $x4, $x8, $x12);
+        static::quarterRound($x5, $x9, $x13, $x1);
+        static::quarterRound($x10, $x14, $x2, $x6);
+        static::quarterRound($x15, $x3, $x7, $x11);
+        // rowRound
+        static::quarterRound($x0, $x1, $x2, $x3);
+        static::quarterRound($x5, $x6, $x7, $x4);
+        static::quarterRound($x10, $x11, $x8, $x9);
+        static::quarterRound($x15, $x12, $x13, $x14);
+    }
+
+    /**
+     * The Salsa20 hash function function
+     */
+    protected static function salsa20(string $x)
+    {
+        $z = $x = unpack('V*', $x);
+        for ($i = 0; $i < 10; $i++) {
+            static::doubleRound($z[1], $z[2], $z[3], $z[4], $z[5], $z[6], $z[7], $z[8], $z[9], $z[10], $z[11], $z[12], $z[13], $z[14], $z[15], $z[16]);
+        }
+
+        for ($i = 1; $i <= 16; $i++) {
+            $x[$i] += $z[$i];
+        }
+
+        return pack('V*', ...$x);
+    }
+
+    /**
+     * Calculates Poly1305 MAC
+     *
+     * @see self::decrypt()
+     * @see self::encrypt()
+     */
+    protected function poly1305(string $text): string
+    {
+        if (!$this->usingGeneratedPoly1305Key) {
+            return parent::poly1305($this->aad . $text);
+        } else {
+            /*
+            sodium_crypto_aead_chacha20poly1305_encrypt does not calculate the poly1305 tag
+            the same way sodium_crypto_aead_chacha20poly1305_ietf_encrypt does. you can see
+            how the latter encrypts it in Salsa20::encrypt(). here's how the former encrypts
+            it:
+
+            $this->newtag = $this->poly1305(
+                $this->aad .
+                pack('V', strlen($this->aad)) . "\0\0\0\0" .
+                $ciphertext .
+                pack('V', strlen($ciphertext)) . "\0\0\0\0"
+            );
+
+            phpseclib opts to use the IETF construction, even when the nonce is 64-bits
+            instead of 96-bits
+            */
+            return parent::poly1305(
+                self::nullPad128($this->aad) .
+                self::nullPad128($text) .
+                pack('V', strlen($this->aad)) . "\0\0\0\0" .
+                pack('V', strlen($text)) . "\0\0\0\0"
+            );
+        }
+    }
+}
diff --git a/phpseclib/Crypt/TripleDES.php b/phpseclib/Crypt/TripleDES.php
index 91c5bc62f..10c7d365a 100644
--- a/phpseclib/Crypt/TripleDES.php
+++ b/phpseclib/Crypt/TripleDES.php
@@ -3,7 +3,9 @@
 /**
  * Pure-PHP implementation of Triple DES.
  *
- * Uses mcrypt, if available, and an internal implementation, otherwise.  Operates in the EDE3 mode (encrypt-decrypt-encrypt).
+ * Uses OpenSSL, if available/possible, and an internal implementation, otherwise.
+ *
+ * Operates in the EDE3 mode (encrypt-decrypt-encrypt).
  *
  * PHP version 5
  *
@@ -12,7 +14,7 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $des = new \phpseclib\Crypt\TripleDES();
+ *    $des = new \phpseclib3\Crypt\TripleDES('ctr');
  *
  *    $des->setKey('abcdefghijklmnopqrstuvwx');
  *
@@ -26,25 +28,23 @@
  * ?>
  * </code>
  *
- * @category  Crypt
- * @package   TripleDES
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2007 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\Crypt;
+declare(strict_types=1);
+
+namespace phpseclib3\Crypt;
 
-use phpseclib\Crypt\Base;
-use phpseclib\Crypt\DES;
+use phpseclib3\Exception\BadModeException;
+use phpseclib3\Exception\LengthException;
 
 /**
  * Pure-PHP implementation of Triple DES.
  *
- * @package TripleDES
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class TripleDES extends DES
 {
@@ -53,166 +53,167 @@ class TripleDES extends DES
      *
      * Inner chaining is used by SSH-1 and is generally considered to be less secure then outer chaining (self::MODE_CBC3).
      */
-    const MODE_3CBC = -2;
+    public const MODE_3CBC = -2;
 
     /**
      * Encrypt / decrypt using outer chaining
      *
-     * Outer chaining is used by SSH-2 and when the mode is set to \phpseclib\Crypt\Base::MODE_CBC.
+     * Outer chaining is used by SSH-2 and when the mode is set to \phpseclib3\Crypt\Common\BlockCipher::MODE_CBC.
      */
-    const MODE_CBC3 = Base::MODE_CBC;
+    public const MODE_CBC3 = self::MODE_CBC;
 
     /**
      * Key Length (in bytes)
      *
-     * @see \phpseclib\Crypt\TripleDES::setKeyLength()
+     * @see \phpseclib3\Crypt\TripleDES::setKeyLength()
      * @var int
-     * @access private
-     */
-    var $key_length = 24;
-
-    /**
-     * The default salt used by setPassword()
-     *
-     * @see \phpseclib\Crypt\Base::password_default_salt
-     * @see \phpseclib\Crypt\Base::setPassword()
-     * @var string
-     * @access private
      */
-    var $password_default_salt = 'phpseclib';
+    protected $key_length = 24;
 
     /**
+<<<<<<< HEAD
+=======
      * The mcrypt specific name of the cipher
      *
-     * @see \phpseclib\Crypt\DES::cipher_name_mcrypt
-     * @see \phpseclib\Crypt\Base::cipher_name_mcrypt
+     * @see DES::cipher_name_mcrypt
+     * @see Common\SymmetricKey::cipher_name_mcrypt
      * @var string
-     * @access private
      */
-    var $cipher_name_mcrypt = 'tripledes';
+    protected $cipher_name_mcrypt = 'tripledes';
 
     /**
      * Optimizing value while CFB-encrypting
      *
-     * @see \phpseclib\Crypt\Base::cfb_init_len
+     * @see Common\SymmetricKey::cfb_init_len
      * @var int
-     * @access private
      */
-    var $cfb_init_len = 750;
+    protected $cfb_init_len = 750;
 
     /**
+>>>>>>> 3.0
      * max possible size of $key
      *
      * @see self::setKey()
-     * @see \phpseclib\Crypt\DES::setKey()
+     * @see DES::setKey()
      * @var string
-     * @access private
      */
-    var $key_length_max = 24;
+    protected $key_length_max = 24;
 
     /**
      * Internal flag whether using self::MODE_3CBC or not
      *
      * @var bool
-     * @access private
      */
-    var $mode_3cbc;
+    private $mode_3cbc;
 
     /**
-     * The \phpseclib\Crypt\DES objects
+     * The \phpseclib3\Crypt\DES objects
      *
      * Used only if $mode_3cbc === true
      *
      * @var array
-     * @access private
      */
-    var $des;
+    private $des;
 
     /**
      * Default Constructor.
      *
-     * Determines whether or not the mcrypt extension should be used.
-     *
      * $mode could be:
      *
-     * - \phpseclib\Crypt\Base::MODE_ECB
+     * - ecb
      *
-     * - \phpseclib\Crypt\Base::MODE_CBC
+     * - cbc
      *
-     * - \phpseclib\Crypt\Base::MODE_CTR
+     * - ctr
      *
-     * - \phpseclib\Crypt\Base::MODE_CFB
+     * - cfb
      *
-     * - \phpseclib\Crypt\Base::MODE_OFB
+     * - ofb
      *
-     * - \phpseclib\Crypt\TripleDES::MODE_3CBC
+     * - 3cbc
      *
-     * If not explicitly set, \phpseclib\Crypt\Base::MODE_CBC will be used.
+     * - cbc3 (same as cbc)
      *
-     * @see \phpseclib\Crypt\DES::__construct()
-     * @see \phpseclib\Crypt\Base::__construct()
-     * @param int $mode
-     * @access public
+<<<<<<< HEAD
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
+     * @see \phpseclib3\Crypt\DES::__construct()
+=======
+     * @see Crypt\DES::__construct()
+     * @see Common\SymmetricKey::__construct()
+     * @param string $mode
+>>>>>>> 3.0
      */
-    function __construct($mode = Base::MODE_CBC)
+    public function __construct(string $mode)
     {
-        switch ($mode) {
+        switch (strtolower($mode)) {
             // In case of self::MODE_3CBC, we init as CRYPT_DES_MODE_CBC
             // and additional flag us internally as 3CBC
-            case self::MODE_3CBC:
-                parent::__construct(Base::MODE_CBC);
+            case '3cbc':
+                parent::__construct('cbc');
                 $this->mode_3cbc = true;
 
                 // This three $des'es will do the 3CBC work (if $key > 64bits)
-                $this->des = array(
-                    new DES(Base::MODE_CBC),
-                    new DES(Base::MODE_CBC),
-                    new DES(Base::MODE_CBC),
-                );
+                $this->des = [
+                    new DES('cbc'),
+                    new DES('cbc'),
+                    new DES('cbc'),
+                ];
 
-                // we're going to be doing the padding, ourselves, so disable it in the \phpseclib\Crypt\DES objects
+                // we're going to be doing the padding, ourselves, so disable it in the \phpseclib3\Crypt\DES objects
                 $this->des[0]->disablePadding();
                 $this->des[1]->disablePadding();
                 $this->des[2]->disablePadding();
                 break;
+            case 'cbc3':
+                $mode = 'cbc';
+                // fall-through
             // If not 3CBC, we init as usual
             default:
                 parent::__construct($mode);
+
+                if ($this->mode == self::MODE_STREAM) {
+                    throw new BadModeException('Block ciphers cannot be ran in stream mode');
+                }
         }
     }
 
     /**
      * Test for engine validity
      *
-     * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
+     * This is mainly just a wrapper to set things up for \phpseclib3\Crypt\Common\SymmetricKey::isValidEngine()
      *
-     * @see \phpseclib\Crypt\Base::__construct()
+<<<<<<< HEAD
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
+=======
+     * @see Common\SymmetricKey::__construct()
      * @param int $engine
-     * @access public
      * @return bool
+>>>>>>> 3.0
      */
-    function isValidEngine($engine)
+    protected function isValidEngineHelper(int $engine): bool
     {
         if ($engine == self::ENGINE_OPENSSL) {
             $this->cipher_name_openssl_ecb = 'des-ede3';
-            $mode = $this->_openssl_translate_mode();
+            $mode = $this->openssl_translate_mode();
             $this->cipher_name_openssl = $mode == 'ecb' ? 'des-ede3' : 'des-ede3-' . $mode;
         }
 
-        return parent::isValidEngine($engine);
+        return parent::isValidEngineHelper($engine);
     }
 
     /**
-     * Sets the initialization vector. (optional)
+     * Sets the initialization vector.
      *
-     * SetIV is not required when \phpseclib\Crypt\Base::MODE_ECB is being used.  If not explicitly set, it'll be assumed
-     * to be all zero's.
+     * SetIV is not required when \phpseclib3\Crypt\Common\SymmetricKey::MODE_ECB is being used.
      *
-     * @see \phpseclib\Crypt\Base::setIV()
-     * @access public
+<<<<<<< HEAD
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::setIV()
+=======
+     * @see Common\SymmetricKey::setIV()
      * @param string $iv
+>>>>>>> 3.0
      */
-    function setIV($iv)
+    public function setIV(string $iv): void
     {
         parent::setIV($iv);
         if ($this->mode_3cbc) {
@@ -225,24 +226,27 @@ function setIV($iv)
     /**
      * Sets the key length.
      *
-     * Valid key lengths are 64, 128 and 192
+     * Valid key lengths are 128 and 192 bits.
+     *
+     * If you want to use a 64-bit key use DES.php
      *
-     * @see \phpseclib\Crypt\Base:setKeyLength()
-     * @access public
+<<<<<<< HEAD
+     * @throws LengthException if the key length is invalid
+     * @see \phpseclib3\Crypt\Common\SymmetricKey:setKeyLength()
+=======
+     * @see Common\SymmetricKey:setKeyLength()
+     * @throws \LengthException if the key length is invalid
      * @param int $length
+>>>>>>> 3.0
      */
-    function setKeyLength($length)
+    public function setKeyLength(int $length): void
     {
-        $length >>= 3;
-        switch (true) {
-            case $length <= 8:
-                $this->key_length = 8;
-                break;
-            case $length <= 16:
-                $this->key_length = 16;
+        switch ($length) {
+            case 128:
+            case 192:
                 break;
             default:
-                $this->key_length = 24;
+                throw new LengthException('Key size of ' . $length . ' bits is not supported by this algorithm. Only keys of sizes 128 or 192 bits are supported');
         }
 
         parent::setKeyLength($length);
@@ -251,38 +255,46 @@ function setKeyLength($length)
     /**
      * Sets the key.
      *
-     * Keys can be of any length.  Triple DES, itself, can use 128-bit (eg. strlen($key) == 16) or
-     * 192-bit (eg. strlen($key) == 24) keys.  This function pads and truncates $key as appropriate.
+     * Triple DES can use 128-bit (eg. strlen($key) == 16) or 192-bit (eg. strlen($key) == 24) keys.
      *
      * DES also requires that every eighth bit be a parity bit, however, we'll ignore that.
      *
-     * If the key is not explicitly set, it'll be assumed to be all null bytes.
-     *
-     * @access public
-     * @see \phpseclib\Crypt\DES::setKey()
-     * @see \phpseclib\Crypt\Base::setKey()
+<<<<<<< HEAD
+     * @throws LengthException if the key length is invalid
+     * @see \phpseclib3\Crypt\DES::setKey()
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::setKey()
+=======
+     * @see DES::setKey()
+     * @see Common\SymmetricKey::setKey()
+     * @throws \LengthException if the key length is invalid
      * @param string $key
+>>>>>>> 3.0
      */
-    function setKey($key)
+    public function setKey(string $key): void
     {
-        $length = $this->explicit_key_length ? $this->key_length : strlen($key);
-        if ($length > 8) {
-            $key = str_pad(substr($key, 0, 24), 24, chr(0));
-            // if $key is between 64 and 128-bits, use the first 64-bits as the last, per this:
-            // http://php.net/function.mcrypt-encrypt#47973
-            $key = $length <= 16 ? substr_replace($key, substr($key, 0, 8), 16) : substr($key, 0, 24);
-        } else {
-            $key = str_pad($key, 8, chr(0));
+        if ($this->explicit_key_length !== false && strlen($key) != $this->explicit_key_length) {
+            throw new LengthException('Key length has already been set to ' . $this->explicit_key_length . ' bytes and this key is ' . strlen($key) . ' bytes');
         }
-        parent::setKey($key);
-
-        // And in case of self::MODE_3CBC:
-        // if key <= 64bits we not need the 3 $des to work,
-        // because we will then act as regular DES-CBC with just a <= 64bit key.
-        // So only if the key > 64bits (> 8 bytes) we will call setKey() for the 3 $des.
-        if ($this->mode_3cbc && $length > 8) {
-            $this->des[0]->setKey(substr($key,  0, 8));
-            $this->des[1]->setKey(substr($key,  8, 8));
+
+        switch (strlen($key)) {
+            case 16:
+                $key .= substr($key, 0, 8);
+                break;
+            case 24:
+                break;
+            default:
+                throw new LengthException('Key of size ' . strlen($key) . ' not supported by this algorithm. Only keys of sizes 16 or 24 are supported');
+        }
+
+        // copied from self::setKey()
+        $this->key = $key;
+        $this->key_length = strlen($key);
+        $this->changed = $this->nonIVChanged = true;
+        $this->setEngine();
+
+        if ($this->mode_3cbc) {
+            $this->des[0]->setKey(substr($key, 0, 8));
+            $this->des[1]->setKey(substr($key, 8, 8));
             $this->des[2]->setKey(substr($key, 16, 8));
         }
     }
@@ -290,12 +302,15 @@ function setKey($key)
     /**
      * Encrypts a message.
      *
-     * @see \phpseclib\Crypt\Base::encrypt()
-     * @access public
+<<<<<<< HEAD
+=======
+     * @see Common\SymmetricKey::encrypt()
      * @param string $plaintext
+>>>>>>> 3.0
      * @return string $cipertext
+     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
      */
-    function encrypt($plaintext)
+    public function encrypt(string $plaintext): string
     {
         // parent::en/decrypt() is able to do all the work for all modes and keylengths,
         // except for: self::MODE_3CBC (inner chaining CBC) with a key > 64bits
@@ -305,7 +320,7 @@ function encrypt($plaintext)
             return $this->des[2]->encrypt(
                 $this->des[1]->decrypt(
                     $this->des[0]->encrypt(
-                        $this->_pad($plaintext)
+                        $this->pad($plaintext)
                     )
                 )
             );
@@ -317,15 +332,13 @@ function encrypt($plaintext)
     /**
      * Decrypts a message.
      *
-     * @see \phpseclib\Crypt\Base::decrypt()
-     * @access public
+     * @see Common\SymmetricKey::decrypt()
      * @param string $ciphertext
-     * @return string $plaintext
      */
-    function decrypt($ciphertext)
+    public function decrypt(string $ciphertext): string
     {
         if ($this->mode_3cbc && strlen($this->key) > 8) {
-            return $this->_unpad(
+            return $this->unpad(
                 $this->des[0]->decrypt(
                     $this->des[1]->encrypt(
                         $this->des[2]->decrypt(
@@ -368,16 +381,15 @@ function decrypt($ciphertext)
      * outputs.  The reason is due to the fact that the initialization vector's change after every encryption /
      * decryption round when the continuous buffer is enabled.  When it's disabled, they remain constant.
      *
-     * Put another way, when the continuous buffer is enabled, the state of the \phpseclib\Crypt\DES() object changes after each
+     * Put another way, when the continuous buffer is enabled, the state of the \phpseclib3\Crypt\DES() object changes after each
      * encryption / decryption round, whereas otherwise, it'd remain constant.  For this reason, it's recommended that
      * continuous buffers not be used.  They do offer better security and are, in fact, sometimes required (SSH uses them),
      * however, they are also less intuitive and more likely to cause you problems.
      *
-     * @see \phpseclib\Crypt\Base::enableContinuousBuffer()
+     * @see Common\SymmetricKey::enableContinuousBuffer()
      * @see self::disableContinuousBuffer()
-     * @access public
      */
-    function enableContinuousBuffer()
+    public function enableContinuousBuffer(): void
     {
         parent::enableContinuousBuffer();
         if ($this->mode_3cbc) {
@@ -392,11 +404,10 @@ function enableContinuousBuffer()
      *
      * The default behavior.
      *
-     * @see \phpseclib\Crypt\Base::disableContinuousBuffer()
+     * @see Common\SymmetricKey::disableContinuousBuffer()
      * @see self::enableContinuousBuffer()
-     * @access public
      */
-    function disableContinuousBuffer()
+    public function disableContinuousBuffer(): void
     {
         parent::disableContinuousBuffer();
         if ($this->mode_3cbc) {
@@ -409,11 +420,10 @@ function disableContinuousBuffer()
     /**
      * Creates the key schedule
      *
-     * @see \phpseclib\Crypt\DES::_setupKey()
-     * @see \phpseclib\Crypt\Base::_setupKey()
-     * @access private
+     * @see DES::setupKey()
+     * @see Common\SymmetricKey::setupKey()
      */
-    function _setupKey()
+    protected function setupKey(): void
     {
         switch (true) {
             // if $key <= 64bits we configure our internal pure-php cipher engine
@@ -428,29 +438,26 @@ function _setupKey()
 
                 // (only) if 3CBC is used we have, of course, to setup the $des[0-2] keys also separately.
                 if ($this->mode_3cbc) {
-                    $this->des[0]->_setupKey();
-                    $this->des[1]->_setupKey();
-                    $this->des[2]->_setupKey();
+                    $this->des[0]->setupKey();
+                    $this->des[1]->setupKey();
+                    $this->des[2]->setupKey();
 
                     // because $des[0-2] will, now, do all the work we can return here
-                    // not need unnecessary stress parent::_setupKey() with our, now unused, $key.
+                    // not need unnecessary stress parent::setupKey() with our, now unused, $key.
                     return;
                 }
         }
         // setup our key
-        parent::_setupKey();
+        parent::setupKey();
     }
 
     /**
      * Sets the internal crypt engine
      *
-     * @see \phpseclib\Crypt\Base::__construct()
-     * @see \phpseclib\Crypt\Base::setPreferredEngine()
-     * @param int $engine
-     * @access public
-     * @return int
+     * @see Common\SymmetricKey::setPreferredEngine()
+     * @see Common\SymmetricKey::__construct()
      */
-    function setPreferredEngine($engine)
+    public function setPreferredEngine(string $engine): void
     {
         if ($this->mode_3cbc) {
             $this->des[0]->setPreferredEngine($engine);
@@ -458,6 +465,6 @@ function setPreferredEngine($engine)
             $this->des[2]->setPreferredEngine($engine);
         }
 
-        return parent::setPreferredEngine($engine);
+        parent::setPreferredEngine($engine);
     }
 }
diff --git a/phpseclib/Crypt/Twofish.php b/phpseclib/Crypt/Twofish.php
index 623e9a6a5..04598b35f 100644
--- a/phpseclib/Crypt/Twofish.php
+++ b/phpseclib/Crypt/Twofish.php
@@ -3,7 +3,7 @@
 /**
  * Pure-PHP implementation of Twofish.
  *
- * Uses mcrypt, if available, and an internal implementation, otherwise.
+ * Uses an internal implementation.
  *
  * PHP version 5
  *
@@ -16,7 +16,7 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $twofish = new \phpseclib\Crypt\Twofish();
+ *    $twofish = new \phpseclib3\Crypt\Twofish('ctr');
  *
  *    $twofish->setKey('12345678901234567890123456789012');
  *
@@ -26,8 +26,6 @@
  * ?>
  * </code>
  *
- * @category  Crypt
- * @package   Twofish
  * @author    Jim Wigginton <terrafrost@php.net>
  * @author    Hans-Juergen Petrich <petrich@tronic-media.com>
  * @copyright 2007 Jim Wigginton
@@ -35,45 +33,28 @@
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\Crypt;
+declare(strict_types=1);
 
-use phpseclib\Crypt\Base;
+namespace phpseclib3\Crypt;
+
+use phpseclib3\Crypt\Common\BlockCipher;
+use phpseclib3\Exception\BadModeException;
+use phpseclib3\Exception\LengthException;
 
 /**
  * Pure-PHP implementation of Twofish.
  *
- * @package Twofish
  * @author  Jim Wigginton <terrafrost@php.net>
  * @author  Hans-Juergen Petrich <petrich@tronic-media.com>
- * @access  public
  */
-class Twofish extends Base
+class Twofish extends BlockCipher
 {
-    /**
-     * The mcrypt specific name of the cipher
-     *
-     * @see \phpseclib\Crypt\Base::cipher_name_mcrypt
-     * @var string
-     * @access private
-     */
-    var $cipher_name_mcrypt = 'twofish';
-
-    /**
-     * Optimizing value while CFB-encrypting
-     *
-     * @see \phpseclib\Crypt\Base::cfb_init_len
-     * @var int
-     * @access private
-     */
-    var $cfb_init_len = 800;
-
     /**
      * Q-Table
      *
      * @var array
-     * @access private
      */
-    var $q0 = array(
+    private static $q0 = [
         0xA9, 0x67, 0xB3, 0xE8, 0x04, 0xFD, 0xA3, 0x76,
         0x9A, 0x92, 0x80, 0x78, 0xE4, 0xDD, 0xD1, 0x38,
         0x0D, 0xC6, 0x35, 0x98, 0x18, 0xF7, 0xEC, 0x6C,
@@ -105,16 +86,15 @@ class Twofish extends Base
         0x6E, 0x50, 0xDE, 0x68, 0x65, 0xBC, 0xDB, 0xF8,
         0xC8, 0xA8, 0x2B, 0x40, 0xDC, 0xFE, 0x32, 0xA4,
         0xCA, 0x10, 0x21, 0xF0, 0xD3, 0x5D, 0x0F, 0x00,
-        0x6F, 0x9D, 0x36, 0x42, 0x4A, 0x5E, 0xC1, 0xE0
-    );
+        0x6F, 0x9D, 0x36, 0x42, 0x4A, 0x5E, 0xC1, 0xE0,
+    ];
 
     /**
      * Q-Table
      *
      * @var array
-     * @access private
      */
-    var $q1 = array(
+    private static $q1 = [
         0x75, 0xF3, 0xC6, 0xF4, 0xDB, 0x7B, 0xFB, 0xC8,
         0x4A, 0xD3, 0xE6, 0x6B, 0x45, 0x7D, 0xE8, 0x4B,
         0xD6, 0x32, 0xD8, 0xFD, 0x37, 0x71, 0xF1, 0xE1,
@@ -146,16 +126,15 @@ class Twofish extends Base
         0x22, 0xC9, 0xC0, 0x9B, 0x89, 0xD4, 0xED, 0xAB,
         0x12, 0xA2, 0x0D, 0x52, 0xBB, 0x02, 0x2F, 0xA9,
         0xD7, 0x61, 0x1E, 0xB4, 0x50, 0x04, 0xF6, 0xC2,
-        0x16, 0x25, 0x86, 0x56, 0x55, 0x09, 0xBE, 0x91
-    );
+        0x16, 0x25, 0x86, 0x56, 0x55, 0x09, 0xBE, 0x91,
+    ];
 
     /**
      * M-Table
      *
      * @var array
-     * @access private
      */
-    var $m0 = array(
+    private static $m0 = [
         0xBCBC3275, 0xECEC21F3, 0x202043C6, 0xB3B3C9F4, 0xDADA03DB, 0x02028B7B, 0xE2E22BFB, 0x9E9EFAC8,
         0xC9C9EC4A, 0xD4D409D3, 0x18186BE6, 0x1E1E9F6B, 0x98980E45, 0xB2B2387D, 0xA6A6D2E8, 0x2626B74B,
         0x3C3C57D6, 0x93938A32, 0x8282EED8, 0x525298FD, 0x7B7BD437, 0xBBBB3771, 0x5B5B97F1, 0x474783E1,
@@ -187,16 +166,15 @@ class Twofish extends Base
         0x8F8F9E22, 0x7171A1C9, 0x9090F0C0, 0xAAAA539B, 0x0101F189, 0x8B8BE1D4, 0x4E4E8CED, 0x8E8E6FAB,
         0xABABA212, 0x6F6F3EA2, 0xE6E6540D, 0xDBDBF252, 0x92927BBB, 0xB7B7B602, 0x6969CA2F, 0x3939D9A9,
         0xD3D30CD7, 0xA7A72361, 0xA2A2AD1E, 0xC3C399B4, 0x6C6C4450, 0x07070504, 0x04047FF6, 0x272746C2,
-        0xACACA716, 0xD0D07625, 0x50501386, 0xDCDCF756, 0x84841A55, 0xE1E15109, 0x7A7A25BE, 0x1313EF91
-    );
+        0xACACA716, 0xD0D07625, 0x50501386, 0xDCDCF756, 0x84841A55, 0xE1E15109, 0x7A7A25BE, 0x1313EF91,
+    ];
 
     /**
      * M-Table
      *
      * @var array
-     * @access private
      */
-    var $m1 = array(
+    private static $m1 = [
         0xA9D93939, 0x67901717, 0xB3719C9C, 0xE8D2A6A6, 0x04050707, 0xFD985252, 0xA3658080, 0x76DFE4E4,
         0x9A084545, 0x92024B4B, 0x80A0E0E0, 0x78665A5A, 0xE4DDAFAF, 0xDDB06A6A, 0xD1BF6363, 0x38362A2A,
         0x0D54E6E6, 0xC6432020, 0x3562CCCC, 0x98BEF2F2, 0x181E1212, 0xF724EBEB, 0xECD7A1A1, 0x6C774141,
@@ -228,16 +206,15 @@ class Twofish extends Base
         0x6EC1F6F6, 0x50446C6C, 0xDE5D3232, 0x68724646, 0x6526A0A0, 0xBC93CDCD, 0xDB03DADA, 0xF8C6BABA,
         0xC8FA9E9E, 0xA882D6D6, 0x2BCF6E6E, 0x40507070, 0xDCEB8585, 0xFE750A0A, 0x328A9393, 0xA48DDFDF,
         0xCA4C2929, 0x10141C1C, 0x2173D7D7, 0xF0CCB4B4, 0xD309D4D4, 0x5D108A8A, 0x0FE25151, 0x00000000,
-        0x6F9A1919, 0x9DE01A1A, 0x368F9494, 0x42E6C7C7, 0x4AECC9C9, 0x5EFDD2D2, 0xC1AB7F7F, 0xE0D8A8A8
-    );
+        0x6F9A1919, 0x9DE01A1A, 0x368F9494, 0x42E6C7C7, 0x4AECC9C9, 0x5EFDD2D2, 0xC1AB7F7F, 0xE0D8A8A8,
+    ];
 
     /**
      * M-Table
      *
      * @var array
-     * @access private
      */
-    var $m2 = array(
+    private static $m2 = [
         0xBC75BC32, 0xECF3EC21, 0x20C62043, 0xB3F4B3C9, 0xDADBDA03, 0x027B028B, 0xE2FBE22B, 0x9EC89EFA,
         0xC94AC9EC, 0xD4D3D409, 0x18E6186B, 0x1E6B1E9F, 0x9845980E, 0xB27DB238, 0xA6E8A6D2, 0x264B26B7,
         0x3CD63C57, 0x9332938A, 0x82D882EE, 0x52FD5298, 0x7B377BD4, 0xBB71BB37, 0x5BF15B97, 0x47E14783,
@@ -269,16 +246,15 @@ class Twofish extends Base
         0x8F228F9E, 0x71C971A1, 0x90C090F0, 0xAA9BAA53, 0x018901F1, 0x8BD48BE1, 0x4EED4E8C, 0x8EAB8E6F,
         0xAB12ABA2, 0x6FA26F3E, 0xE60DE654, 0xDB52DBF2, 0x92BB927B, 0xB702B7B6, 0x692F69CA, 0x39A939D9,
         0xD3D7D30C, 0xA761A723, 0xA21EA2AD, 0xC3B4C399, 0x6C506C44, 0x07040705, 0x04F6047F, 0x27C22746,
-        0xAC16ACA7, 0xD025D076, 0x50865013, 0xDC56DCF7, 0x8455841A, 0xE109E151, 0x7ABE7A25, 0x139113EF
-    );
+        0xAC16ACA7, 0xD025D076, 0x50865013, 0xDC56DCF7, 0x8455841A, 0xE109E151, 0x7ABE7A25, 0x139113EF,
+    ];
 
     /**
      * M-Table
      *
      * @var array
-     * @access private
      */
-    var $m3 = array(
+    private static $m3 = [
         0xD939A9D9, 0x90176790, 0x719CB371, 0xD2A6E8D2, 0x05070405, 0x9852FD98, 0x6580A365, 0xDFE476DF,
         0x08459A08, 0x024B9202, 0xA0E080A0, 0x665A7866, 0xDDAFE4DD, 0xB06ADDB0, 0xBF63D1BF, 0x362A3836,
         0x54E60D54, 0x4320C643, 0x62CC3562, 0xBEF298BE, 0x1E12181E, 0x24EBF724, 0xD7A1ECD7, 0x77416C77,
@@ -310,121 +286,161 @@ class Twofish extends Base
         0xC1F66EC1, 0x446C5044, 0x5D32DE5D, 0x72466872, 0x26A06526, 0x93CDBC93, 0x03DADB03, 0xC6BAF8C6,
         0xFA9EC8FA, 0x82D6A882, 0xCF6E2BCF, 0x50704050, 0xEB85DCEB, 0x750AFE75, 0x8A93328A, 0x8DDFA48D,
         0x4C29CA4C, 0x141C1014, 0x73D72173, 0xCCB4F0CC, 0x09D4D309, 0x108A5D10, 0xE2510FE2, 0x00000000,
-        0x9A196F9A, 0xE01A9DE0, 0x8F94368F, 0xE6C742E6, 0xECC94AEC, 0xFDD25EFD, 0xAB7FC1AB, 0xD8A8E0D8
-    );
+        0x9A196F9A, 0xE01A9DE0, 0x8F94368F, 0xE6C742E6, 0xECC94AEC, 0xFDD25EFD, 0xAB7FC1AB, 0xD8A8E0D8,
+    ];
 
     /**
      * The Key Schedule Array
      *
      * @var array
-     * @access private
      */
-    var $K = array();
+    private $K = [];
 
     /**
      * The Key depended S-Table 0
      *
      * @var array
-     * @access private
      */
-    var $S0 = array();
+    private $S0 = [];
 
     /**
      * The Key depended S-Table 1
      *
      * @var array
-     * @access private
      */
-    var $S1 = array();
+    private $S1 = [];
 
     /**
      * The Key depended S-Table 2
      *
      * @var array
-     * @access private
      */
-    var $S2 = array();
+    private $S2 = [];
 
     /**
      * The Key depended S-Table 3
      *
      * @var array
-     * @access private
      */
-    var $S3 = array();
+    private $S3 = [];
 
     /**
      * Holds the last used key
      *
      * @var array
-     * @access private
      */
-    var $kl;
+    private $kl;
 
     /**
      * The Key Length (in bytes)
      *
      * @see Crypt_Twofish::setKeyLength()
      * @var int
-     * @access private
      */
-    var $key_length = 16;
+    protected $key_length = 16;
+
+    /**
+     * Default Constructor.
+     *
+     * @throws BadModeException if an invalid / unsupported mode is provided
+     */
+    public function __construct(string $mode)
+    {
+        parent::__construct($mode);
+
+        if ($this->mode == self::MODE_STREAM) {
+            throw new BadModeException('Block ciphers cannot be ran in stream mode');
+        }
+    }
+
+    /**
+     * Initialize Static Variables
+     */
+    protected static function initialize_static_variables(): void
+    {
+        if (is_float(self::$m3[0])) {
+            self::$m0 = array_map('intval', self::$m0);
+            self::$m1 = array_map('intval', self::$m1);
+            self::$m2 = array_map('intval', self::$m2);
+            self::$m3 = array_map('intval', self::$m3);
+            self::$q0 = array_map('intval', self::$q0);
+            self::$q1 = array_map('intval', self::$q1);
+        }
+
+        parent::initialize_static_variables();
+    }
 
     /**
      * Sets the key length.
      *
      * Valid key lengths are 128, 192 or 256 bits
-     *
-     * @access public
-     * @param int $length
      */
-    function setKeyLength($length)
+    public function setKeyLength(int $length): void
     {
-        switch (true) {
-            case $length <= 128:
-                $this->key_length = 16;
-                break;
-            case $length <= 192:
-                $this->key_length = 24;
+        switch ($length) {
+            case 128:
+            case 192:
+            case 256:
                 break;
             default:
-                $this->key_length = 32;
+                throw new LengthException('Key of size ' . $length . ' not supported by this algorithm. Only keys of sizes 16, 24 or 32 supported');
         }
 
         parent::setKeyLength($length);
     }
 
+    /**
+     * Sets the key.
+     *
+     * Rijndael supports five different key lengths
+     *
+     * @throws LengthException if the key length isn't supported
+     * @see setKeyLength()
+     */
+    public function setKey(string $key): void
+    {
+        switch (strlen($key)) {
+            case 16:
+            case 24:
+            case 32:
+                break;
+            default:
+                throw new LengthException('Key of size ' . strlen($key) . ' not supported by this algorithm. Only keys of sizes 16, 24 or 32 supported');
+        }
+
+        parent::setKey($key);
+    }
+
     /**
      * Setup the key (expansion)
      *
-     * @see \phpseclib\Crypt\Base::_setupKey()
-     * @access private
+     * @see Common\SymmetricKey::_setupKey()
      */
-    function _setupKey()
+    protected function setupKey(): void
     {
         if (isset($this->kl['key']) && $this->key === $this->kl['key']) {
             // already expanded
             return;
         }
-        $this->kl = array('key' => $this->key);
+        $this->kl = ['key' => $this->key];
 
         /* Key expanding and generating the key-depended s-boxes */
         $le_longs = unpack('V*', $this->key);
         $key = unpack('C*', $this->key);
-        $m0 = $this->m0;
-        $m1 = $this->m1;
-        $m2 = $this->m2;
-        $m3 = $this->m3;
-        $q0 = $this->q0;
-        $q1 = $this->q1;
+        $m0 = self::$m0;
+        $m1 = self::$m1;
+        $m2 = self::$m2;
+        $m3 = self::$m3;
+        $q0 = self::$q0;
+        $q1 = self::$q1;
 
-        $K = $S0 = $S1 = $S2 = $S3 = array();
+        $K = $S0 = $S1 = $S2 = $S3 = [];
 
         switch (strlen($this->key)) {
             case 16:
-                list($s7, $s6, $s5, $s4) = $this->_mdsrem($le_longs[1], $le_longs[2]);
-                list($s3, $s2, $s1, $s0) = $this->_mdsrem($le_longs[3], $le_longs[4]);
-                for ($i = 0, $j = 1; $i < 40; $i+= 2, $j+= 2) {
+                [$s7, $s6, $s5, $s4] = $this->mdsrem($le_longs[1], $le_longs[2]);
+                [$s3, $s2, $s1, $s0] = $this->mdsrem($le_longs[3], $le_longs[4]);
+                for ($i = 0, $j = 1; $i < 40; $i += 2, $j += 2) {
                     $A = $m0[$q0[$q0[$i] ^ $key[ 9]] ^ $key[1]] ^
                          $m1[$q0[$q1[$i] ^ $key[10]] ^ $key[2]] ^
                          $m2[$q1[$q0[$i] ^ $key[11]] ^ $key[3]] ^
@@ -434,8 +450,10 @@ function _setupKey()
                          $m2[$q1[$q0[$j] ^ $key[15]] ^ $key[7]] ^
                          $m3[$q1[$q1[$j] ^ $key[16]] ^ $key[8]];
                     $B = ($B << 8) | ($B >> 24 & 0xff);
-                    $K[] = $A+= $B;
-                    $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff);
+                    $A += $B;
+                    $K[] = $A;
+                    $A += $B;
+                    $K[] = ($A << 9 | $A >> 23 & 0x1ff);
                 }
                 for ($i = 0; $i < 256; ++$i) {
                     $S0[$i] = $m0[$q0[$q0[$i] ^ $s4] ^ $s0];
@@ -445,10 +463,10 @@ function _setupKey()
                 }
                 break;
             case 24:
-                list($sb, $sa, $s9, $s8) = $this->_mdsrem($le_longs[1], $le_longs[2]);
-                list($s7, $s6, $s5, $s4) = $this->_mdsrem($le_longs[3], $le_longs[4]);
-                list($s3, $s2, $s1, $s0) = $this->_mdsrem($le_longs[5], $le_longs[6]);
-                for ($i = 0, $j = 1; $i < 40; $i+= 2, $j+= 2) {
+                [$sb, $sa, $s9, $s8] = $this->mdsrem($le_longs[1], $le_longs[2]);
+                [$s7, $s6, $s5, $s4] = $this->mdsrem($le_longs[3], $le_longs[4]);
+                [$s3, $s2, $s1, $s0] = $this->mdsrem($le_longs[5], $le_longs[6]);
+                for ($i = 0, $j = 1; $i < 40; $i += 2, $j += 2) {
                     $A = $m0[$q0[$q0[$q1[$i] ^ $key[17]] ^ $key[ 9]] ^ $key[1]] ^
                          $m1[$q0[$q1[$q1[$i] ^ $key[18]] ^ $key[10]] ^ $key[2]] ^
                          $m2[$q1[$q0[$q0[$i] ^ $key[19]] ^ $key[11]] ^ $key[3]] ^
@@ -458,8 +476,10 @@ function _setupKey()
                          $m2[$q1[$q0[$q0[$j] ^ $key[23]] ^ $key[15]] ^ $key[7]] ^
                          $m3[$q1[$q1[$q0[$j] ^ $key[24]] ^ $key[16]] ^ $key[8]];
                     $B = ($B << 8) | ($B >> 24 & 0xff);
-                    $K[] = $A+= $B;
-                    $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff);
+                    $A += $B;
+                    $K[] = $A;
+                    $A += $B;
+                    $K[] = ($A << 9 | $A >> 23 & 0x1ff);
                 }
                 for ($i = 0; $i < 256; ++$i) {
                     $S0[$i] = $m0[$q0[$q0[$q1[$i] ^ $s8] ^ $s4] ^ $s0];
@@ -469,11 +489,11 @@ function _setupKey()
                 }
                 break;
             default: // 32
-                list($sf, $se, $sd, $sc) = $this->_mdsrem($le_longs[1], $le_longs[2]);
-                list($sb, $sa, $s9, $s8) = $this->_mdsrem($le_longs[3], $le_longs[4]);
-                list($s7, $s6, $s5, $s4) = $this->_mdsrem($le_longs[5], $le_longs[6]);
-                list($s3, $s2, $s1, $s0) = $this->_mdsrem($le_longs[7], $le_longs[8]);
-                for ($i = 0, $j = 1; $i < 40; $i+= 2, $j+= 2) {
+                [$sf, $se, $sd, $sc] = $this->mdsrem($le_longs[1], $le_longs[2]);
+                [$sb, $sa, $s9, $s8] = $this->mdsrem($le_longs[3], $le_longs[4]);
+                [$s7, $s6, $s5, $s4] = $this->mdsrem($le_longs[5], $le_longs[6]);
+                [$s3, $s2, $s1, $s0] = $this->mdsrem($le_longs[7], $le_longs[8]);
+                for ($i = 0, $j = 1; $i < 40; $i += 2, $j += 2) {
                     $A = $m0[$q0[$q0[$q1[$q1[$i] ^ $key[25]] ^ $key[17]] ^ $key[ 9]] ^ $key[1]] ^
                          $m1[$q0[$q1[$q1[$q0[$i] ^ $key[26]] ^ $key[18]] ^ $key[10]] ^ $key[2]] ^
                          $m2[$q1[$q0[$q0[$q0[$i] ^ $key[27]] ^ $key[19]] ^ $key[11]] ^ $key[3]] ^
@@ -483,8 +503,10 @@ function _setupKey()
                          $m2[$q1[$q0[$q0[$q0[$j] ^ $key[31]] ^ $key[23]] ^ $key[15]] ^ $key[7]] ^
                          $m3[$q1[$q1[$q0[$q1[$j] ^ $key[32]] ^ $key[24]] ^ $key[16]] ^ $key[8]];
                     $B = ($B << 8) | ($B >> 24 & 0xff);
-                    $K[] = $A+= $B;
-                    $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff);
+                    $A += $B;
+                    $K[] = $A;
+                    $A += $B;
+                    $K[] = ($A << 9 | $A >> 23 & 0x1ff);
                 }
                 for ($i = 0; $i < 256; ++$i) {
                     $S0[$i] = $m0[$q0[$q0[$q1[$q1[$i] ^ $sc] ^ $s8] ^ $s4] ^ $s0];
@@ -503,13 +525,8 @@ function _setupKey()
 
     /**
      * _mdsrem function using by the twofish cipher algorithm
-     *
-     * @access private
-     * @param string $A
-     * @param string $B
-     * @return array
      */
-    function _mdsrem($A, $B)
+    private function mdsrem(int $A, int $B): array
     {
         // No gain by unrolling this loop.
         for ($i = 0; $i < 8; ++$i) {
@@ -518,45 +535,41 @@ function _mdsrem($A, $B)
 
             // Shift the others up.
             $B = ($B << 8) | (0xff & ($A >> 24));
-            $A<<= 8;
+            $A <<= 8;
 
             $u = $t << 1;
 
             // Subtract the modular polynomial on overflow.
             if ($t & 0x80) {
-                $u^= 0x14d;
+                $u ^= 0x14d;
             }
 
             // Remove t * (a * x^2 + 1).
             $B ^= $t ^ ($u << 16);
 
             // Form u = a*t + t/a = t*(a + 1/a).
-            $u^= 0x7fffffff & ($t >> 1);
+            $u ^= 0x7fffffff & ($t >> 1);
 
             // Add the modular polynomial on underflow.
             if ($t & 0x01) {
-                $u^= 0xa6 ;
+                $u ^= 0xa6 ;
             }
 
             // Remove t * (a + 1/a) * (x^3 + x).
-            $B^= ($u << 24) | ($u << 8);
+            $B ^= ($u << 24) | ($u << 8);
         }
 
-        return array(
+        return [
             0xff & $B >> 24,
             0xff & $B >> 16,
             0xff & $B >>  8,
-            0xff & $B);
+            0xff & $B, ];
     }
 
     /**
      * Encrypts a block
-     *
-     * @access private
-     * @param string $in
-     * @return string
      */
-    function _encryptBlock($in)
+    protected function encryptBlock(string $in): string
     {
         $S0 = $this->S0;
         $S1 = $this->S1;
@@ -580,7 +593,7 @@ function _encryptBlock($in)
                   $S1[ $R1        & 0xff] ^
                   $S2[($R1 >>  8) & 0xff] ^
                   $S3[($R1 >> 16) & 0xff];
-            $R2^= $t0 + $t1 + $K[++$ki];
+            $R2 ^= $t0 + $t1 + $K[++$ki];
             $R2 = ($R2 >> 1 & 0x7fffffff) | ($R2 << 31);
             $R3 = ((($R3 >> 31) & 1) | ($R3 << 1)) ^ ($t0 + ($t1 << 1) + $K[++$ki]);
 
@@ -592,27 +605,26 @@ function _encryptBlock($in)
                   $S1[ $R3        & 0xff] ^
                   $S2[($R3 >>  8) & 0xff] ^
                   $S3[($R3 >> 16) & 0xff];
-            $R0^= ($t0 + $t1 + $K[++$ki]);
+            $R0 ^= $t0 + $t1 + $K[++$ki];
             $R0 = ($R0 >> 1 & 0x7fffffff) | ($R0 << 31);
             $R1 = ((($R1 >> 31) & 1) | ($R1 << 1)) ^ ($t0 + ($t1 << 1) + $K[++$ki]);
         }
 
         // @codingStandardsIgnoreStart
-        return pack("V4", $K[4] ^ $R2,
-                          $K[5] ^ $R3,
-                          $K[6] ^ $R0,
-                          $K[7] ^ $R1);
+        return pack(
+            "V4",
+            $K[4] ^ $R2,
+            $K[5] ^ $R3,
+            $K[6] ^ $R0,
+            $K[7] ^ $R1
+        );
         // @codingStandardsIgnoreEnd
     }
 
     /**
      * Decrypts a block
-     *
-     * @access private
-     * @param string $in
-     * @return string
      */
-    function _decryptBlock($in)
+    protected function decryptBlock(string $in): string
     {
         $S0 = $this->S0;
         $S1 = $this->S1;
@@ -636,7 +648,7 @@ function _decryptBlock($in)
                   $S1[$R1       & 0xff] ^
                   $S2[$R1 >>  8 & 0xff] ^
                   $S3[$R1 >> 16 & 0xff];
-            $R3^= $t0 + ($t1 << 1) + $K[--$ki];
+            $R3 ^= $t0 + ($t1 << 1) + $K[--$ki];
             $R3 = $R3 >> 1 & 0x7fffffff | $R3 << 31;
             $R2 = ($R2 >> 31 & 0x1 | $R2 << 1) ^ ($t0 + $t1 + $K[--$ki]);
 
@@ -648,163 +660,134 @@ function _decryptBlock($in)
                   $S1[$R3       & 0xff] ^
                   $S2[$R3 >>  8 & 0xff] ^
                   $S3[$R3 >> 16 & 0xff];
-            $R1^= $t0 + ($t1 << 1) + $K[--$ki];
+            $R1 ^= $t0 + ($t1 << 1) + $K[--$ki];
             $R1 = $R1 >> 1 & 0x7fffffff | $R1 << 31;
             $R0 = ($R0 >> 31 & 0x1 | $R0 << 1) ^ ($t0 + $t1 + $K[--$ki]);
         }
 
         // @codingStandardsIgnoreStart
-        return pack("V4", $K[0] ^ $R2,
-                          $K[1] ^ $R3,
-                          $K[2] ^ $R0,
-                          $K[3] ^ $R1);
+        return pack(
+            "V4",
+            $K[0] ^ $R2,
+            $K[1] ^ $R3,
+            $K[2] ^ $R0,
+            $K[3] ^ $R1
+        );
         // @codingStandardsIgnoreEnd
     }
 
     /**
      * Setup the performance-optimized function for de/encrypt()
      *
-     * @see \phpseclib\Crypt\Base::_setupInlineCrypt()
-     * @access private
+     * @see Common\SymmetricKey::_setupInlineCrypt()
      */
-    function _setupInlineCrypt()
+    protected function setupInlineCrypt(): void
     {
-        $lambda_functions =& self::_getLambdaFunctions();
-
-        // Max. 10 Ultra-Hi-optimized inline-crypt functions. After that, we'll (still) create very fast code, but not the ultimate fast one.
-        // (Currently, for Crypt_Twofish, one generated $lambda_function cost on php5.5@32bit ~140kb unfreeable mem and ~240kb on php5.5@64bit)
-        $gen_hi_opt_code = (bool)(count($lambda_functions) < 10);
-
-        // Generation of a uniqe hash for our generated code
-        $code_hash = "Crypt_Twofish, {$this->mode}";
-        if ($gen_hi_opt_code) {
-            $code_hash = str_pad($code_hash, 32) . $this->_hashInlineCryptFunction($this->key);
-        }
-
-        if (!isset($lambda_functions[$code_hash])) {
-            switch (true) {
-                case $gen_hi_opt_code:
-                    $K = $this->K;
-                    $init_crypt = '
-                        static $S0, $S1, $S2, $S3;
-                        if (!$S0) {
-                            for ($i = 0; $i < 256; ++$i) {
-                                $S0[] = (int)$self->S0[$i];
-                                $S1[] = (int)$self->S1[$i];
-                                $S2[] = (int)$self->S2[$i];
-                                $S3[] = (int)$self->S3[$i];
-                            }
-                        }
-                    ';
-                    break;
-                default:
-                    $K   = array();
-                    for ($i = 0; $i < 40; ++$i) {
-                        $K[] = '$K_' . $i;
-                    }
-                    $init_crypt = '
-                        $S0 = $self->S0;
-                        $S1 = $self->S1;
-                        $S2 = $self->S2;
-                        $S3 = $self->S3;
-                        list(' . implode(',', $K) . ') = $self->K;
-                    ';
-            }
-
-            // Generating encrypt code:
-            $encrypt_block = '
-                $in = unpack("V4", $in);
-                $R0 = '.$K[0].' ^ $in[1];
-                $R1 = '.$K[1].' ^ $in[2];
-                $R2 = '.$K[2].' ^ $in[3];
-                $R3 = '.$K[3].' ^ $in[4];
-            ';
-            for ($ki = 7, $i = 0; $i < 8; ++$i) {
-                $encrypt_block.= '
-                    $t0 = $S0[ $R0        & 0xff] ^
-                          $S1[($R0 >>  8) & 0xff] ^
-                          $S2[($R0 >> 16) & 0xff] ^
-                          $S3[($R0 >> 24) & 0xff];
-                    $t1 = $S0[($R1 >> 24) & 0xff] ^
-                          $S1[ $R1        & 0xff] ^
-                          $S2[($R1 >>  8) & 0xff] ^
-                          $S3[($R1 >> 16) & 0xff];
-                    $R2^= ($t0 + $t1 + '.$K[++$ki].');
-                    $R2 = ($R2 >> 1 & 0x7fffffff) | ($R2 << 31);
-                    $R3 = ((($R3 >> 31) & 1) | ($R3 << 1)) ^ ($t0 + ($t1 << 1) + '.$K[++$ki].');
-
-                    $t0 = $S0[ $R2        & 0xff] ^
-                          $S1[($R2 >>  8) & 0xff] ^
-                          $S2[($R2 >> 16) & 0xff] ^
-                          $S3[($R2 >> 24) & 0xff];
-                    $t1 = $S0[($R3 >> 24) & 0xff] ^
-                          $S1[ $R3        & 0xff] ^
-                          $S2[($R3 >>  8) & 0xff] ^
-                          $S3[($R3 >> 16) & 0xff];
-                    $R0^= ($t0 + $t1 + '.$K[++$ki].');
-                    $R0 = ($R0 >> 1 & 0x7fffffff) | ($R0 << 31);
-                    $R1 = ((($R1 >> 31) & 1) | ($R1 << 1)) ^ ($t0 + ($t1 << 1) + '.$K[++$ki].');
-                ';
+        $K = $this->K;
+        $init_crypt = '
+            static $S0, $S1, $S2, $S3;
+            if (!$S0) {
+                for ($i = 0; $i < 256; ++$i) {
+                    $S0[] = (int)$this->S0[$i];
+                    $S1[] = (int)$this->S1[$i];
+                    $S2[] = (int)$this->S2[$i];
+                    $S3[] = (int)$this->S3[$i];
+                }
             }
-            $encrypt_block.= '
-                $in = pack("V4", '.$K[4].' ^ $R2,
-                                 '.$K[5].' ^ $R3,
-                                 '.$K[6].' ^ $R0,
-                                 '.$K[7].' ^ $R1);
-            ';
-
-            // Generating decrypt code:
-            $decrypt_block = '
-                $in = unpack("V4", $in);
-                $R0 = '.$K[4].' ^ $in[1];
-                $R1 = '.$K[5].' ^ $in[2];
-                $R2 = '.$K[6].' ^ $in[3];
-                $R3 = '.$K[7].' ^ $in[4];
+        ';
+
+        // Generating encrypt code:
+        $encrypt_block = '
+            $in = unpack("V4", $in);
+            $R0 = ' . $K[0] . ' ^ $in[1];
+            $R1 = ' . $K[1] . ' ^ $in[2];
+            $R2 = ' . $K[2] . ' ^ $in[3];
+            $R3 = ' . $K[3] . ' ^ $in[4];
+        ';
+        for ($ki = 7, $i = 0; $i < 8; ++$i) {
+            $encrypt_block .= '
+                $t0 = $S0[ $R0        & 0xff] ^
+                      $S1[($R0 >>  8) & 0xff] ^
+                      $S2[($R0 >> 16) & 0xff] ^
+                      $S3[($R0 >> 24) & 0xff];
+                $t1 = $S0[($R1 >> 24) & 0xff] ^
+                      $S1[ $R1        & 0xff] ^
+                      $S2[($R1 >>  8) & 0xff] ^
+                      $S3[($R1 >> 16) & 0xff];
+                    $R2^= $t0 + $t1 + ' . $K[++$ki] . ';
+                $R2 = ($R2 >> 1 & 0x7fffffff) | ($R2 << 31);
+                $R3 = ((($R3 >> 31) & 1) | ($R3 << 1)) ^ ($t0 + ($t1 << 1) + ' . $K[++$ki] . ');
+
+                $t0 = $S0[ $R2        & 0xff] ^
+                      $S1[($R2 >>  8) & 0xff] ^
+                      $S2[($R2 >> 16) & 0xff] ^
+                      $S3[($R2 >> 24) & 0xff];
+                $t1 = $S0[($R3 >> 24) & 0xff] ^
+                      $S1[ $R3        & 0xff] ^
+                      $S2[($R3 >>  8) & 0xff] ^
+                      $S3[($R3 >> 16) & 0xff];
+                $R0^= $t0 + $t1 + ' . $K[++$ki] . ';
+                $R0 = ($R0 >> 1 & 0x7fffffff) | ($R0 << 31);
+                $R1 = ((($R1 >> 31) & 1) | ($R1 << 1)) ^ ($t0 + ($t1 << 1) + ' . $K[++$ki] . ');
             ';
-            for ($ki = 40, $i = 0; $i < 8; ++$i) {
-                $decrypt_block.= '
-                    $t0 = $S0[$R0       & 0xff] ^
-                          $S1[$R0 >>  8 & 0xff] ^
-                          $S2[$R0 >> 16 & 0xff] ^
-                          $S3[$R0 >> 24 & 0xff];
-                    $t1 = $S0[$R1 >> 24 & 0xff] ^
-                          $S1[$R1       & 0xff] ^
-                          $S2[$R1 >>  8 & 0xff] ^
-                          $S3[$R1 >> 16 & 0xff];
-                    $R3^= $t0 + ($t1 << 1) + '.$K[--$ki].';
-                    $R3 = $R3 >> 1 & 0x7fffffff | $R3 << 31;
-                    $R2 = ($R2 >> 31 & 0x1 | $R2 << 1) ^ ($t0 + $t1 + '.$K[--$ki].');
-
-                    $t0 = $S0[$R2       & 0xff] ^
-                          $S1[$R2 >>  8 & 0xff] ^
-                          $S2[$R2 >> 16 & 0xff] ^
-                          $S3[$R2 >> 24 & 0xff];
-                    $t1 = $S0[$R3 >> 24 & 0xff] ^
-                          $S1[$R3       & 0xff] ^
-                          $S2[$R3 >>  8 & 0xff] ^
-                          $S3[$R3 >> 16 & 0xff];
-                    $R1^= $t0 + ($t1 << 1) + '.$K[--$ki].';
-                    $R1 = $R1 >> 1 & 0x7fffffff | $R1 << 31;
-                    $R0 = ($R0 >> 31 & 0x1 | $R0 << 1) ^ ($t0 + $t1 + '.$K[--$ki].');
-                ';
-            }
-            $decrypt_block.= '
-                $in = pack("V4", '.$K[0].' ^ $R2,
-                                 '.$K[1].' ^ $R3,
-                                 '.$K[2].' ^ $R0,
-                                 '.$K[3].' ^ $R1);
+        }
+        $encrypt_block .= '
+            $in = pack("V4", ' . $K[4] . ' ^ $R2,
+                             ' . $K[5] . ' ^ $R3,
+                             ' . $K[6] . ' ^ $R0,
+                             ' . $K[7] . ' ^ $R1);
+        ';
+
+        // Generating decrypt code:
+        $decrypt_block = '
+            $in = unpack("V4", $in);
+            $R0 = ' . $K[4] . ' ^ $in[1];
+            $R1 = ' . $K[5] . ' ^ $in[2];
+            $R2 = ' . $K[6] . ' ^ $in[3];
+            $R3 = ' . $K[7] . ' ^ $in[4];
+        ';
+        for ($ki = 40, $i = 0; $i < 8; ++$i) {
+            $decrypt_block .= '
+                $t0 = $S0[$R0       & 0xff] ^
+                      $S1[$R0 >>  8 & 0xff] ^
+                      $S2[$R0 >> 16 & 0xff] ^
+                      $S3[$R0 >> 24 & 0xff];
+                $t1 = $S0[$R1 >> 24 & 0xff] ^
+                      $S1[$R1       & 0xff] ^
+                      $S2[$R1 >>  8 & 0xff] ^
+                      $S3[$R1 >> 16 & 0xff];
+                $R3^= $t0 + ($t1 << 1) + ' . $K[--$ki] . ';
+                $R3 = $R3 >> 1 & 0x7fffffff | $R3 << 31;
+                $R2 = ($R2 >> 31 & 0x1 | $R2 << 1) ^ ($t0 + $t1 + ' . $K[--$ki] . ');
+
+                $t0 = $S0[$R2       & 0xff] ^
+                      $S1[$R2 >>  8 & 0xff] ^
+                      $S2[$R2 >> 16 & 0xff] ^
+                      $S3[$R2 >> 24 & 0xff];
+                $t1 = $S0[$R3 >> 24 & 0xff] ^
+                      $S1[$R3       & 0xff] ^
+                      $S2[$R3 >>  8 & 0xff] ^
+                      $S3[$R3 >> 16 & 0xff];
+                $R1^= $t0 + ($t1 << 1) + ' . $K[--$ki] . ';
+                $R1 = $R1 >> 1 & 0x7fffffff | $R1 << 31;
+                $R0 = ($R0 >> 31 & 0x1 | $R0 << 1) ^ ($t0 + $t1 + ' . $K[--$ki] . ');
             ';
-
-            $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
-                array(
-                   'init_crypt'    => $init_crypt,
-                   'init_encrypt'  => '',
-                   'init_decrypt'  => '',
-                   'encrypt_block' => $encrypt_block,
-                   'decrypt_block' => $decrypt_block
-                )
-            );
         }
-        $this->inline_crypt = $lambda_functions[$code_hash];
+        $decrypt_block .= '
+            $in = pack("V4", ' . $K[0] . ' ^ $R2,
+                             ' . $K[1] . ' ^ $R3,
+                             ' . $K[2] . ' ^ $R0,
+                             ' . $K[3] . ' ^ $R1);
+        ';
+
+        $this->inline_crypt = $this->createInlineCryptFunction(
+            [
+               'init_crypt'    => $init_crypt,
+               'init_encrypt'  => '',
+               'init_decrypt'  => '',
+               'encrypt_block' => $encrypt_block,
+               'decrypt_block' => $decrypt_block,
+            ]
+        );
     }
 }
diff --git a/phpseclib/Exception/BadConfigurationException.php b/phpseclib/Exception/BadConfigurationException.php
index 096148a0d..55972c8cb 100644
--- a/phpseclib/Exception/BadConfigurationException.php
+++ b/phpseclib/Exception/BadConfigurationException.php
@@ -5,22 +5,21 @@
  *
  * PHP version 5
  *
- * @category  Exception
- * @package   BadConfigurationException
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\Exception;
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
 
 /**
  * BadConfigurationException
  *
- * @package BadConfigurationException
  * @author  Jim Wigginton <terrafrost@php.net>
  */
-class BadConfigurationException extends \RuntimeException
+class BadConfigurationException extends \RuntimeException implements ExceptionInterface
 {
 }
diff --git a/phpseclib/Exception/BadDecryptionException.php b/phpseclib/Exception/BadDecryptionException.php
new file mode 100644
index 000000000..6a36691c5
--- /dev/null
+++ b/phpseclib/Exception/BadDecryptionException.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * BadDecryptionException
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
+
+/**
+ * BadDecryptionException
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class BadDecryptionException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/phpseclib/Exception/BadFunctionCallException.php b/phpseclib/Exception/BadFunctionCallException.php
new file mode 100644
index 000000000..f0612382b
--- /dev/null
+++ b/phpseclib/Exception/BadFunctionCallException.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
+
+class BadFunctionCallException extends \BadFunctionCallException implements ExceptionInterface
+{
+}
diff --git a/phpseclib/Exception/BadMethodCallException.php b/phpseclib/Exception/BadMethodCallException.php
new file mode 100644
index 000000000..c429d6946
--- /dev/null
+++ b/phpseclib/Exception/BadMethodCallException.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
+
+class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
+{
+}
diff --git a/phpseclib/Exception/BadModeException.php b/phpseclib/Exception/BadModeException.php
new file mode 100644
index 000000000..22e64459c
--- /dev/null
+++ b/phpseclib/Exception/BadModeException.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * BadModeException
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
+
+/**
+ * BadModeException
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class BadModeException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/phpseclib/Exception/ConnectionClosedException.php b/phpseclib/Exception/ConnectionClosedException.php
new file mode 100644
index 000000000..1f700114e
--- /dev/null
+++ b/phpseclib/Exception/ConnectionClosedException.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * ConnectionClosedException
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
+
+/**
+ * ConnectionClosedException
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class ConnectionClosedException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/phpseclib/Exception/ExceptionInterface.php b/phpseclib/Exception/ExceptionInterface.php
new file mode 100644
index 000000000..7784cec3a
--- /dev/null
+++ b/phpseclib/Exception/ExceptionInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
+
+/**
+ * Used to mark exceptions originating from this library.
+ */
+interface ExceptionInterface
+{
+}
diff --git a/phpseclib/Exception/FileNotFoundException.php b/phpseclib/Exception/FileNotFoundException.php
index 984edfcc7..a39ebc3a8 100644
--- a/phpseclib/Exception/FileNotFoundException.php
+++ b/phpseclib/Exception/FileNotFoundException.php
@@ -5,22 +5,21 @@
  *
  * PHP version 5
  *
- * @category  Exception
- * @package   FileNotFoundException
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\Exception;
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
 
 /**
  * FileNotFoundException
  *
- * @package FileNotFoundException
  * @author  Jim Wigginton <terrafrost@php.net>
  */
-class FileNotFoundException extends \RuntimeException
+class FileNotFoundException extends \RuntimeException implements ExceptionInterface
 {
 }
diff --git a/phpseclib/Exception/InconsistentSetupException.php b/phpseclib/Exception/InconsistentSetupException.php
new file mode 100644
index 000000000..886a9ba8d
--- /dev/null
+++ b/phpseclib/Exception/InconsistentSetupException.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * InconsistentSetupException
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
+
+/**
+ * InconsistentSetupException
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class InconsistentSetupException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/phpseclib/Exception/InsufficientSetupException.php b/phpseclib/Exception/InsufficientSetupException.php
new file mode 100644
index 000000000..f1f13be34
--- /dev/null
+++ b/phpseclib/Exception/InsufficientSetupException.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * InsufficientSetupException
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
+
+/**
+ * InsufficientSetupException
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class InsufficientSetupException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/phpseclib/Exception/InvalidArgumentException.php b/phpseclib/Exception/InvalidArgumentException.php
new file mode 100644
index 000000000..ae9ed1d38
--- /dev/null
+++ b/phpseclib/Exception/InvalidArgumentException.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
+
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/phpseclib/Exception/InvalidPacketLengthException.php b/phpseclib/Exception/InvalidPacketLengthException.php
new file mode 100644
index 000000000..ce4b93f1a
--- /dev/null
+++ b/phpseclib/Exception/InvalidPacketLengthException.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
+
+/**
+ * Indicates an absent or malformed packet length header
+ */
+class InvalidPacketLengthException extends ConnectionClosedException
+{
+}
diff --git a/phpseclib/Exception/LengthException.php b/phpseclib/Exception/LengthException.php
new file mode 100644
index 000000000..186ece270
--- /dev/null
+++ b/phpseclib/Exception/LengthException.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
+
+class LengthException extends \LengthException implements ExceptionInterface
+{
+}
diff --git a/phpseclib/Exception/LogicException.php b/phpseclib/Exception/LogicException.php
new file mode 100644
index 000000000..27e0f8f60
--- /dev/null
+++ b/phpseclib/Exception/LogicException.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
+
+class LogicException extends \LogicException implements ExceptionInterface
+{
+}
diff --git a/phpseclib/Exception/NoKeyLoadedException.php b/phpseclib/Exception/NoKeyLoadedException.php
new file mode 100644
index 000000000..c2c1b62a3
--- /dev/null
+++ b/phpseclib/Exception/NoKeyLoadedException.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * NoKeyLoadedException
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
+
+/**
+ * NoKeyLoadedException
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class NoKeyLoadedException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/phpseclib/Exception/NoSupportedAlgorithmsException.php b/phpseclib/Exception/NoSupportedAlgorithmsException.php
index bca9a753b..e1e2ef994 100644
--- a/phpseclib/Exception/NoSupportedAlgorithmsException.php
+++ b/phpseclib/Exception/NoSupportedAlgorithmsException.php
@@ -5,22 +5,21 @@
  *
  * PHP version 5
  *
- * @category  Exception
- * @package   NoSupportedAlgorithmsException
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\Exception;
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
 
 /**
  * NoSupportedAlgorithmsException
  *
- * @package NoSupportedAlgorithmsException
  * @author  Jim Wigginton <terrafrost@php.net>
  */
-class NoSupportedAlgorithmsException extends \RuntimeException
+class NoSupportedAlgorithmsException extends \RuntimeException implements ExceptionInterface
 {
 }
diff --git a/phpseclib/Exception/OutOfBoundsException.php b/phpseclib/Exception/OutOfBoundsException.php
new file mode 100644
index 000000000..98c2c9560
--- /dev/null
+++ b/phpseclib/Exception/OutOfBoundsException.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
+
+class OutOfBoundsException extends \OutOfBoundsException implements ExceptionInterface
+{
+}
diff --git a/phpseclib/Exception/OutOfRangeException.php b/phpseclib/Exception/OutOfRangeException.php
new file mode 100644
index 000000000..edfe6ecc2
--- /dev/null
+++ b/phpseclib/Exception/OutOfRangeException.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
+
+class OutOfRangeException extends \OutOfRangeException implements ExceptionInterface
+{
+}
diff --git a/phpseclib/Exception/RangeException.php b/phpseclib/Exception/RangeException.php
new file mode 100644
index 000000000..bb3717315
--- /dev/null
+++ b/phpseclib/Exception/RangeException.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
+
+class RangeException extends \RangeException implements ExceptionInterface
+{
+}
diff --git a/phpseclib/Exception/RuntimeException.php b/phpseclib/Exception/RuntimeException.php
new file mode 100644
index 000000000..6915803bb
--- /dev/null
+++ b/phpseclib/Exception/RuntimeException.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
+
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/phpseclib/Exception/TimeoutException.php b/phpseclib/Exception/TimeoutException.php
new file mode 100644
index 000000000..2fc014dd4
--- /dev/null
+++ b/phpseclib/Exception/TimeoutException.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
+
+/**
+ * Indicates a timeout awaiting server response
+ */
+class TimeoutException extends \RuntimeException
+{
+}
diff --git a/phpseclib/Exception/UnableToConnectException.php b/phpseclib/Exception/UnableToConnectException.php
new file mode 100644
index 000000000..df83aa48f
--- /dev/null
+++ b/phpseclib/Exception/UnableToConnectException.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * UnableToConnectException
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
+
+/**
+ * UnableToConnectException
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class UnableToConnectException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/phpseclib/Exception/UnexpectedValueException.php b/phpseclib/Exception/UnexpectedValueException.php
new file mode 100644
index 000000000..11def9cd7
--- /dev/null
+++ b/phpseclib/Exception/UnexpectedValueException.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
+
+class UnexpectedValueException extends \UnexpectedValueException implements ExceptionInterface
+{
+}
diff --git a/phpseclib/Exception/UnsupportedAlgorithmException.php b/phpseclib/Exception/UnsupportedAlgorithmException.php
index 47cc41d4d..d18b71710 100644
--- a/phpseclib/Exception/UnsupportedAlgorithmException.php
+++ b/phpseclib/Exception/UnsupportedAlgorithmException.php
@@ -5,22 +5,21 @@
  *
  * PHP version 5
  *
- * @category  Exception
- * @package   UnsupportedAlgorithmException
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\Exception;
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
 
 /**
  * UnsupportedAlgorithmException
  *
- * @package UnsupportedAlgorithmException
  * @author  Jim Wigginton <terrafrost@php.net>
  */
-class UnsupportedAlgorithmException extends \RuntimeException
+class UnsupportedAlgorithmException extends \RuntimeException implements ExceptionInterface
 {
 }
diff --git a/phpseclib/Exception/UnsupportedCurveException.php b/phpseclib/Exception/UnsupportedCurveException.php
new file mode 100644
index 000000000..3a2e5f531
--- /dev/null
+++ b/phpseclib/Exception/UnsupportedCurveException.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * UnsupportedCurveException
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
+
+/**
+ * UnsupportedCurveException
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class UnsupportedCurveException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/phpseclib/Exception/UnsupportedFormatException.php b/phpseclib/Exception/UnsupportedFormatException.php
new file mode 100644
index 000000000..f1b6c19b8
--- /dev/null
+++ b/phpseclib/Exception/UnsupportedFormatException.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * UnsupportedFormatException
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
+
+/**
+ * UnsupportedFormatException
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class UnsupportedFormatException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/phpseclib/Exception/UnsupportedOperationException.php b/phpseclib/Exception/UnsupportedOperationException.php
new file mode 100644
index 000000000..f0dc01854
--- /dev/null
+++ b/phpseclib/Exception/UnsupportedOperationException.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * UnsupportedOperationException
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Exception;
+
+/**
+ * UnsupportedOperationException
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class UnsupportedOperationException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/phpseclib/File/ANSI.php b/phpseclib/File/ANSI.php
index 1f3eecb30..d07a17cb9 100644
--- a/phpseclib/File/ANSI.php
+++ b/phpseclib/File/ANSI.php
@@ -5,27 +5,25 @@
  *
  * PHP version 5
  *
- * If you call read() in \phpseclib\Net\SSH2 you may get {@link http://en.wikipedia.org/wiki/ANSI_escape_code ANSI escape codes} back.
+ * If you call read() in \phpseclib3\Net\SSH2 you may get {@link http://en.wikipedia.org/wiki/ANSI_escape_code ANSI escape codes} back.
  * They'd look like chr(0x1B) . '[00m' or whatever (0x1B = ESC).  They tell a
  * {@link http://en.wikipedia.org/wiki/Terminal_emulator terminal emulator} how to format the characters, what
- * color to display them in, etc. \phpseclib\File\ANSI is a {@link http://en.wikipedia.org/wiki/VT100 VT100} terminal emulator.
+ * color to display them in, etc. \phpseclib3\File\ANSI is a {@link http://en.wikipedia.org/wiki/VT100 VT100} terminal emulator.
  *
- * @category  File
- * @package   ANSI
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2012 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\File;
+declare(strict_types=1);
+
+namespace phpseclib3\File;
 
 /**
  * Pure-PHP ANSI Decoder
  *
- * @package ANSI
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class ANSI
 {
@@ -33,137 +31,120 @@ class ANSI
      * Max Width
      *
      * @var int
-     * @access private
      */
-    var $max_x;
+    private $max_x;
 
     /**
      * Max Height
      *
      * @var int
-     * @access private
      */
-    var $max_y;
+    private $max_y;
 
     /**
      * Max History
      *
      * @var int
-     * @access private
      */
-    var $max_history;
+    private $max_history;
 
     /**
      * History
      *
      * @var array
-     * @access private
      */
-    var $history;
+    private $history;
 
     /**
      * History Attributes
      *
      * @var array
-     * @access private
      */
-    var $history_attrs;
+    private $history_attrs;
 
     /**
      * Current Column
      *
      * @var int
-     * @access private
      */
-    var $x;
+    private $x;
 
     /**
      * Current Row
      *
      * @var int
-     * @access private
      */
-    var $y;
+    private $y;
 
     /**
      * Old Column
      *
      * @var int
-     * @access private
      */
-    var $old_x;
+    private $old_x;
 
     /**
      * Old Row
      *
      * @var int
-     * @access private
      */
-    var $old_y;
+    private $old_y;
 
     /**
      * An empty attribute cell
      *
      * @var object
-     * @access private
      */
-    var $base_attr_cell;
+    private $base_attr_cell;
 
     /**
      * The current attribute cell
      *
      * @var object
-     * @access private
      */
-    var $attr_cell;
+    private $attr_cell;
 
     /**
      * An empty attribute row
      *
      * @var array
-     * @access private
      */
-    var $attr_row;
+    private $attr_row;
 
     /**
      * The current screen text
      *
-     * @var array
-     * @access private
+     * @var list<string>
      */
-    var $screen;
+    private $screen;
 
     /**
      * The current screen attributes
      *
      * @var array
-     * @access private
      */
-    var $attrs;
+    private $attrs;
 
     /**
      * Current ANSI code
      *
      * @var string
-     * @access private
      */
-    var $ansi;
+    private $ansi;
 
     /**
      * Tokenization
      *
      * @var array
-     * @access private
      */
-    var $tokenization;
+    private $tokenization;
 
     /**
      * Default Constructor.
      *
-     * @return \phpseclib\File\ANSI
-     * @access public
+     * @return ANSI
      */
-    function __construct()
+    public function __construct()
     {
         $attr_cell = new \stdClass();
         $attr_cell->bold = false;
@@ -183,17 +164,13 @@ function __construct()
      * Set terminal width and height
      *
      * Resets the screen as well
-     *
-     * @param int $x
-     * @param int $y
-     * @access public
      */
-    function setDimensions($x, $y)
+    public function setDimensions(int $x, int $y): void
     {
         $this->max_x = $x - 1;
         $this->max_y = $y - 1;
         $this->x = $this->y = 0;
-        $this->history = $this->history_attrs = array();
+        $this->history = $this->history_attrs = [];
         $this->attr_row = array_fill(0, $this->max_x + 2, $this->base_attr_cell);
         $this->screen = array_fill(0, $this->max_y + 1, '');
         $this->attrs = array_fill(0, $this->max_y + 1, $this->attr_row);
@@ -202,23 +179,16 @@ function setDimensions($x, $y)
 
     /**
      * Set the number of lines that should be logged past the terminal height
-     *
-     * @param int $x
-     * @param int $y
-     * @access public
      */
-    function setHistory($history)
+    public function setHistory(int $history): void
     {
         $this->max_history = $history;
     }
 
     /**
      * Load a string
-     *
-     * @param string $source
-     * @access public
      */
-    function loadString($source)
+    public function loadString(string $source): void
     {
         $this->setDimensions($this->max_x + 1, $this->max_y + 1);
         $this->appendString($source);
@@ -226,16 +196,13 @@ function loadString($source)
 
     /**
      * Appdend a string
-     *
-     * @param string $source
-     * @access public
      */
-    function appendString($source)
+    public function appendString(string $source): void
     {
-        $this->tokenization = array('');
+        $this->tokenization = [''];
         for ($i = 0; $i < strlen($source); $i++) {
             if (strlen($this->ansi)) {
-                $this->ansi.= $source[$i];
+                $this->ansi .= $source[$i];
                 $chr = ord($source[$i]);
                 // http://en.wikipedia.org/wiki/ANSI_escape_code#Sequence_elements
                 // single character CSI's not currently supported
@@ -269,10 +236,11 @@ function appendString($source)
                             array_shift($this->history);
                             array_shift($this->history_attrs);
                         }
+                        // fall-through
                     case "\x1B[K": // Clear screen from cursor right
                         $this->screen[$this->y] = substr($this->screen[$this->y], 0, $this->x);
 
-                        array_splice($this->attrs[$this->y], $this->x + 1, $this->max_x - $this->x, array_fill($this->x, $this->max_x - $this->x - 1, $this->base_attr_cell));
+                        array_splice($this->attrs[$this->y], $this->x + 1, $this->max_x - $this->x, array_fill($this->x, $this->max_x - ($this->x - 1), $this->base_attr_cell));
                         break;
                     case "\x1B[2K": // Clear entire line
                         $this->screen[$this->y] = str_repeat(' ', $this->x);
@@ -283,28 +251,31 @@ function appendString($source)
                     case "\x1B(B": // set united states g0 character set
                         break;
                     case "\x1BE": // Move to next line
-                        $this->_newLine();
+                        $this->newLine();
                         $this->x = 0;
                         break;
                     default:
                         switch (true) {
                             case preg_match('#\x1B\[(\d+)B#', $this->ansi, $match): // Move cursor down n lines
                                 $this->old_y = $this->y;
-                                $this->y+= $match[1];
+                                $this->y += (int) $match[1];
                                 break;
                             case preg_match('#\x1B\[(\d+);(\d+)H#', $this->ansi, $match): // Move cursor to screen location v,h
                                 $this->old_x = $this->x;
                                 $this->old_y = $this->y;
                                 $this->x = $match[2] - 1;
-                                $this->y = $match[1] - 1;
+                                $this->y = (int) $match[1] - 1;
                                 break;
                             case preg_match('#\x1B\[(\d+)C#', $this->ansi, $match): // Move cursor right n lines
                                 $this->old_x = $this->x;
-                                $this->x+= $match[1];
+                                $this->x += $match[1];
                                 break;
                             case preg_match('#\x1B\[(\d+)D#', $this->ansi, $match): // Move cursor left n lines
                                 $this->old_x = $this->x;
-                                $this->x-= $match[1];
+                                $this->x -= $match[1];
+                                if ($this->x < 0) {
+                                    $this->x = 0;
+                                }
                                 break;
                             case preg_match('#\x1B\[(\d+);(\d+)r#', $this->ansi, $match): // Set top and bottom lines of a window
                                 break;
@@ -313,19 +284,20 @@ function appendString($source)
                                 $mods = explode(';', $match[1]);
                                 foreach ($mods as $mod) {
                                     switch ($mod) {
-                                        case 0: // Turn off character attributes
+                                        case '':
+                                        case '0': // Turn off character attributes
                                             $attr_cell = clone $this->base_attr_cell;
                                             break;
-                                        case 1: // Turn bold mode on
+                                        case '1': // Turn bold mode on
                                             $attr_cell->bold = true;
                                             break;
-                                        case 4: // Turn underline mode on
+                                        case '4': // Turn underline mode on
                                             $attr_cell->underline = true;
                                             break;
-                                        case 5: // Turn blinking mode on
+                                        case '5': // Turn blinking mode on
                                             $attr_cell->blink = true;
                                             break;
-                                        case 7: // Turn reverse video on
+                                        case '7': // Turn reverse video on
                                             $attr_cell->reverse = !$attr_cell->reverse;
                                             $temp = $attr_cell->background;
                                             $attr_cell->background = $attr_cell->foreground;
@@ -338,23 +310,23 @@ function appendString($source)
                                             $back = &$attr_cell->{ $attr_cell->reverse ? 'foreground' : 'background' };
                                             switch ($mod) {
                                                 // @codingStandardsIgnoreStart
-                                                case 30: $front = 'black'; break;
-                                                case 31: $front = 'red'; break;
-                                                case 32: $front = 'green'; break;
-                                                case 33: $front = 'yellow'; break;
-                                                case 34: $front = 'blue'; break;
-                                                case 35: $front = 'magenta'; break;
-                                                case 36: $front = 'cyan'; break;
-                                                case 37: $front = 'white'; break;
-
-                                                case 40: $back = 'black'; break;
-                                                case 41: $back = 'red'; break;
-                                                case 42: $back = 'green'; break;
-                                                case 43: $back = 'yellow'; break;
-                                                case 44: $back = 'blue'; break;
-                                                case 45: $back = 'magenta'; break;
-                                                case 46: $back = 'cyan'; break;
-                                                case 47: $back = 'white'; break;
+                                                case '30': $front = 'black'; break;
+                                                case '31': $front = 'red'; break;
+                                                case '32': $front = 'green'; break;
+                                                case '33': $front = 'yellow'; break;
+                                                case '34': $front = 'blue'; break;
+                                                case '35': $front = 'magenta'; break;
+                                                case '36': $front = 'cyan'; break;
+                                                case '37': $front = 'white'; break;
+
+                                                case '40': $back = 'black'; break;
+                                                case '41': $back = 'red'; break;
+                                                case '42': $back = 'green'; break;
+                                                case '43': $back = 'yellow'; break;
+                                                case '44': $back = 'blue'; break;
+                                                case '45': $back = 'magenta'; break;
+                                                case '46': $back = 'cyan'; break;
+                                                case '47': $back = 'white'; break;
                                                 // @codingStandardsIgnoreEnd
 
                                                 default:
@@ -373,13 +345,13 @@ function appendString($source)
                 continue;
             }
 
-            $this->tokenization[count($this->tokenization) - 1].= $source[$i];
+            $this->tokenization[count($this->tokenization) - 1] .= $source[$i];
             switch ($source[$i]) {
                 case "\r":
                     $this->x = 0;
                     break;
                 case "\n":
-                    $this->_newLine();
+                    $this->newLine();
                     break;
                 case "\x08": // backspace
                     if ($this->x) {
@@ -400,7 +372,7 @@ function appendString($source)
                     //if (!strlen($this->tokenization[count($this->tokenization) - 1])) {
                     //    array_pop($this->tokenization);
                     //}
-                    $this->ansi.= "\x1B";
+                    $this->ansi .= "\x1B";
                     break;
                 default:
                     $this->attrs[$this->y][$this->x] = clone $this->attr_cell;
@@ -416,7 +388,7 @@ function appendString($source)
 
                     if ($this->x > $this->max_x) {
                         $this->x = 0;
-                        $this->y++;
+                        $this->newLine();
                     } else {
                         $this->x++;
                     }
@@ -428,20 +400,18 @@ function appendString($source)
      * Add a new line
      *
      * Also update the $this->screen and $this->history buffers
-     *
-     * @access private
      */
-    function _newLine()
+    private function newLine(): void
     {
         //if ($this->y < $this->max_y) {
         //    $this->y++;
         //}
 
         while ($this->y >= $this->max_y) {
-            $this->history = array_merge($this->history, array(array_shift($this->screen)));
+            $this->history = array_merge($this->history, [array_shift($this->screen)]);
             $this->screen[] = '';
 
-            $this->history_attrs = array_merge($this->history_attrs, array(array_shift($this->attrs)));
+            $this->history_attrs = array_merge($this->history_attrs, [array_shift($this->attrs)]);
             $this->attrs[] = $this->attr_row;
 
             if (count($this->history) >= $this->max_history) {
@@ -456,11 +426,8 @@ function _newLine()
 
     /**
      * Returns the current coordinate without preformating
-     *
-     * @access private
-     * @return string
      */
-    function _processCoordinate($last_attr, $cur_attr, $char)
+    private function processCoordinate(\stdClass $last_attr, \stdClass $cur_attr, string $char): string
     {
         $output = '';
 
@@ -468,7 +435,7 @@ function _processCoordinate($last_attr, $cur_attr, $char)
             $close = $open = '';
             if ($last_attr->foreground != $cur_attr->foreground) {
                 if ($cur_attr->foreground != 'white') {
-                    $open.= '<span style="color: ' . $cur_attr->foreground . '">';
+                    $open .= '<span style="color: ' . $cur_attr->foreground . '">';
                 }
                 if ($last_attr->foreground != 'white') {
                     $close = '</span>' . $close;
@@ -476,7 +443,7 @@ function _processCoordinate($last_attr, $cur_attr, $char)
             }
             if ($last_attr->background != $cur_attr->background) {
                 if ($cur_attr->background != 'black') {
-                    $open.= '<span style="background: ' . $cur_attr->background . '">';
+                    $open .= '<span style="background: ' . $cur_attr->background . '">';
                 }
                 if ($last_attr->background != 'black') {
                     $close = '</span>' . $close;
@@ -484,89 +451,80 @@ function _processCoordinate($last_attr, $cur_attr, $char)
             }
             if ($last_attr->bold != $cur_attr->bold) {
                 if ($cur_attr->bold) {
-                    $open.= '<b>';
+                    $open .= '<b>';
                 } else {
                     $close = '</b>' . $close;
                 }
             }
             if ($last_attr->underline != $cur_attr->underline) {
                 if ($cur_attr->underline) {
-                    $open.= '<u>';
+                    $open .= '<u>';
                 } else {
                     $close = '</u>' . $close;
                 }
             }
             if ($last_attr->blink != $cur_attr->blink) {
                 if ($cur_attr->blink) {
-                    $open.= '<blink>';
+                    $open .= '<blink>';
                 } else {
                     $close = '</blink>' . $close;
                 }
             }
-            $output.= $close . $open;
+            $output .= $close . $open;
         }
 
-        $output.= htmlspecialchars($char);
+        $output .= htmlspecialchars($char);
 
         return $output;
     }
 
     /**
      * Returns the current screen without preformating
-     *
-     * @access private
-     * @return string
      */
-    function _getScreen()
+    private function getScreenHelper(): string
     {
         $output = '';
         $last_attr = $this->base_attr_cell;
         for ($i = 0; $i <= $this->max_y; $i++) {
             for ($j = 0; $j <= $this->max_x; $j++) {
                 $cur_attr = $this->attrs[$i][$j];
-                $output.= $this->_processCoordinate($last_attr, $cur_attr, isset($this->screen[$i][$j]) ? $this->screen[$i][$j] : '');
+                $output .= $this->processCoordinate($last_attr, $cur_attr, $this->screen[$i][$j] ?? '');
                 $last_attr = $this->attrs[$i][$j];
             }
-            $output.= "\r\n";
+            $output .= "\r\n";
         }
         $output = substr($output, 0, -2);
         // close any remaining open tags
-        $output.= $this->_processCoordinate($last_attr, $this->base_attr_cell, '');
+        $output .= $this->processCoordinate($last_attr, $this->base_attr_cell, '');
         return rtrim($output);
     }
 
     /**
      * Returns the current screen
-     *
-     * @access public
-     * @return string
      */
-    function getScreen()
+    public function getScreen(): string
     {
-        return '<pre width="' . ($this->max_x + 1) . '" style="color: white; background: black">' . $this->_getScreen() . '</pre>';
+        return '<pre width="' . ($this->max_x + 1) . '" style="color: white; background: black">' . $this->getScreenHelper() . '</pre>';
     }
 
     /**
      * Returns the current screen and the x previous lines
-     *
-     * @access public
-     * @return string
      */
-    function getHistory()
+    public function getHistory(): string
     {
         $scrollback = '';
         $last_attr = $this->base_attr_cell;
         for ($i = 0; $i < count($this->history); $i++) {
             for ($j = 0; $j <= $this->max_x + 1; $j++) {
                 $cur_attr = $this->history_attrs[$i][$j];
-                $scrollback.= $this->_processCoordinate($last_attr, $cur_attr, isset($this->history[$i][$j]) ? $this->history[$i][$j] : '');
+                $scrollback .= $this->processCoordinate($last_attr, $cur_attr, $this->history[$i][$j] ?? '');
                 $last_attr = $this->history_attrs[$i][$j];
             }
-            $scrollback.= "\r\n";
+            $scrollback .= "\r\n";
         }
         $base_attr_cell = $this->base_attr_cell;
         $this->base_attr_cell = $last_attr;
-        $scrollback.= $this->_getScreen();
+        $scrollback .= $this->getScreen();
         $this->base_attr_cell = $base_attr_cell;
 
         return '<pre width="' . ($this->max_x + 1) . '" style="color: white; background: black">' . $scrollback . '</span></pre>';
diff --git a/phpseclib/File/ASN1.php b/phpseclib/File/ASN1.php
index 180b0e678..3cc31868d 100644
--- a/phpseclib/File/ASN1.php
+++ b/phpseclib/File/ASN1.php
@@ -9,126 +9,100 @@
  * utilized scheme is DER or the "Distinguished Encoding Rules".  PEM's are base64 encoded
  * DER blobs.
  *
- * \phpseclib\File\ASN1 decodes and encodes DER formatted messages and places them in a semantic context.
+ * \phpseclib3\File\ASN1 decodes and encodes DER formatted messages and places them in a semantic context.
  *
  * Uses the 1988 ASN.1 syntax.
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2012 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\File;
+declare(strict_types=1);
 
-use phpseclib\File\ASN1\Element;
-use phpseclib\Math\BigInteger;
+namespace phpseclib3\File;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\File\ASN1\Element;
+use phpseclib3\Math\BigInteger;
 
 /**
  * Pure-PHP ASN.1 Parser
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
-class ASN1
+abstract class ASN1
 {
-    /**#@+
-     * Tag Classes
-     *
-     * @access private
-     * @link http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#page=12
-     */
-    const CLASS_UNIVERSAL        = 0;
-    const CLASS_APPLICATION      = 1;
-    const CLASS_CONTEXT_SPECIFIC = 2;
-    const CLASS_PRIVATE          = 3;
-    /**#@-*/
-
-    /**#@+
-     * Tag Classes
-     *
-     * @access private
-     * @link http://www.obj-sys.com/asn1tutorial/node124.html
-    */
-    const TYPE_BOOLEAN           = 1;
-    const TYPE_INTEGER           = 2;
-    const TYPE_BIT_STRING        = 3;
-    const TYPE_OCTET_STRING      = 4;
-    const TYPE_NULL              = 5;
-    const TYPE_OBJECT_IDENTIFIER = 6;
+    // Tag Classes
+    // http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#page=12
+    public const CLASS_UNIVERSAL        = 0;
+    public const CLASS_APPLICATION      = 1;
+    public const CLASS_CONTEXT_SPECIFIC = 2;
+    public const CLASS_PRIVATE          = 3;
+
+    // Tag Classes
+    // http://www.obj-sys.com/asn1tutorial/node124.html
+    public const TYPE_BOOLEAN           = 1;
+    public const TYPE_INTEGER           = 2;
+    public const TYPE_BIT_STRING        = 3;
+    public const TYPE_OCTET_STRING      = 4;
+    public const TYPE_NULL              = 5;
+    public const TYPE_OBJECT_IDENTIFIER = 6;
     //const TYPE_OBJECT_DESCRIPTOR = 7;
     //const TYPE_INSTANCE_OF       = 8; // EXTERNAL
-    const TYPE_REAL              = 9;
-    const TYPE_ENUMERATED        = 10;
+    public const TYPE_REAL              = 9;
+    public const TYPE_ENUMERATED        = 10;
     //const TYPE_EMBEDDED          = 11;
-    const TYPE_UTF8_STRING       = 12;
+    public const TYPE_UTF8_STRING       = 12;
     //const TYPE_RELATIVE_OID      = 13;
-    const TYPE_SEQUENCE          = 16; // SEQUENCE OF
-    const TYPE_SET               = 17; // SET OF
-    /**#@-*/
-    /**#@+
-     * More Tag Classes
-     *
-     * @access private
-     * @link http://www.obj-sys.com/asn1tutorial/node10.html
-    */
-    const TYPE_NUMERIC_STRING   = 18;
-    const TYPE_PRINTABLE_STRING = 19;
-    const TYPE_TELETEX_STRING   = 20; // T61String
-    const TYPE_VIDEOTEX_STRING  = 21;
-    const TYPE_IA5_STRING       = 22;
-    const TYPE_UTC_TIME         = 23;
-    const TYPE_GENERALIZED_TIME = 24;
-    const TYPE_GRAPHIC_STRING   = 25;
-    const TYPE_VISIBLE_STRING   = 26; // ISO646String
-    const TYPE_GENERAL_STRING   = 27;
-    const TYPE_UNIVERSAL_STRING = 28;
+    public const TYPE_SEQUENCE          = 16; // SEQUENCE OF
+    public const TYPE_SET               = 17; // SET OF
+
+    // More Tag Classes
+    // http://www.obj-sys.com/asn1tutorial/node10.html
+    public const TYPE_NUMERIC_STRING   = 18;
+    public const TYPE_PRINTABLE_STRING = 19;
+    public const TYPE_TELETEX_STRING   = 20; // T61String
+    public const TYPE_VIDEOTEX_STRING  = 21;
+    public const TYPE_IA5_STRING       = 22;
+    public const TYPE_UTC_TIME         = 23;
+    public const TYPE_GENERALIZED_TIME = 24;
+    public const TYPE_GRAPHIC_STRING   = 25;
+    public const TYPE_VISIBLE_STRING   = 26; // ISO646String
+    public const TYPE_GENERAL_STRING   = 27;
+    public const TYPE_UNIVERSAL_STRING = 28;
     //const TYPE_CHARACTER_STRING = 29;
-    const TYPE_BMP_STRING       = 30;
-    /**#@-*/
+    public const TYPE_BMP_STRING       = 30;
 
-    /**#@+
-     * Tag Aliases
-     *
-     * These tags are kinda place holders for other tags.
-     *
-     * @access private
-    */
-    const TYPE_CHOICE = -1;
-    const TYPE_ANY    = -2;
-    /**#@-*/
+    // Tag Aliases
+    // These tags are kinda place holders for other tags.
+    public const TYPE_CHOICE = -1;
+    public const TYPE_ANY    = -2;
 
     /**
-     * ASN.1 object identifier
+     * ASN.1 object identifiers
      *
      * @var array
-     * @access private
      * @link http://en.wikipedia.org/wiki/Object_identifier
      */
-    var $oids = array();
+    private static $oids = [];
 
     /**
-     * Default date format
+     * ASN.1 object identifier reverse mapping
      *
-     * @var string
-     * @access private
-     * @link http://php.net/class.datetime
+     * @var array
      */
-    var $format = 'D, d M Y H:i:s O';
+    private static $reverseOIDs = [];
 
     /**
      * Default date format
      *
-     * @var array
-     * @access private
-     * @see self::setTimeFormat()
-     * @see self::asn1map()
+     * @var string
      * @link http://php.net/class.datetime
      */
-    var $encoded;
+    private static $format = 'D, d M Y H:i:s O';
 
     /**
      * Filters
@@ -136,22 +110,40 @@ class ASN1
      * If the mapping type is self::TYPE_ANY what do we actually encode it as?
      *
      * @var array
-     * @access private
-     * @see self::_encode_der()
+     * @see self::encode_der()
+     */
+    private static $filters;
+
+    /**
+     * Current Location of most recent ASN.1 encode process
+     *
+     * Useful for debug purposes
+     *
+     * @var array
+     * @see self::encode_der()
+     */
+    private static $location;
+
+    /**
+     * DER Encoded String
+     *
+     * In case we need to create ASN1\Element object's..
+     *
+     * @var string
+     * @see self::decodeDER()
      */
-    var $filters;
+    private static $encoded;
 
     /**
      * Type mapping table for the ANY type.
      *
-     * Structured or unknown types are mapped to a \phpseclib\File\ASN1\Element.
+     * Structured or unknown types are mapped to a \phpseclib3\File\ASN1\Element.
      * Unambiguous types get the direct mapping (int/real/bool).
      * Others are mapped as a choice, with an extra indexing level.
      *
      * @var array
-     * @access public
      */
-    var $ANYmap = array(
+    public const ANY_MAP = [
         self::TYPE_BOOLEAN              => true,
         self::TYPE_INTEGER              => true,
         self::TYPE_BIT_STRING           => 'bitString',
@@ -173,8 +165,8 @@ class ASN1
         self::TYPE_GENERAL_STRING       => 'generalString',
         self::TYPE_UNIVERSAL_STRING     => 'universalString',
         //self::TYPE_CHARACTER_STRING     => 'characterString',
-        self::TYPE_BMP_STRING           => 'bmpString'
-    );
+        self::TYPE_BMP_STRING           => 'bmpString',
+    ];
 
     /**
      * String type to character size mapping table.
@@ -183,9 +175,8 @@ class ASN1
      * size == 0 indicates variable length encoding.
      *
      * @var array
-     * @access public
      */
-    var $stringTypeSize = array(
+    public const STRING_TYPE_SIZE = [
         self::TYPE_UTF8_STRING      => 0,
         self::TYPE_BMP_STRING       => 2,
         self::TYPE_UNIVERSAL_STRING => 4,
@@ -193,26 +184,29 @@ class ASN1
         self::TYPE_TELETEX_STRING   => 1,
         self::TYPE_IA5_STRING       => 1,
         self::TYPE_VISIBLE_STRING   => 1,
-    );
+    ];
 
     /**
      * Parse BER-encoding
      *
      * Serves a similar purpose to openssl's asn1parse
      *
-     * @param string $encoded
-     * @return array
-     * @access public
+     * @param Element|string $encoded
      */
-    function decodeBER($encoded)
+    public static function decodeBER($encoded): ?array
     {
         if ($encoded instanceof Element) {
             $encoded = $encoded->element;
         }
 
-        $this->encoded = $encoded;
-        // encapsulate in an array for BC with the old decodeBER
-        return array($this->_decode_ber($encoded));
+        self::$encoded = $encoded;
+
+        $decoded = self::decode_ber($encoded);
+        if ($decoded === false) {
+            return null;
+        }
+
+        return [$decoded];
     }
 
     /**
@@ -222,17 +216,17 @@ function decodeBER($encoded)
      * $encoded is passed by reference for the recursive calls done for self::TYPE_BIT_STRING and
      * self::TYPE_OCTET_STRING. In those cases, the indefinite length is used.
      *
-     * @param string $encoded
-     * @param int $start
-     * @return array
-     * @access private
+     * @return array|bool
      */
-    function _decode_ber($encoded, $start = 0)
+    private static function decode_ber(string $encoded, int $start = 0, int $encoded_pos = 0)
     {
-        $current = array('start' => $start);
+        $current = ['start' => $start];
 
-        $type = ord($this->_string_shift($encoded));
-        $start++;
+        if (!isset($encoded[$encoded_pos])) {
+            return false;
+        }
+        $type = ord($encoded[$encoded_pos++]);
+        $startOffset = 1;
 
         $constructed = ($type >> 5) & 1;
 
@@ -241,38 +235,54 @@ function _decode_ber($encoded, $start = 0)
             $tag = 0;
             // process septets (since the eighth bit is ignored, it's not an octet)
             do {
-                $loop = ord($encoded[0]) >> 7;
+                if (!isset($encoded[$encoded_pos])) {
+                    return false;
+                }
+                $temp = ord($encoded[$encoded_pos++]);
+                $startOffset++;
+                $loop = $temp >> 7;
                 $tag <<= 7;
-                $tag |= ord($this->_string_shift($encoded)) & 0x7F;
-                $start++;
+                $temp &= 0x7F;
+                // "bits 7 to 1 of the first subsequent octet shall not all be zero"
+                if ($startOffset == 2 && $temp == 0) {
+                    return false;
+                }
+                $tag |= $temp;
             } while ($loop);
         }
 
+        $start += $startOffset;
+
         // Length, as discussed in paragraph 8.1.3 of X.690-0207.pdf#page=13
-        $length = ord($this->_string_shift($encoded));
+        if (!isset($encoded[$encoded_pos])) {
+            return false;
+        }
+        $length = ord($encoded[$encoded_pos++]);
         $start++;
         if ($length == 0x80) { // indefinite length
             // "[A sender shall] use the indefinite form (see 8.1.3.6) if the encoding is constructed and is not all
             //  immediately available." -- paragraph 8.1.3.2.c
-            $length = strlen($encoded);
+            $length = strlen($encoded) - $encoded_pos;
         } elseif ($length & 0x80) { // definite length, long form
             // technically, the long form of the length can be represented by up to 126 octets (bytes), but we'll only
             // support it up to four.
-            $length&= 0x7F;
-            $temp = $this->_string_shift($encoded, $length);
+            $length &= 0x7F;
+            $temp = substr($encoded, $encoded_pos, $length);
+            $encoded_pos += $length;
             // tags of indefinte length don't really have a header length; this length includes the tag
-            $current+= array('headerlength' => $length + 2);
-            $start+= $length;
-            extract(unpack('Nlength', substr(str_pad($temp, 4, chr(0), STR_PAD_LEFT), -4)));
+            $current += ['headerlength' => $length + 2];
+            $start += $length;
+            ['length' => $length] = unpack('Nlength', substr(str_pad($temp, 4, chr(0), STR_PAD_LEFT), -4));
         } else {
-            $current+= array('headerlength' => 2);
+            $current += ['headerlength' => 2];
         }
 
-        if ($length > strlen($encoded)) {
+        if ($length > (strlen($encoded) - $encoded_pos)) {
             return false;
         }
 
-        $content = $this->_string_shift($encoded, $length);
+        $content = substr($encoded, $encoded_pos, $length);
+        $content_pos = 0;
 
         // at this point $length can be overwritten. it's only accurate for definite length things as is
 
@@ -291,33 +301,36 @@ function _decode_ber($encoded, $start = 0)
             case self::CLASS_PRIVATE:
             case self::CLASS_CONTEXT_SPECIFIC:
                 if (!$constructed) {
-                    return array(
+                    return [
                         'type'     => $class,
                         'constant' => $tag,
                         'content'  => $content,
-                        'length'   => $length + $start - $current['start']
-                    );
+                        'length'   => $length + $start - $current['start'],
+                    ] + $current;
                 }
 
-                $newcontent = array();
+                $newcontent = [];
                 $remainingLength = $length;
                 while ($remainingLength > 0) {
-                    $temp = $this->_decode_ber($content, $start);
+                    $temp = self::decode_ber($content, $start, $content_pos);
+                    if ($temp === false) {
+                        break;
+                    }
                     $length = $temp['length'];
                     // end-of-content octets - see paragraph 8.1.5
-                    if (substr($content, $length, 2) == "\0\0") {
-                        $length+= 2;
-                        $start+= $length;
+                    if (substr($content, $content_pos + $length, 2) == "\0\0") {
+                        $length += 2;
+                        $start += $length;
                         $newcontent[] = $temp;
                         break;
                     }
-                    $start+= $length;
-                    $remainingLength-= $length;
+                    $start += $length;
+                    $remainingLength -= $length;
                     $newcontent[] = $temp;
-                    $this->_string_shift($content, $length);
+                    $content_pos += $length;
                 }
 
-                return array(
+                return [
                     'type'     => $class,
                     'constant' => $tag,
                     // the array encapsulation is for BC with the old format
@@ -325,24 +338,27 @@ function _decode_ber($encoded, $start = 0)
                     // the only time when $content['headerlength'] isn't defined is when the length is indefinite.
                     // the absence of $content['headerlength'] is how we know if something is indefinite or not.
                     // technically, it could be defined to be 2 and then another indicator could be used but whatever.
-                    'length'   => $start - $current['start']
-                ) + $current;
+                    'length'   => $start - $current['start'],
+                ] + $current;
         }
 
-        $current+= array('type' => $tag);
+        $current += ['type' => $tag];
 
         // decode UNIVERSAL tags
         switch ($tag) {
             case self::TYPE_BOOLEAN:
                 // "The contents octets shall consist of a single octet." -- paragraph 8.2.1
-                //if (strlen($content) != 1) {
-                //    return false;
-                //}
-                $current['content'] = (bool) ord($content[0]);
+                if ($constructed || strlen($content) != 1) {
+                    return false;
+                }
+                $current['content'] = (bool) ord($content[$content_pos]);
                 break;
             case self::TYPE_INTEGER:
             case self::TYPE_ENUMERATED:
-                $current['content'] = new BigInteger($content, -256);
+                if ($constructed) {
+                    return false;
+                }
+                $current['content'] = new BigInteger(substr($content, $content_pos), -256);
                 break;
             case self::TYPE_REAL: // not currently supported
                 return false;
@@ -351,87 +367,90 @@ function _decode_ber($encoded, $start = 0)
                 // the number of unused bits in the final subsequent octet. The number shall be in the range zero to
                 // seven.
                 if (!$constructed) {
-                    $current['content'] = $content;
+                    $current['content'] = substr($content, $content_pos);
                 } else {
-                    $temp = $this->_decode_ber($content, $start);
-                    $length-= strlen($content);
+                    $temp = self::decode_ber($content, $start, $content_pos);
+                    if ($temp === false) {
+                        return false;
+                    }
+                    $length -= (strlen($content) - $content_pos);
                     $last = count($temp) - 1;
                     for ($i = 0; $i < $last; $i++) {
                         // all subtags should be bit strings
-                        //if ($temp[$i]['type'] != self::TYPE_BIT_STRING) {
-                        //    return false;
-                        //}
-                        $current['content'].= substr($temp[$i]['content'], 1);
+                        if ($temp[$i]['type'] != self::TYPE_BIT_STRING) {
+                            return false;
+                        }
+                        $current['content'] .= substr($temp[$i]['content'], 1);
                     }
                     // all subtags should be bit strings
-                    //if ($temp[$last]['type'] != self::TYPE_BIT_STRING) {
-                    //    return false;
-                    //}
+                    if ($temp[$last]['type'] != self::TYPE_BIT_STRING) {
+                        return false;
+                    }
                     $current['content'] = $temp[$last]['content'][0] . $current['content'] . substr($temp[$i]['content'], 1);
                 }
                 break;
             case self::TYPE_OCTET_STRING:
                 if (!$constructed) {
-                    $current['content'] = $content;
+                    $current['content'] = substr($content, $content_pos);
                 } else {
                     $current['content'] = '';
                     $length = 0;
-                    while (substr($content, 0, 2) != "\0\0") {
-                        $temp = $this->_decode_ber($content, $length + $start);
-                        $this->_string_shift($content, $temp['length']);
+                    while (substr($content, $content_pos, 2) != "\0\0") {
+                        $temp = self::decode_ber($content, $length + $start, $content_pos);
+                        if ($temp === false) {
+                            return false;
+                        }
+                        $content_pos += $temp['length'];
                         // all subtags should be octet strings
-                        //if ($temp['type'] != self::TYPE_OCTET_STRING) {
-                        //    return false;
-                        //}
-                        $current['content'].= $temp['content'];
-                        $length+= $temp['length'];
+                        if ($temp['type'] != self::TYPE_OCTET_STRING) {
+                            return false;
+                        }
+                        $current['content'] .= $temp['content'];
+                        $length += $temp['length'];
                     }
-                    if (substr($content, 0, 2) == "\0\0") {
-                        $length+= 2; // +2 for the EOC
+                    if (substr($content, $content_pos, 2) == "\0\0") {
+                        $length += 2; // +2 for the EOC
                     }
                 }
                 break;
             case self::TYPE_NULL:
                 // "The contents octets shall not contain any octets." -- paragraph 8.8.2
-                //if (strlen($content)) {
-                //    return false;
-                //}
+                if ($constructed || strlen($content)) {
+                    return false;
+                }
                 break;
             case self::TYPE_SEQUENCE:
             case self::TYPE_SET:
+                if (!$constructed) {
+                    return false;
+                }
                 $offset = 0;
-                $current['content'] = array();
-                while (strlen($content)) {
+                $current['content'] = [];
+                $content_len = strlen($content);
+                while ($content_pos < $content_len) {
                     // if indefinite length construction was used and we have an end-of-content string next
                     // see paragraphs 8.1.1.3, 8.1.3.2, 8.1.3.6, 8.1.5, and (for an example) 8.6.4.2
-                    if (!isset($current['headerlength']) && substr($content, 0, 2) == "\0\0") {
+                    if (!isset($current['headerlength']) && substr($content, $content_pos, 2) == "\0\0") {
                         $length = $offset + 2; // +2 for the EOC
                         break 2;
                     }
-                    $temp = $this->_decode_ber($content, $start + $offset);
-                    $this->_string_shift($content, $temp['length']);
+                    $temp = self::decode_ber($content, $start + $offset, $content_pos);
+                    if ($temp === false) {
+                        return false;
+                    }
+                    $content_pos += $temp['length'];
                     $current['content'][] = $temp;
-                    $offset+= $temp['length'];
+                    $offset += $temp['length'];
                 }
                 break;
             case self::TYPE_OBJECT_IDENTIFIER:
-                $temp = ord($this->_string_shift($content));
-                $current['content'] = sprintf('%d.%d', floor($temp / 40), $temp % 40);
-                $valuen = 0;
-                // process septets
-                while (strlen($content)) {
-                    $temp = ord($this->_string_shift($content));
-                    $valuen <<= 7;
-                    $valuen |= $temp & 0x7F;
-                    if (~$temp & 0x80) {
-                        $current['content'].= ".$valuen";
-                        $valuen = 0;
-                    }
+                if ($constructed) {
+                    return false;
+                }
+                $current['content'] = self::decodeOID(substr($content, $content_pos));
+                if ($current['content'] === false) {
+                    return false;
                 }
-                // the eighth bit of the last byte should not be 1
-                //if ($temp >> 7) {
-                //    return false;
-                //}
                 break;
             /* Each character string type shall be encoded as if it had been declared:
                [UNIVERSAL x] IMPLICIT OCTET STRING
@@ -461,18 +480,26 @@ function _decode_ber($encoded, $start = 0)
             case self::TYPE_UTF8_STRING:
                 // ????
             case self::TYPE_BMP_STRING:
-                $current['content'] = $content;
+                if ($constructed) {
+                    return false;
+                }
+                $current['content'] = substr($content, $content_pos);
                 break;
             case self::TYPE_UTC_TIME:
             case self::TYPE_GENERALIZED_TIME:
-                $current['content'] = $this->_decodeTime($content, $tag);
+                if ($constructed) {
+                    return false;
+                }
+                $current['content'] = self::decodeTime(substr($content, $content_pos), $tag);
+                break;
             default:
+                return false;
         }
 
-        $start+= $length;
+        $start += $length;
 
         // ie. length is the length of the full TLV encoding - it's not just the length of the value
-        return $current + array('length' => $start - $current['start']);
+        return $current + ['length' => $start - $current['start']];
     }
 
     /**
@@ -482,13 +509,10 @@ function _decode_ber($encoded, $start = 0)
      *
      * "Special" mappings may be applied on a per tag-name basis via $special.
      *
-     * @param array $decoded
-     * @param array $mapping
-     * @param array $special
-     * @return array
-     * @access public
+     * @param array|bool $decoded
+     * @return array|bool|Element|string|null
      */
-    function asn1map($decoded, $mapping, $special = array())
+    public static function asn1map(array $decoded, array $mapping, array $special = [])
     {
         if (isset($mapping['explicit']) && is_array($decoded['content'])) {
             $decoded = $decoded['content'][0];
@@ -497,12 +521,13 @@ function asn1map($decoded, $mapping, $special = array())
         switch (true) {
             case $mapping['type'] == self::TYPE_ANY:
                 $intype = $decoded['type'];
-                if (isset($decoded['constant']) || !isset($this->ANYmap[$intype]) || ($this->encoded[$decoded['start']] & 0x20)) {
-                    return new Element(substr($this->encoded, $decoded['start'], $decoded['length']));
+                // !isset(self::ANY_MAP[$intype]) produces a fatal error on PHP 5.6
+                if (isset($decoded['constant']) || !array_key_exists($intype, self::ANY_MAP) || (ord(self::$encoded[$decoded['start']]) & 0x20)) {
+                    return new Element(substr(self::$encoded, $decoded['start'], $decoded['length']));
                 }
-                $inmap = $this->ANYmap[$intype];
+                $inmap = self::ANY_MAP[$intype];
                 if (is_string($inmap)) {
-                    return array($inmap => $this->asn1map($decoded, array('type' => $intype) + $mapping, $special));
+                    return [$inmap => self::asn1map($decoded, ['type' => $intype] + $mapping, $special)];
                 }
                 break;
             case $mapping['type'] == self::TYPE_CHOICE:
@@ -510,19 +535,19 @@ function asn1map($decoded, $mapping, $special = array())
                     switch (true) {
                         case isset($option['constant']) && $option['constant'] == $decoded['constant']:
                         case !isset($option['constant']) && $option['type'] == $decoded['type']:
-                            $value = $this->asn1map($decoded, $option, $special);
+                            $value = self::asn1map($decoded, $option, $special);
                             break;
                         case !isset($option['constant']) && $option['type'] == self::TYPE_CHOICE:
-                            $v = $this->asn1map($decoded, $option, $special);
+                            $v = self::asn1map($decoded, $option, $special);
                             if (isset($v)) {
                                 $value = $v;
                             }
                     }
                     if (isset($value)) {
                         if (isset($special[$key])) {
-                            $value = call_user_func($special[$key], $value);
+                            $value = $special[$key]($value);
                         }
-                        return array($key => $value);
+                        return [$key => $value];
                     }
                 }
                 return null;
@@ -548,13 +573,13 @@ function asn1map($decoded, $mapping, $special = array())
 
         switch ($decoded['type']) {
             case self::TYPE_SEQUENCE:
-                $map = array();
+                $map = [];
 
                 // ignore the min and max
                 if (isset($mapping['min']) && isset($mapping['max'])) {
                     $child = $mapping['children'];
                     foreach ($decoded['content'] as $content) {
-                        if (($map[] = $this->asn1map($content, $child, $special)) === null) {
+                        if (($map[] = self::asn1map($content, $child, $special)) === null) {
                             return null;
                         }
                     }
@@ -575,7 +600,7 @@ function asn1map($decoded, $mapping, $special = array())
                             $childClass = $tempClass = self::CLASS_UNIVERSAL;
                             $constant = null;
                             if (isset($temp['constant'])) {
-                                $tempClass = isset($temp['class']) ? $temp['class'] : self::CLASS_CONTEXT_SPECIFIC;
+                                $tempClass = $temp['type'];
                             }
                             if (isset($child['class'])) {
                                 $childClass = $child['class'];
@@ -590,43 +615,43 @@ function asn1map($decoded, $mapping, $special = array())
                                 $maymatch = $constant == $temp['constant'] && $childClass == $tempClass;
                             } else {
                                 // Can only match if no constant expected and type matches or is generic.
-                                $maymatch = !isset($child['constant']) && array_search($child['type'], array($temp['type'], self::TYPE_ANY, self::TYPE_CHOICE)) !== false;
+                                $maymatch = !isset($child['constant']) && array_search($child['type'], [$temp['type'], self::TYPE_ANY, self::TYPE_CHOICE]) !== false;
                             }
                         }
                     }
 
                     if ($maymatch) {
                         // Attempt submapping.
-                        $candidate = $this->asn1map($temp, $child, $special);
+                        $candidate = self::asn1map($temp, $child, $special);
                         $maymatch = $candidate !== null;
                     }
 
                     if ($maymatch) {
                         // Got the match: use it.
                         if (isset($special[$key])) {
-                            $candidate = call_user_func($special[$key], $candidate);
+                            $candidate = $special[$key]($candidate);
                         }
                         $map[$key] = $candidate;
                         $i++;
                     } elseif (isset($child['default'])) {
-                        $map[$key] = $child['default']; // Use default.
+                        $map[$key] = $child['default'];
                     } elseif (!isset($child['optional'])) {
                         return null; // Syntax error.
                     }
                 }
 
                 // Fail mapping if all input items have not been consumed.
-                return $i < $n ? null: $map;
+                return $i < $n ? null : $map;
 
             // the main diff between sets and sequences is the encapsulation of the foreach in another for loop
             case self::TYPE_SET:
-                $map = array();
+                $map = [];
 
                 // ignore the min and max
                 if (isset($mapping['min']) && isset($mapping['max'])) {
                     $child = $mapping['children'];
                     foreach ($decoded['content'] as $content) {
-                        if (($map[] = $this->asn1map($content, $child, $special)) === null) {
+                        if (($map[] = self::asn1map($content, $child, $special)) === null) {
                             return null;
                         }
                     }
@@ -638,7 +663,7 @@ function asn1map($decoded, $mapping, $special = array())
                     $temp = $decoded['content'][$i];
                     $tempClass = self::CLASS_UNIVERSAL;
                     if (isset($temp['constant'])) {
-                        $tempClass = isset($temp['class']) ? $temp['class'] : self::CLASS_CONTEXT_SPECIFIC;
+                        $tempClass = $temp['type'];
                     }
 
                     foreach ($mapping['children'] as $key => $child) {
@@ -662,13 +687,13 @@ function asn1map($decoded, $mapping, $special = array())
                                 $maymatch = $constant == $temp['constant'] && $childClass == $tempClass;
                             } else {
                                 // Can only match if no constant expected and type matches or is generic.
-                                $maymatch = !isset($child['constant']) && array_search($child['type'], array($temp['type'], self::TYPE_ANY, self::TYPE_CHOICE)) !== false;
+                                $maymatch = !isset($child['constant']) && array_search($child['type'], [$temp['type'], self::TYPE_ANY, self::TYPE_CHOICE]) !== false;
                             }
                         }
 
                         if ($maymatch) {
                             // Attempt submapping.
-                            $candidate = $this->asn1map($temp, $child, $special);
+                            $candidate = self::asn1map($temp, $child, $special);
                             $maymatch = $candidate !== null;
                         }
 
@@ -678,7 +703,7 @@ function asn1map($decoded, $mapping, $special = array())
 
                         // Got the match: use it.
                         if (isset($special[$key])) {
-                            $candidate = call_user_func($special[$key], $candidate);
+                            $candidate = $special[$key]($candidate);
                         }
                         $map[$key] = $candidate;
                         break;
@@ -696,13 +721,20 @@ function asn1map($decoded, $mapping, $special = array())
                 }
                 return $map;
             case self::TYPE_OBJECT_IDENTIFIER:
-                return isset($this->oids[$decoded['content']]) ? $this->oids[$decoded['content']] : $decoded['content'];
+                return self::$oids[$decoded['content']] ?? $decoded['content'];
             case self::TYPE_UTC_TIME:
             case self::TYPE_GENERALIZED_TIME:
-                if (isset($mapping['implicit'])) {
-                    $decoded['content'] = $this->_decodeTime($decoded['content'], $decoded['type']);
+                // for explicitly tagged optional stuff
+                if (is_array($decoded['content'])) {
+                    $decoded['content'] = $decoded['content'][0]['content'];
+                }
+                // for implicitly tagged optional stuff
+                // in theory, doing isset($mapping['implicit']) would work but malformed certs do exist
+                // in the wild that OpenSSL decodes without issue so we'll support them as well
+                if (!is_object($decoded['content'])) {
+                    $decoded['content'] = self::decodeTime($decoded['content'], $decoded['type']);
                 }
-                return @date($this->format, $decoded['content']);
+                return $decoded['content'] ? $decoded['content']->format(self::$format) : false;
             case self::TYPE_BIT_STRING:
                 if (isset($mapping['mapping'])) {
                     $offset = ord($decoded['content'][0]);
@@ -715,7 +747,7 @@ function asn1map($decoded, $mapping, $special = array())
                         therefore ensure that different semantics are not associated with such values which differ only in the number of trailing
                         0 bits."
                     */
-                    $bits = count($mapping['mapping']) == $size ? array() : array_fill(0, count($mapping['mapping']) - $size, false);
+                    $bits = count($mapping['mapping']) == $size ? [] : array_fill(0, count($mapping['mapping']) - $size, false);
                     for ($i = strlen($decoded['content']) - 1; $i > 0; $i--) {
                         $current = ord($decoded['content'][$i]);
                         for ($j = $offset; $j < 8; $j++) {
@@ -723,7 +755,7 @@ function asn1map($decoded, $mapping, $special = array())
                         }
                         $offset = 0;
                     }
-                    $values = array();
+                    $values = [];
                     $map = array_reverse($mapping['mapping']);
                     foreach ($map as $i => $value) {
                         if ($bits[$i]) {
@@ -732,12 +764,12 @@ function asn1map($decoded, $mapping, $special = array())
                     }
                     return $values;
                 }
+                // fall-through
             case self::TYPE_OCTET_STRING:
-                return base64_encode($decoded['content']);
+                return $decoded['content'];
             case self::TYPE_NULL:
                 return '';
             case self::TYPE_BOOLEAN:
-                return $decoded['content'];
             case self::TYPE_NUMERIC_STRING:
             case self::TYPE_PRINTABLE_STRING:
             case self::TYPE_TELETEX_STRING:
@@ -758,14 +790,30 @@ function asn1map($decoded, $mapping, $special = array())
                 }
                 if (isset($mapping['mapping'])) {
                     $temp = (int) $temp->toString();
-                    return isset($mapping['mapping'][$temp]) ?
-                        $mapping['mapping'][$temp] :
+                    return $mapping['mapping'][$temp] ??
                         false;
                 }
                 return $temp;
         }
     }
 
+    /**
+     * DER-decode the length
+     *
+     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
+     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
+     */
+    public static function decodeLength(string &$string): int
+    {
+        $length = ord(Strings::shift($string));
+        if ($length & 0x80) { // definite length, long form
+            $length &= 0x7F;
+            $temp = Strings::shift($string, $length);
+            [, $length] = unpack('N', substr(str_pad($temp, 4, chr(0), STR_PAD_LEFT), -4));
+        }
+        return $length;
+    }
+
     /**
      * ASN.1 Encode
      *
@@ -774,29 +822,23 @@ function asn1map($decoded, $mapping, $special = array())
      *
      * "Special" mappings can be applied via $special.
      *
-     * @param string $source
-     * @param string $mapping
-     * @param int $idx
+     * @param Element|string|array $source
      * @return string
-     * @access public
      */
-    function encodeDER($source, $mapping, $special = array())
+    public static function encodeDER($source, array $mapping, array $special = [])
     {
-        $this->location = array();
-        return $this->_encode_der($source, $mapping, null, $special);
+        self::$location = [];
+        return self::encode_der($source, $mapping, null, $special);
     }
 
     /**
      * ASN.1 Encode (Helper function)
      *
-     * @param string $source
-     * @param string $mapping
-     * @param int $idx
+     * @param Element|string|array|null $source
+     * @param string|int|null $idx
      * @return string
-     * @throws \RuntimeException if the input has an error in it
-     * @access private
      */
-    function _encode_der($source, $mapping, $idx = null, $special = array())
+    private static function encode_der($source, array $mapping, $idx = null, array $special = [])
     {
         if ($source instanceof Element) {
             return $source->element;
@@ -809,9 +851,9 @@ function _encode_der($source, $mapping, $idx = null, $special = array())
 
         if (isset($idx)) {
             if (isset($special[$idx])) {
-                $source = call_user_func($special[$idx], $source);
+                $source = $special[$idx]($source);
             }
-            $this->location[] = $idx;
+            self::$location[] = $idx;
         }
 
         $tag = $mapping['type'];
@@ -819,23 +861,33 @@ function _encode_der($source, $mapping, $idx = null, $special = array())
         switch ($tag) {
             case self::TYPE_SET:    // Children order is not important, thus process in sequence.
             case self::TYPE_SEQUENCE:
-                $tag|= 0x20; // set the constructed bit
-                $value = '';
+                $tag |= 0x20; // set the constructed bit
 
                 // ignore the min and max
                 if (isset($mapping['min']) && isset($mapping['max'])) {
+                    $value = [];
                     $child = $mapping['children'];
 
                     foreach ($source as $content) {
-                        $temp = $this->_encode_der($content, $child, null, $special);
+                        $temp = self::encode_der($content, $child, null, $special);
                         if ($temp === false) {
                             return false;
                         }
-                        $value.= $temp;
+                        $value[] = $temp;
+                    }
+                    /* "The encodings of the component values of a set-of value shall appear in ascending order, the encodings being compared
+                        as octet strings with the shorter components being padded at their trailing end with 0-octets.
+                        NOTE - The padding octets are for comparison purposes only and do not appear in the encodings."
+
+                       -- sec 11.6 of http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf  */
+                    if ($mapping['type'] == self::TYPE_SET) {
+                        sort($value);
                     }
+                    $value = implode('', $value);
                     break;
                 }
 
+                $value = '';
                 foreach ($mapping['children'] as $key => $child) {
                     if (!array_key_exists($key, $source)) {
                         if (!isset($child['optional'])) {
@@ -844,7 +896,7 @@ function _encode_der($source, $mapping, $idx = null, $special = array())
                         continue;
                     }
 
-                    $temp = $this->_encode_der($source[$key], $child, $key, $special);
+                    $temp = self::encode_der($source[$key], $child, $key, $special);
                     if ($temp === false) {
                         return false;
                     }
@@ -867,14 +919,26 @@ function _encode_der($source, $mapping, $idx = null, $special = array())
                             an untagged "DummyReference" (see ITU-T Rec. X.683 | ISO/IEC 8824-4, 8.3)."
                          */
                         if (isset($child['explicit']) || $child['type'] == self::TYPE_CHOICE) {
-                            $subtag = chr((self::CLASS_CONTEXT_SPECIFIC << 6) | 0x20 | $child['constant']);
-                            $temp = $subtag . $this->_encodeLength(strlen($temp)) . $temp;
+                            if ($child['constant'] <= 30) {
+                                $subtag = chr((self::CLASS_CONTEXT_SPECIFIC << 6) | 0x20 | $child['constant']);
+                            } else {
+                                $constant = $child['constant'];
+                                $subtag = '';
+                                while ($constant > 0) {
+                                    $subtagvalue = $constant & 0x7F;
+                                    $subtag = (chr(0x80 | $subtagvalue)) . $subtag;
+                                    $constant = $constant >> 7;
+                                }
+                                $subtag[strlen($subtag) - 1] = $subtag[strlen($subtag) - 1] & chr(0x7F);
+                                $subtag = chr((self::CLASS_CONTEXT_SPECIFIC << 6) | 0x20 | 0x1f) . $subtag;
+                            }
+                            $temp = $subtag . self::encodeLength(strlen($temp)) . $temp;
                         } else {
                             $subtag = chr((self::CLASS_CONTEXT_SPECIFIC << 6) | (ord($temp[0]) & 0x20) | $child['constant']);
                             $temp = $subtag . substr($temp, 1);
                         }
                     }
-                    $value.= $temp;
+                    $value .= $temp;
                 }
                 break;
             case self::TYPE_CHOICE:
@@ -885,7 +949,7 @@ function _encode_der($source, $mapping, $idx = null, $special = array())
                         continue;
                     }
 
-                    $temp = $this->_encode_der($source[$key], $child, $key, $special);
+                    $temp = self::encode_der($source[$key], $child, $key, $special);
                     if ($temp === false) {
                         return false;
                     }
@@ -902,7 +966,7 @@ function _encode_der($source, $mapping, $idx = null, $special = array())
                     if (isset($child['constant'])) {
                         if (isset($child['explicit']) || $child['type'] == self::TYPE_CHOICE) {
                             $subtag = chr((self::CLASS_CONTEXT_SPECIFIC << 6) | 0x20 | $child['constant']);
-                            $temp = $subtag . $this->_encodeLength(strlen($temp)) . $temp;
+                            $temp = $subtag . self::encodeLength(strlen($temp)) . $temp;
                         } else {
                             $subtag = chr((self::CLASS_CONTEXT_SPECIFIC << 6) | (ord($temp[0]) & 0x20) | $child['constant']);
                             $temp = $subtag . substr($temp, 1);
@@ -911,7 +975,7 @@ function _encode_der($source, $mapping, $idx = null, $special = array())
                 }
 
                 if (isset($idx)) {
-                    array_pop($this->location);
+                    array_pop(self::$location);
                 }
 
                 if ($temp && isset($mapping['cast'])) {
@@ -941,8 +1005,12 @@ function _encode_der($source, $mapping, $idx = null, $special = array())
             case self::TYPE_UTC_TIME:
             case self::TYPE_GENERALIZED_TIME:
                 $format = $mapping['type'] == self::TYPE_UTC_TIME ? 'y' : 'Y';
-                $format.= 'mdHis';
-                $value = @gmdate($format, strtotime($source)) . 'Z';
+                $format .= 'mdHis';
+                // if $source does _not_ include timezone information within it then assume that the timezone is GMT
+                $date = new \DateTime($source, new \DateTimeZone('GMT'));
+                // if $source _does_ include timezone information within it then convert the time to GMT
+                $date->setTimezone(new \DateTimeZone('GMT'));
+                $value = $date->format($format) . 'Z';
                 break;
             case self::TYPE_BIT_STRING:
                 if (isset($mapping['mapping'])) {
@@ -971,66 +1039,47 @@ function _encode_der($source, $mapping, $idx = null, $special = array())
                     $bits = implode('', array_pad($bits, $size + $offset + 1, 0));
                     $bytes = explode(' ', rtrim(chunk_split($bits, 8, ' ')));
                     foreach ($bytes as $byte) {
-                        $value.= chr(bindec($byte));
+                        $value .= chr(bindec($byte));
                     }
 
                     break;
                 }
+                // fall-through
             case self::TYPE_OCTET_STRING:
                 /* The initial octet shall encode, as an unsigned binary integer with bit 1 as the least significant bit,
                    the number of unused bits in the final subsequent octet. The number shall be in the range zero to seven.
 
                    -- http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#page=16 */
-                $value = base64_decode($source);
+                $value = $source;
                 break;
             case self::TYPE_OBJECT_IDENTIFIER:
-                $oid = preg_match('#(?:\d+\.)+#', $source) ? $source : array_search($source, $this->oids);
-                if ($oid === false) {
-                    throw new \RuntimeException('Invalid OID');
-                    return false;
-                }
-                $value = '';
-                $parts = explode('.', $oid);
-                $value = chr(40 * $parts[0] + $parts[1]);
-                for ($i = 2; $i < count($parts); $i++) {
-                    $temp = '';
-                    if (!$parts[$i]) {
-                        $temp = "\0";
-                    } else {
-                        while ($parts[$i]) {
-                            $temp = chr(0x80 | ($parts[$i] & 0x7F)) . $temp;
-                            $parts[$i] >>= 7;
-                        }
-                        $temp[strlen($temp) - 1] = $temp[strlen($temp) - 1] & chr(0x7F);
-                    }
-                    $value.= $temp;
-                }
+                $value = self::encodeOID($source);
                 break;
             case self::TYPE_ANY:
-                $loc = $this->location;
+                $loc = self::$location;
                 if (isset($idx)) {
-                    array_pop($this->location);
+                    array_pop(self::$location);
                 }
 
                 switch (true) {
                     case !isset($source):
-                        return $this->_encode_der(null, array('type' => self::TYPE_NULL) + $mapping, null, $special);
+                        return self::encode_der(null, ['type' => self::TYPE_NULL] + $mapping, null, $special);
                     case is_int($source):
                     case $source instanceof BigInteger:
-                        return $this->_encode_der($source, array('type' => self::TYPE_INTEGER) + $mapping, null, $special);
+                        return self::encode_der($source, ['type' => self::TYPE_INTEGER] + $mapping, null, $special);
                     case is_float($source):
-                        return $this->_encode_der($source, array('type' => self::TYPE_REAL) + $mapping, null, $special);
+                        return self::encode_der($source, ['type' => self::TYPE_REAL] + $mapping, null, $special);
                     case is_bool($source):
-                        return $this->_encode_der($source, array('type' => self::TYPE_BOOLEAN) + $mapping, null, $special);
+                        return self::encode_der($source, ['type' => self::TYPE_BOOLEAN] + $mapping, null, $special);
                     case is_array($source) && count($source) == 1:
                         $typename = implode('', array_keys($source));
-                        $outtype = array_search($typename, $this->ANYmap, true);
+                        $outtype = array_search($typename, self::ANY_MAP, true);
                         if ($outtype !== false) {
-                            return $this->_encode_der($source[$typename], array('type' => $outtype) + $mapping, null, $special);
+                            return self::encode_der($source[$typename], ['type' => $outtype] + $mapping, null, $special);
                         }
                 }
 
-                $filters = $this->filters;
+                $filters = self::$filters;
                 foreach ($loc as $part) {
                     if (!isset($filters[$part])) {
                         $filters = false;
@@ -1039,10 +1088,9 @@ function _encode_der($source, $mapping, $idx = null, $special = array())
                     $filters = $filters[$part];
                 }
                 if ($filters === false) {
-                    throw new \RuntimeException('No filters defined for ' . implode('/', $loc));
-                    return false;
+                    throw new RuntimeException('No filters defined for ' . implode('/', $loc));
                 }
-                return $this->_encode_der($source, $filters + $mapping, null, $special);
+                return self::encode_der($source, $filters + $mapping, null, $special);
             case self::TYPE_NULL:
                 $value = '';
                 break;
@@ -1063,44 +1111,135 @@ function _encode_der($source, $mapping, $idx = null, $special = array())
                 $value = $source ? "\xFF" : "\x00";
                 break;
             default:
-                throw new \RuntimeException('Mapping provides no type definition for ' . implode('/', $this->location));
-                return false;
+                throw new RuntimeException('Mapping provides no type definition for ' . implode('/', self::$location));
         }
 
         if (isset($idx)) {
-            array_pop($this->location);
+            array_pop(self::$location);
         }
 
         if (isset($mapping['cast'])) {
             if (isset($mapping['explicit']) || $mapping['type'] == self::TYPE_CHOICE) {
-                $value = chr($tag) . $this->_encodeLength(strlen($value)) . $value;
+                $value = chr($tag) . self::encodeLength(strlen($value)) . $value;
                 $tag = ($mapping['class'] << 6) | 0x20 | $mapping['cast'];
             } else {
                 $tag = ($mapping['class'] << 6) | (ord($temp[0]) & 0x20) | $mapping['cast'];
             }
         }
 
-        return chr($tag) . $this->_encodeLength(strlen($value)) . $value;
+        return chr($tag) . self::encodeLength(strlen((string) $value)) . $value;
     }
 
     /**
-     * DER-encode the length
+     * BER-decode the OID
      *
-     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
-     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
+     * Called by _decode_ber()
      *
-     * @access private
-     * @param int $length
      * @return string
      */
-    function _encodeLength($length)
+    public static function decodeOID(string $content)
     {
-        if ($length <= 0x7F) {
-            return chr($length);
+        // BigInteger's are used because of OIDs like 2.25.329800735698586629295641978511506172918
+        // https://healthcaresecprivacy.blogspot.com/2011/02/creating-and-using-unique-id-uuid-oid.html elaborates.
+        static $eighty;
+        if (!$eighty) {
+            $eighty = new BigInteger(80);
         }
 
-        $temp = ltrim(pack('N', $length), chr(0));
-        return pack('Ca*', 0x80 | strlen($temp), $temp);
+        $oid = [];
+        $pos = 0;
+        $len = strlen($content);
+        // see https://github.com/openjdk/jdk/blob/2deb318c9f047ec5a4b160d66a4b52f93688ec42/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java#L55
+        if ($len > 4096) {
+            //throw new \RuntimeException("Object identifier size is limited to 4096 bytes ($len bytes present)");
+            return false;
+        }
+
+        if (ord($content[$len - 1]) & 0x80) {
+            return false;
+        }
+
+        $n = new BigInteger();
+        while ($pos < $len) {
+            $temp = ord($content[$pos++]);
+            $n = $n->bitwise_leftShift(7);
+            $n = $n->bitwise_or(new BigInteger($temp & 0x7F));
+            if (~$temp & 0x80) {
+                $oid[] = $n;
+                $n = new BigInteger();
+            }
+        }
+        $part1 = array_shift($oid);
+        $first = floor(ord($content[0]) / 40);
+        /*
+          "This packing of the first two object identifier components recognizes that only three values are allocated from the root
+           node, and at most 39 subsequent values from nodes reached by X = 0 and X = 1."
+
+          -- https://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#page=22
+        */
+        if ($first <= 2) { // ie. 0 <= ord($content[0]) < 120 (0x78)
+            array_unshift($oid, ord($content[0]) % 40);
+            array_unshift($oid, $first);
+        } else {
+            array_unshift($oid, $part1->subtract($eighty));
+            array_unshift($oid, 2);
+        }
+
+        return implode('.', $oid);
+    }
+
+    /**
+     * DER-encode the OID
+     *
+     * Called by _encode_der()
+     */
+    public static function encodeOID(string $source): string
+    {
+        static $mask, $zero, $forty;
+        if (!$mask) {
+            $mask = new BigInteger(0x7F);
+            $zero = new BigInteger();
+            $forty = new BigInteger(40);
+        }
+
+        if (!preg_match('#(?:\d+\.)+#', $source)) {
+            $oid = self::$reverseOIDs[$source] ?? false;
+        } else {
+            $oid = $source;
+        }
+        if ($oid === false) {
+            throw new RuntimeException('Invalid OID');
+        }
+
+        $parts = explode('.', $oid);
+        $part1 = array_shift($parts);
+        $part2 = array_shift($parts);
+
+        $first = new BigInteger($part1);
+        $first = $first->multiply($forty);
+        $first = $first->add(new BigInteger($part2));
+
+        array_unshift($parts, $first->toString());
+
+        $value = '';
+        foreach ($parts as $part) {
+            if (!$part) {
+                $temp = "\0";
+            } else {
+                $temp = '';
+                $part = new BigInteger($part);
+                while (!$part->equals($zero)) {
+                    $submask = $part->bitwise_and($mask);
+                    $submask->setPrecision(8);
+                    $temp = (chr(0x80) | $submask->toBytes()) . $temp;
+                    $part = $part->bitwise_rightShift(7);
+                }
+                $temp[-1] = $temp[-1] & chr(0x7F);
+            }
+            $value .= $temp;
+        }
+
+        return $value;
     }
 
     /**
@@ -1108,12 +1247,9 @@ function _encodeLength($length)
      *
      * Called by _decode_ber() and in the case of implicit tags asn1map().
      *
-     * @access private
-     * @param string $content
-     * @param int $tag
-     * @return string
+     * @return \DateTime|false
      */
-    function _decodeTime($content, $tag)
+    private static function decodeTime(string $content, int $tag)
     {
         /* UTCTime:
            http://tools.ietf.org/html/rfc5280#section-4.1.2.5.1
@@ -1123,89 +1259,65 @@ function _decodeTime($content, $tag)
            http://tools.ietf.org/html/rfc5280#section-4.1.2.5.2
            http://www.obj-sys.com/asn1tutorial/node14.html */
 
-        $pattern = $tag == self::TYPE_UTC_TIME ?
-            '#(..)(..)(..)(..)(..)(..)(.*)#' :
-            '#(....)(..)(..)(..)(..)(..).*([Z+-].*)$#';
-
-        preg_match($pattern, $content, $matches);
-
-        list(, $year, $month, $day, $hour, $minute, $second, $timezone) = $matches;
+        $format = 'YmdHis';
 
         if ($tag == self::TYPE_UTC_TIME) {
-            $year = $year >= 50 ? "19$year" : "20$year";
+            // https://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#page=28 says "the seconds
+            // element shall always be present" but none-the-less I've seen X509 certs where it isn't and if the
+            // browsers parse it phpseclib ought to too
+            if (preg_match('#^(\d{10})(Z|[+-]\d{4})$#', $content, $matches)) {
+                $content = $matches[1] . '00' . $matches[2];
+            }
+            $prefix = substr($content, 0, 2) >= 50 ? '19' : '20';
+            $content = $prefix . $content;
+        } elseif (str_contains($content, '.')) {
+            $format .= '.u';
         }
 
-        if ($timezone == 'Z') {
-            $mktime = 'gmmktime';
-            $timezone = 0;
-        } elseif (preg_match('#([+-])(\d\d)(\d\d)#', $timezone, $matches)) {
-            $mktime = 'gmmktime';
-            $timezone = 60 * $matches[3] + 3600 * $matches[2];
-            if ($matches[1] == '-') {
-                $timezone = -$timezone;
-            }
-        } else {
-            $mktime = 'mktime';
-            $timezone = 0;
+        if ($content[-1] == 'Z') {
+            $content = substr($content, 0, -1) . '+0000';
+        }
+
+        if (str_contains($content, '-') || str_contains($content, '+')) {
+            $format .= 'O';
         }
 
-        return @$mktime($hour, $minute, $second, $month, $day, $year) + $timezone;
+        // error supression isn't necessary as of PHP 7.0:
+        // http://php.net/manual/en/migration70.other-changes.php
+        return @\DateTime::createFromFormat($format, $content);
     }
 
     /**
      * Set the time format
      *
      * Sets the time / date format for asn1map().
-     *
-     * @access public
-     * @param string $format
      */
-    function setTimeFormat($format)
+    public static function setTimeFormat(string $format): void
     {
-        $this->format = $format;
+        self::$format = $format;
     }
 
     /**
      * Load OIDs
      *
      * Load the relevant OIDs for a particular ASN.1 semantic mapping.
-     *
-     * @access public
-     * @param array $oids
-     */
-    function loadOIDs($oids)
-    {
-        $this->oids = $oids;
-    }
-
-    /**
-     * Load filters
-     *
-     * See \phpseclib\File\X509, etc, for an example.
-     *
-     * @access public
-     * @param array $filters
+     * Previously loaded OIDs are retained.
      */
-    function loadFilters($filters)
+    public static function loadOIDs(array $oids): void
     {
-        $this->filters = $filters;
+        self::$reverseOIDs += $oids;
+        self::$oids = array_flip(self::$reverseOIDs);
     }
 
     /**
-     * String Shift
-     *
-     * Inspired by array_shift
+     * Set filters
      *
-     * @param string $string
-     * @param int $index
-     * @return string
-     * @access private
+     * See \phpseclib3\File\X509, etc, for an example.
+     * Previously loaded filters are not retained.
      */
-    function _string_shift(&$string, $index = 1)
+    public static function setFilters(array $filters): void
     {
-        $substr = substr($string, 0, $index);
-        $string = substr($string, $index);
-        return $substr;
+        self::$filters = $filters;
     }
 
     /**
@@ -1214,19 +1326,16 @@ function _string_shift(&$string, $index = 1)
      * This is a lazy conversion, dealing only with character size.
      * No real conversion table is used.
      *
-     * @param string $in
-     * @param int $from
-     * @param int $to
      * @return string
-     * @access public
      */
-    function convert($in, $from = self::TYPE_UTF8_STRING, $to = self::TYPE_UTF8_STRING)
+    public static function convert(string $in, int $from = self::TYPE_UTF8_STRING, int $to = self::TYPE_UTF8_STRING)
     {
-        if (!isset($this->stringTypeSize[$from]) || !isset($this->stringTypeSize[$to])) {
+        // isset(self::STRING_TYPE_SIZE[$from] returns a fatal error on PHP 5.6
+        if (!array_key_exists($from, self::STRING_TYPE_SIZE) || !array_key_exists($to, self::STRING_TYPE_SIZE)) {
             return false;
         }
-        $insize = $this->stringTypeSize[$from];
-        $outsize = $this->stringTypeSize[$to];
+        $insize = self::STRING_TYPE_SIZE[$from];
+        $outsize = self::STRING_TYPE_SIZE[$to];
         $inlength = strlen($in);
         $out = '';
 
@@ -1241,8 +1350,10 @@ function convert($in, $from = self::TYPE_UTF8_STRING, $to = self::TYPE_UTF8_STRI
                 case $insize == 4:
                     $c = ($c << 8) | ord($in[$i++]);
                     $c = ($c << 8) | ord($in[$i++]);
+                    // fall-through
                 case $insize == 2:
                     $c = ($c << 8) | ord($in[$i++]);
+                    // fall-through
                 case $insize == 1:
                     break;
                 case ($c & 0x80) == 0x00:
@@ -1271,9 +1382,11 @@ function convert($in, $from = self::TYPE_UTF8_STRING, $to = self::TYPE_UTF8_STRI
                     $c >>= 8;
                     $v .= chr($c & 0xFF);
                     $c >>= 8;
+                    // fall-through
                 case $outsize == 2:
                     $v .= chr($c & 0xFF);
                     $c >>= 8;
+                    // fall-through
                 case $outsize == 1:
                     $v .= chr($c & 0xFF);
                     $c >>= 8;
@@ -1281,23 +1394,28 @@ function convert($in, $from = self::TYPE_UTF8_STRING, $to = self::TYPE_UTF8_STRI
                         return false;
                     }
                     break;
-                case ($c & 0x80000000) != 0:
+                case ($c & (PHP_INT_SIZE == 8 ? 0x80000000 : (1 << 31))) != 0:
                     return false;
                 case $c >= 0x04000000:
                     $v .= chr(0x80 | ($c & 0x3F));
                     $c = ($c >> 6) | 0x04000000;
+                    // fall-through
                 case $c >= 0x00200000:
                     $v .= chr(0x80 | ($c & 0x3F));
                     $c = ($c >> 6) | 0x00200000;
+                    // fall-through
                 case $c >= 0x00010000:
                     $v .= chr(0x80 | ($c & 0x3F));
                     $c = ($c >> 6) | 0x00010000;
+                    // fall-through
                 case $c >= 0x00000800:
                     $v .= chr(0x80 | ($c & 0x3F));
                     $c = ($c >> 6) | 0x00000800;
+                    // fall-through
                 case $c >= 0x00000080:
                     $v .= chr(0x80 | ($c & 0x3F));
                     $c = ($c >> 6) | 0x000000C0;
+                    // fall-through
                 default:
                     $v .= chr($c);
                     break;
@@ -1306,4 +1424,68 @@ function convert($in, $from = self::TYPE_UTF8_STRING, $to = self::TYPE_UTF8_STRI
         }
         return $out;
     }
+
+    /**
+     * Extract raw BER from Base64 encoding
+     */
+    public static function extractBER(string $str): string
+    {
+        /* X.509 certs are assumed to be base64 encoded but sometimes they'll have additional things in them
+         * above and beyond the ceritificate.
+         * ie. some may have the following preceding the -----BEGIN CERTIFICATE----- line:
+         *
+         * Bag Attributes
+         *     localKeyID: 01 00 00 00
+         * subject=/O=organization/OU=org unit/CN=common name
+         * issuer=/O=organization/CN=common name
+         */
+        if (strlen($str) > ini_get('pcre.backtrack_limit')) {
+            $temp = $str;
+        } else {
+            $temp = preg_replace('#.*?^-+[^-]+-+[\r\n ]*$#ms', '', $str, 1);
+            $temp = preg_replace('#-+END.*[\r\n ]*.*#ms', '', $temp, 1);
+        }
+        // remove new lines
+        $temp = str_replace(["\r", "\n", ' '], '', $temp);
+        // remove the -----BEGIN CERTIFICATE----- and -----END CERTIFICATE----- stuff
+        $temp = preg_replace('#^-+[^-]+-+|-+[^-]+-+$#', '', $temp);
+        $temp = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $temp) ? Strings::base64_decode($temp) : false;
+        return $temp != false ? $temp : $str;
+    }
+
+    /**
+     * DER-encode the length
+     *
+     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
+     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
+     */
+    public static function encodeLength(int $length): string
+    {
+        if ($length <= 0x7F) {
+            return chr($length);
+        }
+
+        $temp = ltrim(pack('N', $length), chr(0));
+        return pack('Ca*', 0x80 | strlen($temp), $temp);
+    }
+
+    /**
+     * Returns the OID corresponding to a name
+     *
+     * What's returned in the associative array returned by loadX509() (or load*()) is either a name or an OID if
+     * no OID to name mapping is available. The problem with this is that what may be an unmapped OID in one version
+     * of phpseclib may not be unmapped in the next version, so apps that are looking at this OID may not be able
+     * to work from version to version.
+     *
+     * This method will return the OID if a name is passed to it and if no mapping is avialable it'll assume that
+     * what's being passed to it already is an OID and return that instead. A few examples.
+     *
+     * getOID('2.16.840.1.101.3.4.2.1') == '2.16.840.1.101.3.4.2.1'
+     * getOID('id-sha256') == '2.16.840.1.101.3.4.2.1'
+     * getOID('zzz') == 'zzz'
+     */
+    public static function getOID(string $name): string
+    {
+        return self::$reverseOIDs[$name] ?? $name;
+    }
 }
diff --git a/phpseclib/File/ASN1/Element.php b/phpseclib/File/ASN1/Element.php
index 68246e2b5..ae74af3f6 100644
--- a/phpseclib/File/ASN1/Element.php
+++ b/phpseclib/File/ASN1/Element.php
@@ -1,27 +1,27 @@
 <?php
+
 /**
- * Pure-PHP ASN.1 Parser
+ * ASN.1 Raw Element
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2012 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\File\ASN1;
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1;
 
 /**
- * ASN.1 Element
+ * ASN.1 Raw Element
  *
- * Bypass normal encoding rules in phpseclib\File\ASN1::encodeDER()
+ * An ASN.1 ANY mapping will return an ASN1\Element object. Use of this object
+ * will also bypass the normal encoding rules in ASN1::encodeDER()
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class Element
 {
@@ -29,18 +29,15 @@ class Element
      * Raw element value
      *
      * @var string
-     * @access private
      */
-    var $element;
+    public $element;
 
     /**
      * Constructor
      *
-     * @param string $encoded
-     * @return \phpseclib\File\ASN1\Element
-     * @access public
+     * @return Element
      */
-    function __construct($encoded)
+    public function __construct(string $encoded)
     {
         $this->element = $encoded;
     }
diff --git a/phpseclib/File/ASN1/Maps/AccessDescription.php b/phpseclib/File/ASN1/Maps/AccessDescription.php
new file mode 100644
index 000000000..1c996c945
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/AccessDescription.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * AccessDescription
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * AccessDescription
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class AccessDescription
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'accessMethod' => ['type' => ASN1::TYPE_OBJECT_IDENTIFIER],
+            'accessLocation' => GeneralName::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/AdministrationDomainName.php b/phpseclib/File/ASN1/Maps/AdministrationDomainName.php
new file mode 100644
index 000000000..19b724528
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/AdministrationDomainName.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * AdministrationDomainName
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * AdministrationDomainName
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class AdministrationDomainName
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_CHOICE,
+        // if class isn't present it's assumed to be \phpseclib3\File\ASN1::CLASS_UNIVERSAL or
+        // (if constant is present) \phpseclib3\File\ASN1::CLASS_CONTEXT_SPECIFIC
+        'class' => ASN1::CLASS_APPLICATION,
+        'cast' => 2,
+        'children' => [
+            'numeric' => ['type' => ASN1::TYPE_NUMERIC_STRING],
+            'printable' => ['type' => ASN1::TYPE_PRINTABLE_STRING],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/AlgorithmIdentifier.php b/phpseclib/File/ASN1/Maps/AlgorithmIdentifier.php
new file mode 100644
index 000000000..db7e5935d
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/AlgorithmIdentifier.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * AlgorithmIdentifier
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * AlgorithmIdentifier
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class AlgorithmIdentifier
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'algorithm' => ['type' => ASN1::TYPE_OBJECT_IDENTIFIER],
+            'parameters' => [
+                'type' => ASN1::TYPE_ANY,
+                'optional' => true,
+            ],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/AnotherName.php b/phpseclib/File/ASN1/Maps/AnotherName.php
new file mode 100644
index 000000000..987da45c6
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/AnotherName.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * AnotherName
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * AnotherName
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class AnotherName
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'type-id' => ['type' => ASN1::TYPE_OBJECT_IDENTIFIER],
+            'value' => [
+                'type' => ASN1::TYPE_ANY,
+                'constant' => 0,
+                'optional' => true,
+                'explicit' => true,
+            ],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/Attribute.php b/phpseclib/File/ASN1/Maps/Attribute.php
new file mode 100644
index 000000000..9ddde3425
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/Attribute.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Attribute
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * Attribute
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Attribute
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'type' => AttributeType::MAP,
+            'value' => [
+                'type' => ASN1::TYPE_SET,
+                'min' => 1,
+                'max' => -1,
+                'children' => AttributeValue::MAP,
+            ],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/AttributeType.php b/phpseclib/File/ASN1/Maps/AttributeType.php
new file mode 100644
index 000000000..190d425eb
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/AttributeType.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * AttributeType
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * AttributeType
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class AttributeType
+{
+    public const MAP = ['type' => ASN1::TYPE_OBJECT_IDENTIFIER];
+}
diff --git a/phpseclib/File/ASN1/Maps/AttributeTypeAndValue.php b/phpseclib/File/ASN1/Maps/AttributeTypeAndValue.php
new file mode 100644
index 000000000..a4ee96960
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/AttributeTypeAndValue.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * AttributeTypeAndValue
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * AttributeTypeAndValue
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class AttributeTypeAndValue
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'type' => AttributeType::MAP,
+            'value' => AttributeValue::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/AttributeValue.php b/phpseclib/File/ASN1/Maps/AttributeValue.php
new file mode 100644
index 000000000..aa267f95b
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/AttributeValue.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * AttributeValue
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * AttributeValue
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class AttributeValue
+{
+    public const MAP = ['type' => ASN1::TYPE_ANY];
+}
diff --git a/phpseclib/File/ASN1/Maps/Attributes.php b/phpseclib/File/ASN1/Maps/Attributes.php
new file mode 100644
index 000000000..a3417dbbb
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/Attributes.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Attributes
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * Attributes
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Attributes
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SET,
+        'min' => 1,
+        'max' => -1,
+        'children' => Attribute::MAP,
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/AuthorityInfoAccessSyntax.php b/phpseclib/File/ASN1/Maps/AuthorityInfoAccessSyntax.php
new file mode 100644
index 000000000..39198d888
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/AuthorityInfoAccessSyntax.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * AuthorityInfoAccessSyntax
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * AuthorityInfoAccessSyntax
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class AuthorityInfoAccessSyntax
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'min' => 1,
+        'max' => -1,
+        'children' => AccessDescription::MAP,
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/AuthorityKeyIdentifier.php b/phpseclib/File/ASN1/Maps/AuthorityKeyIdentifier.php
new file mode 100644
index 000000000..8654105cf
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/AuthorityKeyIdentifier.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * AuthorityKeyIdentifier
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * AuthorityKeyIdentifier
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class AuthorityKeyIdentifier
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'keyIdentifier' => [
+                'constant' => 0,
+                'optional' => true,
+                'implicit' => true,
+            ] + KeyIdentifier::MAP,
+            'authorityCertIssuer' => [
+                'constant' => 1,
+                'optional' => true,
+                'implicit' => true,
+            ] + GeneralNames::MAP,
+            'authorityCertSerialNumber' => [
+                'constant' => 2,
+                'optional' => true,
+                'implicit' => true,
+            ] + CertificateSerialNumber::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/BaseDistance.php b/phpseclib/File/ASN1/Maps/BaseDistance.php
new file mode 100644
index 000000000..a19d04e73
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/BaseDistance.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * BaseDistance
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * BaseDistance
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class BaseDistance
+{
+    public const MAP = ['type' => ASN1::TYPE_INTEGER];
+}
diff --git a/phpseclib/File/ASN1/Maps/BasicConstraints.php b/phpseclib/File/ASN1/Maps/BasicConstraints.php
new file mode 100644
index 000000000..850b136df
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/BasicConstraints.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * BasicConstraints
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * BasicConstraints
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class BasicConstraints
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'cA' => [
+                'type' => ASN1::TYPE_BOOLEAN,
+                'optional' => true,
+                'default' => false,
+            ],
+            'pathLenConstraint' => [
+                'type' => ASN1::TYPE_INTEGER,
+                'optional' => true,
+            ],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/BuiltInDomainDefinedAttribute.php b/phpseclib/File/ASN1/Maps/BuiltInDomainDefinedAttribute.php
new file mode 100644
index 000000000..ef32fd864
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/BuiltInDomainDefinedAttribute.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * BuiltInDomainDefinedAttribute
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * BuiltInDomainDefinedAttribute
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class BuiltInDomainDefinedAttribute
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'type' => ['type' => ASN1::TYPE_PRINTABLE_STRING],
+            'value' => ['type' => ASN1::TYPE_PRINTABLE_STRING],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/BuiltInDomainDefinedAttributes.php b/phpseclib/File/ASN1/Maps/BuiltInDomainDefinedAttributes.php
new file mode 100644
index 000000000..009981d44
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/BuiltInDomainDefinedAttributes.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * BuiltInDomainDefinedAttributes
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * BuiltInDomainDefinedAttributes
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class BuiltInDomainDefinedAttributes
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'min' => 1,
+        'max' => 4, // ub-domain-defined-attributes
+        'children' => BuiltInDomainDefinedAttribute::MAP,
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/BuiltInStandardAttributes.php b/phpseclib/File/ASN1/Maps/BuiltInStandardAttributes.php
new file mode 100644
index 000000000..01a04092e
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/BuiltInStandardAttributes.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * BuiltInStandardAttributes
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * BuiltInStandardAttributes
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class BuiltInStandardAttributes
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'country-name' => ['optional' => true] + CountryName::MAP,
+            'administration-domain-name' => ['optional' => true] + AdministrationDomainName::MAP,
+            'network-address' => [
+                'constant' => 0,
+                'optional' => true,
+                'implicit' => true,
+            ] + NetworkAddress::MAP,
+            'terminal-identifier' => [
+                'constant' => 1,
+                'optional' => true,
+                'implicit' => true,
+            ] + TerminalIdentifier::MAP,
+            'private-domain-name' => [
+                'constant' => 2,
+                'optional' => true,
+                'explicit' => true,
+            ] + PrivateDomainName::MAP,
+            'organization-name' => [
+                'constant' => 3,
+                'optional' => true,
+                'implicit' => true,
+            ] + OrganizationName::MAP,
+            'numeric-user-identifier' => [
+                'constant' => 4,
+                'optional' => true,
+                'implicit' => true,
+            ] + NumericUserIdentifier::MAP,
+            'personal-name' => [
+                'constant' => 5,
+                'optional' => true,
+                'implicit' => true,
+            ] + PersonalName::MAP,
+            'organizational-unit-names' => [
+                'constant' => 6,
+                'optional' => true,
+                'implicit' => true,
+            ] + OrganizationalUnitNames::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/CPSuri.php b/phpseclib/File/ASN1/Maps/CPSuri.php
new file mode 100644
index 000000000..3da7a0cb0
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/CPSuri.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * CPSuri
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * CPSuri
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class CPSuri
+{
+    public const MAP = ['type' => ASN1::TYPE_IA5_STRING];
+}
diff --git a/phpseclib/File/ASN1/Maps/CRLDistributionPoints.php b/phpseclib/File/ASN1/Maps/CRLDistributionPoints.php
new file mode 100644
index 000000000..c0621b329
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/CRLDistributionPoints.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * CRLDistributionPoints
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * CRLDistributionPoints
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class CRLDistributionPoints
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'min' => 1,
+        'max' => -1,
+        'children' => DistributionPoint::MAP,
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/CRLNumber.php b/phpseclib/File/ASN1/Maps/CRLNumber.php
new file mode 100644
index 000000000..d9284879e
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/CRLNumber.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * CRLNumber
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * CRLNumber
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class CRLNumber
+{
+    public const MAP = ['type' => ASN1::TYPE_INTEGER];
+}
diff --git a/phpseclib/File/ASN1/Maps/CRLReason.php b/phpseclib/File/ASN1/Maps/CRLReason.php
new file mode 100644
index 000000000..02f32ace4
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/CRLReason.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * CRLReason
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * CRLReason
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class CRLReason
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_ENUMERATED,
+        'mapping' => [
+            'unspecified',
+            'keyCompromise',
+            'cACompromise',
+            'affiliationChanged',
+            'superseded',
+            'cessationOfOperation',
+            'certificateHold',
+            // Value 7 is not used.
+            8 => 'removeFromCRL',
+            'privilegeWithdrawn',
+            'aACompromise',
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/CertPolicyId.php b/phpseclib/File/ASN1/Maps/CertPolicyId.php
new file mode 100644
index 000000000..326467e88
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/CertPolicyId.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * CertPolicyId
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * CertPolicyId
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class CertPolicyId
+{
+    public const MAP = ['type' => ASN1::TYPE_OBJECT_IDENTIFIER];
+}
diff --git a/phpseclib/File/ASN1/Maps/Certificate.php b/phpseclib/File/ASN1/Maps/Certificate.php
new file mode 100644
index 000000000..2f72c867d
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/Certificate.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Certificate
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * Certificate
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Certificate
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'tbsCertificate' => TBSCertificate::MAP,
+            'signatureAlgorithm' => AlgorithmIdentifier::MAP,
+            'signature' => ['type' => ASN1::TYPE_BIT_STRING],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/CertificateIssuer.php b/phpseclib/File/ASN1/Maps/CertificateIssuer.php
new file mode 100644
index 000000000..e1df76a49
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/CertificateIssuer.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * CertificateIssuer
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+/**
+ * CertificateIssuer
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class CertificateIssuer
+{
+    public const MAP = GeneralNames::MAP;
+}
diff --git a/phpseclib/File/ASN1/Maps/CertificateList.php b/phpseclib/File/ASN1/Maps/CertificateList.php
new file mode 100644
index 000000000..e8c9208d4
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/CertificateList.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * CertificateList
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * CertificateList
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class CertificateList
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'tbsCertList' => TBSCertList::MAP,
+            'signatureAlgorithm' => AlgorithmIdentifier::MAP,
+            'signature' => ['type' => ASN1::TYPE_BIT_STRING],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/CertificatePolicies.php b/phpseclib/File/ASN1/Maps/CertificatePolicies.php
new file mode 100644
index 000000000..989f36366
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/CertificatePolicies.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * CertificatePolicies
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * CertificatePolicies
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class CertificatePolicies
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'min' => 1,
+        'max' => -1,
+        'children' => PolicyInformation::MAP,
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/CertificateSerialNumber.php b/phpseclib/File/ASN1/Maps/CertificateSerialNumber.php
new file mode 100644
index 000000000..cffb05995
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/CertificateSerialNumber.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * CertificateSerialNumber
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * CertificateSerialNumber
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class CertificateSerialNumber
+{
+    public const MAP = ['type' => ASN1::TYPE_INTEGER];
+}
diff --git a/phpseclib/File/ASN1/Maps/CertificationRequest.php b/phpseclib/File/ASN1/Maps/CertificationRequest.php
new file mode 100644
index 000000000..2c1b91b6d
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/CertificationRequest.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * CertificationRequest
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * CertificationRequest
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class CertificationRequest
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'certificationRequestInfo' => CertificationRequestInfo::MAP,
+            'signatureAlgorithm' => AlgorithmIdentifier::MAP,
+            'signature' => ['type' => ASN1::TYPE_BIT_STRING],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/CertificationRequestInfo.php b/phpseclib/File/ASN1/Maps/CertificationRequestInfo.php
new file mode 100644
index 000000000..0baf1288f
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/CertificationRequestInfo.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * CertificationRequestInfo
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * CertificationRequestInfo
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class CertificationRequestInfo
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'version' => [
+                'type' => ASN1::TYPE_INTEGER,
+                'mapping' => ['v1'],
+            ],
+            'subject' => Name::MAP,
+            'subjectPKInfo' => SubjectPublicKeyInfo::MAP,
+            'attributes' => [
+                'constant' => 0,
+                'optional' => true,
+                'implicit' => true,
+            ] + Attributes::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/Characteristic_two.php b/phpseclib/File/ASN1/Maps/Characteristic_two.php
new file mode 100644
index 000000000..5cf10e1bb
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/Characteristic_two.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Characteristic_two
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * Characteristic_two
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Characteristic_two
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'm' => ['type' => ASN1::TYPE_INTEGER], // field size 2**m
+            'basis' => ['type' => ASN1::TYPE_OBJECT_IDENTIFIER],
+            'parameters' => [
+                'type' => ASN1::TYPE_ANY,
+                'optional' => true,
+            ],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/CountryName.php b/phpseclib/File/ASN1/Maps/CountryName.php
new file mode 100644
index 000000000..d4ce9cdff
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/CountryName.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * CountryName
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * CountryName
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class CountryName
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_CHOICE,
+        // if class isn't present it's assumed to be \phpseclib3\File\ASN1::CLASS_UNIVERSAL or
+        // (if constant is present) \phpseclib3\File\ASN1::CLASS_CONTEXT_SPECIFIC
+        'class' => ASN1::CLASS_APPLICATION,
+        'cast' => 1,
+        'children' => [
+            'x121-dcc-code' => ['type' => ASN1::TYPE_NUMERIC_STRING],
+            'iso-3166-alpha2-code' => ['type' => ASN1::TYPE_PRINTABLE_STRING],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/Curve.php b/phpseclib/File/ASN1/Maps/Curve.php
new file mode 100644
index 000000000..961d47d84
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/Curve.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Curve
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * Curve
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Curve
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'a' => FieldElement::MAP,
+            'b' => FieldElement::MAP,
+            'seed' => [
+                'type' => ASN1::TYPE_BIT_STRING,
+                'optional' => true,
+            ],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/DHParameter.php b/phpseclib/File/ASN1/Maps/DHParameter.php
new file mode 100644
index 000000000..5381e31ba
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/DHParameter.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * DHParameter
+ *
+ * From: https://www.teletrust.de/fileadmin/files/oid/oid_pkcs-3v1-4.pdf#page=6
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * DHParameter
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class DHParameter
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'prime' => ['type' => ASN1::TYPE_INTEGER],
+            'base' => ['type' => ASN1::TYPE_INTEGER],
+            'privateValueLength' => [
+                'type' => ASN1::TYPE_INTEGER,
+                'optional' => true,
+            ],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/DSAParams.php b/phpseclib/File/ASN1/Maps/DSAParams.php
new file mode 100644
index 000000000..c9bb4ff96
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/DSAParams.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * DSAParams
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * DSAParams
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class DSAParams
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'p' => ['type' => ASN1::TYPE_INTEGER],
+            'q' => ['type' => ASN1::TYPE_INTEGER],
+            'g' => ['type' => ASN1::TYPE_INTEGER],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/DSAPrivateKey.php b/phpseclib/File/ASN1/Maps/DSAPrivateKey.php
new file mode 100644
index 000000000..423029c48
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/DSAPrivateKey.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * DSAPrivateKey
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * DSAPrivateKey
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class DSAPrivateKey
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'version' => ['type' => ASN1::TYPE_INTEGER],
+            'p' => ['type' => ASN1::TYPE_INTEGER],
+            'q' => ['type' => ASN1::TYPE_INTEGER],
+            'g' => ['type' => ASN1::TYPE_INTEGER],
+            'y' => ['type' => ASN1::TYPE_INTEGER],
+            'x' => ['type' => ASN1::TYPE_INTEGER],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/DSAPublicKey.php b/phpseclib/File/ASN1/Maps/DSAPublicKey.php
new file mode 100644
index 000000000..3842c3904
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/DSAPublicKey.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * DSAPublicKey
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * DSAPublicKey
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class DSAPublicKey
+{
+    public const MAP = ['type' => ASN1::TYPE_INTEGER];
+}
diff --git a/phpseclib/File/ASN1/Maps/DigestInfo.php b/phpseclib/File/ASN1/Maps/DigestInfo.php
new file mode 100644
index 000000000..6a6a448b1
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/DigestInfo.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * DigestInfo
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * DigestInfo
+ *
+ * from https://tools.ietf.org/html/rfc2898#appendix-A.3
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class DigestInfo
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'digestAlgorithm' => AlgorithmIdentifier::MAP,
+            'digest' => ['type' => ASN1::TYPE_OCTET_STRING],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/DirectoryString.php b/phpseclib/File/ASN1/Maps/DirectoryString.php
new file mode 100644
index 000000000..b92f04fec
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/DirectoryString.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * DirectoryString
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * DirectoryString
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class DirectoryString
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_CHOICE,
+        'children' => [
+            'teletexString' => ['type' => ASN1::TYPE_TELETEX_STRING],
+            'printableString' => ['type' => ASN1::TYPE_PRINTABLE_STRING],
+            'universalString' => ['type' => ASN1::TYPE_UNIVERSAL_STRING],
+            'utf8String' => ['type' => ASN1::TYPE_UTF8_STRING],
+            'bmpString' => ['type' => ASN1::TYPE_BMP_STRING],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/DisplayText.php b/phpseclib/File/ASN1/Maps/DisplayText.php
new file mode 100644
index 000000000..99fbd8f13
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/DisplayText.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * DisplayText
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * DisplayText
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class DisplayText
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_CHOICE,
+        'children' => [
+            'ia5String' => ['type' => ASN1::TYPE_IA5_STRING],
+            'visibleString' => ['type' => ASN1::TYPE_VISIBLE_STRING],
+            'bmpString' => ['type' => ASN1::TYPE_BMP_STRING],
+            'utf8String' => ['type' => ASN1::TYPE_UTF8_STRING],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/DistributionPoint.php b/phpseclib/File/ASN1/Maps/DistributionPoint.php
new file mode 100644
index 000000000..d9cc611a3
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/DistributionPoint.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * DistributionPoint
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * DistributionPoint
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class DistributionPoint
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'distributionPoint' => [
+                'constant' => 0,
+                'optional' => true,
+                'explicit' => true,
+            ] + DistributionPointName::MAP,
+            'reasons' => [
+                'constant' => 1,
+                'optional' => true,
+                'implicit' => true,
+            ] + ReasonFlags::MAP,
+            'cRLIssuer' => [
+                'constant' => 2,
+                'optional' => true,
+                'implicit' => true,
+            ] + GeneralNames::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/DistributionPointName.php b/phpseclib/File/ASN1/Maps/DistributionPointName.php
new file mode 100644
index 000000000..e65eaf233
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/DistributionPointName.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * DistributionPointName
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * DistributionPointName
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class DistributionPointName
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_CHOICE,
+        'children' => [
+            'fullName' => [
+                'constant' => 0,
+                'optional' => true,
+                'implicit' => true,
+            ] + GeneralNames::MAP,
+            'nameRelativeToCRLIssuer' => [
+                'constant' => 1,
+                'optional' => true,
+                'implicit' => true,
+            ] + RelativeDistinguishedName::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/DssSigValue.php b/phpseclib/File/ASN1/Maps/DssSigValue.php
new file mode 100644
index 000000000..60bc9fafc
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/DssSigValue.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * DssSigValue
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * DssSigValue
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class DssSigValue
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'r' => ['type' => ASN1::TYPE_INTEGER],
+            's' => ['type' => ASN1::TYPE_INTEGER],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/ECParameters.php b/phpseclib/File/ASN1/Maps/ECParameters.php
new file mode 100644
index 000000000..63a865027
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/ECParameters.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * ECParameters
+ *
+ * From: https://tools.ietf.org/html/rfc5915
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * ECParameters
+ *
+ *  ECParameters ::= CHOICE {
+ *    namedCurve         OBJECT IDENTIFIER
+ *    -- implicitCurve   NULL
+ *    -- specifiedCurve  SpecifiedECDomain
+ *  }
+ *    -- implicitCurve and specifiedCurve MUST NOT be used in PKIX.
+ *    -- Details for SpecifiedECDomain can be found in [X9.62].
+ *    -- Any future additions to this CHOICE should be coordinated
+ *    -- with ANSI X9.
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class ECParameters
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_CHOICE,
+        'children' => [
+            'namedCurve' => ['type' => ASN1::TYPE_OBJECT_IDENTIFIER],
+            'implicitCurve' => ['type' => ASN1::TYPE_NULL],
+            'specifiedCurve' => SpecifiedECDomain::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/ECPoint.php b/phpseclib/File/ASN1/Maps/ECPoint.php
new file mode 100644
index 000000000..530ebcf72
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/ECPoint.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * ECPoint
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * ECPoint
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class ECPoint
+{
+    public const MAP = ['type' => ASN1::TYPE_OCTET_STRING];
+}
diff --git a/phpseclib/File/ASN1/Maps/ECPrivateKey.php b/phpseclib/File/ASN1/Maps/ECPrivateKey.php
new file mode 100644
index 000000000..e44662965
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/ECPrivateKey.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * ECPrivateKey
+ *
+ * From: https://tools.ietf.org/html/rfc5915
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * ECPrivateKey
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class ECPrivateKey
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'version' => [
+                'type' => ASN1::TYPE_INTEGER,
+                'mapping' => [1 => 'ecPrivkeyVer1'],
+            ],
+            'privateKey' => ['type' => ASN1::TYPE_OCTET_STRING],
+            'parameters' => [
+                'constant' => 0,
+                'optional' => true,
+                'explicit' => true,
+            ] + ECParameters::MAP,
+            'publicKey' => [
+                'type' => ASN1::TYPE_BIT_STRING,
+                'constant' => 1,
+                'optional' => true,
+                'explicit' => true,
+            ],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/EDIPartyName.php b/phpseclib/File/ASN1/Maps/EDIPartyName.php
new file mode 100644
index 000000000..90140976f
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/EDIPartyName.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * EDIPartyName
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * EDIPartyName
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class EDIPartyName
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'nameAssigner' => [
+                'constant' => 0,
+                'optional' => true,
+                'implicit' => true,
+            ] + DirectoryString::MAP,
+            // partyName is technically required but \phpseclib3\File\ASN1 doesn't currently support non-optional constants and
+            // setting it to optional gets the job done in any event.
+            'partyName' => [
+                'constant' => 1,
+                'optional' => true,
+                'implicit' => true,
+            ] + DirectoryString::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/EcdsaSigValue.php b/phpseclib/File/ASN1/Maps/EcdsaSigValue.php
new file mode 100644
index 000000000..0bd080cf1
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/EcdsaSigValue.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * EcdsaSigValue
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * EcdsaSigValue
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class EcdsaSigValue
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'r' => ['type' => ASN1::TYPE_INTEGER],
+            's' => ['type' => ASN1::TYPE_INTEGER],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/EncryptedData.php b/phpseclib/File/ASN1/Maps/EncryptedData.php
new file mode 100644
index 000000000..45835ce8f
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/EncryptedData.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * EncryptedData
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * EncryptedData
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class EncryptedData
+{
+    public const MAP = ['type' => ASN1::TYPE_OCTET_STRING];
+}
diff --git a/phpseclib/File/ASN1/Maps/EncryptedPrivateKeyInfo.php b/phpseclib/File/ASN1/Maps/EncryptedPrivateKeyInfo.php
new file mode 100644
index 000000000..484ab240f
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/EncryptedPrivateKeyInfo.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * EncryptedPrivateKeyInfo
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * EncryptedPrivateKeyInfo
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class EncryptedPrivateKeyInfo
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'encryptionAlgorithm' => AlgorithmIdentifier::MAP,
+            'encryptedData' => EncryptedData::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/ExtKeyUsageSyntax.php b/phpseclib/File/ASN1/Maps/ExtKeyUsageSyntax.php
new file mode 100644
index 000000000..2488345bd
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/ExtKeyUsageSyntax.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * ExtKeyUsageSyntax
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * ExtKeyUsageSyntax
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class ExtKeyUsageSyntax
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'min' => 1,
+        'max' => -1,
+        'children' => KeyPurposeId::MAP,
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/Extension.php b/phpseclib/File/ASN1/Maps/Extension.php
new file mode 100644
index 000000000..a0f3141bf
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/Extension.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * Extension
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * Extension
+ *
+ * A certificate using system MUST reject the certificate if it encounters
+ * a critical extension it does not recognize; however, a non-critical
+ * extension may be ignored if it is not recognized.
+ *
+ * http://tools.ietf.org/html/rfc5280#section-4.2
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Extension
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'extnId' => ['type' => ASN1::TYPE_OBJECT_IDENTIFIER],
+            'critical' => [
+                'type' => ASN1::TYPE_BOOLEAN,
+                'optional' => true,
+                'default' => false,
+            ],
+            'extnValue' => ['type' => ASN1::TYPE_OCTET_STRING],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/ExtensionAttribute.php b/phpseclib/File/ASN1/Maps/ExtensionAttribute.php
new file mode 100644
index 000000000..8afb7078b
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/ExtensionAttribute.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * ExtensionAttribute
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * ExtensionAttribute
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class ExtensionAttribute
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'extension-attribute-type' => [
+                'type' => ASN1::TYPE_PRINTABLE_STRING,
+                'constant' => 0,
+                'optional' => true,
+                'implicit' => true,
+            ],
+            'extension-attribute-value' => [
+                'type' => ASN1::TYPE_ANY,
+                'constant' => 1,
+                'optional' => true,
+                'explicit' => true,
+            ],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/ExtensionAttributes.php b/phpseclib/File/ASN1/Maps/ExtensionAttributes.php
new file mode 100644
index 000000000..e69f48bf3
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/ExtensionAttributes.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * ExtensionAttributes
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * ExtensionAttributes
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class ExtensionAttributes
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SET,
+        'min' => 1,
+        'max' => 256, // ub-extension-attributes
+        'children' => ExtensionAttribute::MAP,
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/Extensions.php b/phpseclib/File/ASN1/Maps/Extensions.php
new file mode 100644
index 000000000..6e9e98c09
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/Extensions.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Extensions
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * Extensions
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Extensions
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'min' => 1,
+        // technically, it's MAX, but we'll assume anything < 0 is MAX
+        'max' => -1,
+        // if 'children' isn't an array then 'min' and 'max' must be defined
+        'children' => Extension::MAP,
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/FieldElement.php b/phpseclib/File/ASN1/Maps/FieldElement.php
new file mode 100644
index 000000000..0c755b3e2
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/FieldElement.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * FieldElement
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * FieldElement
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class FieldElement
+{
+    public const MAP = ['type' => ASN1::TYPE_OCTET_STRING];
+}
diff --git a/phpseclib/File/ASN1/Maps/FieldID.php b/phpseclib/File/ASN1/Maps/FieldID.php
new file mode 100644
index 000000000..bfd557c63
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/FieldID.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * FieldID
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * FieldID
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class FieldID
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'fieldType' => ['type' => ASN1::TYPE_OBJECT_IDENTIFIER],
+            'parameters' => [
+                'type' => ASN1::TYPE_ANY,
+                'optional' => true,
+            ],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/GeneralName.php b/phpseclib/File/ASN1/Maps/GeneralName.php
new file mode 100644
index 000000000..aaa5625b7
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/GeneralName.php
@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * GeneralName
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * GeneralName
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class GeneralName
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_CHOICE,
+        'children' => [
+            'otherName' => [
+                'constant' => 0,
+                'optional' => true,
+                'implicit' => true,
+            ] + AnotherName::MAP,
+            'rfc822Name' => [
+                'type' => ASN1::TYPE_IA5_STRING,
+                'constant' => 1,
+                'optional' => true,
+                'implicit' => true,
+            ],
+            'dNSName' => [
+                'type' => ASN1::TYPE_IA5_STRING,
+                'constant' => 2,
+                'optional' => true,
+                'implicit' => true,
+            ],
+            'x400Address' => [
+                'constant' => 3,
+                'optional' => true,
+                'implicit' => true,
+            ] + ORAddress::MAP,
+            'directoryName' => [
+                'constant' => 4,
+                'optional' => true,
+                'explicit' => true,
+            ] + Name::MAP,
+            'ediPartyName' => [
+                'constant' => 5,
+                'optional' => true,
+                'implicit' => true,
+            ] + EDIPartyName::MAP,
+            'uniformResourceIdentifier' => [
+                'type' => ASN1::TYPE_IA5_STRING,
+                'constant' => 6,
+                'optional' => true,
+                'implicit' => true,
+            ],
+            'iPAddress' => [
+                'type' => ASN1::TYPE_OCTET_STRING,
+                'constant' => 7,
+                'optional' => true,
+                'implicit' => true,
+            ],
+            'registeredID' => [
+                'type' => ASN1::TYPE_OBJECT_IDENTIFIER,
+                'constant' => 8,
+                'optional' => true,
+                'implicit' => true,
+            ],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/GeneralNames.php b/phpseclib/File/ASN1/Maps/GeneralNames.php
new file mode 100644
index 000000000..6f0ddbe40
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/GeneralNames.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * GeneralNames
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * GeneralNames
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class GeneralNames
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'min' => 1,
+        'max' => -1,
+        'children' => GeneralName::MAP,
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/GeneralSubtree.php b/phpseclib/File/ASN1/Maps/GeneralSubtree.php
new file mode 100644
index 000000000..4b4e9290d
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/GeneralSubtree.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * GeneralSubtree
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * GeneralSubtree
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class GeneralSubtree
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'base' => GeneralName::MAP,
+            'minimum' => [
+                'constant' => 0,
+                'optional' => true,
+                'implicit' => true,
+                'default' => '0',
+            ] + BaseDistance::MAP,
+            'maximum' => [
+                'constant' => 1,
+                'optional' => true,
+                'implicit' => true,
+            ] + BaseDistance::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/GeneralSubtrees.php b/phpseclib/File/ASN1/Maps/GeneralSubtrees.php
new file mode 100644
index 000000000..620fa3efe
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/GeneralSubtrees.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * GeneralSubtrees
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * GeneralSubtrees
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class GeneralSubtrees
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'min' => 1,
+        'max' => -1,
+        'children' => GeneralSubtree::MAP,
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/HashAlgorithm.php b/phpseclib/File/ASN1/Maps/HashAlgorithm.php
new file mode 100644
index 000000000..dd65c70ab
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/HashAlgorithm.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * HashAglorithm
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+/**
+ * HashAglorithm
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class HashAlgorithm
+{
+    public const MAP = AlgorithmIdentifier::MAP;
+}
diff --git a/phpseclib/File/ASN1/Maps/HoldInstructionCode.php b/phpseclib/File/ASN1/Maps/HoldInstructionCode.php
new file mode 100644
index 000000000..8f4991423
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/HoldInstructionCode.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * HoldInstructionCode
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * HoldInstructionCode
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class HoldInstructionCode
+{
+    public const MAP = ['type' => ASN1::TYPE_OBJECT_IDENTIFIER];
+}
diff --git a/phpseclib/File/ASN1/Maps/InvalidityDate.php b/phpseclib/File/ASN1/Maps/InvalidityDate.php
new file mode 100644
index 000000000..6d7af4581
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/InvalidityDate.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * InvalidityDate
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * InvalidityDate
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class InvalidityDate
+{
+    public const MAP = ['type' => ASN1::TYPE_GENERALIZED_TIME];
+}
diff --git a/phpseclib/File/ASN1/Maps/IssuerAltName.php b/phpseclib/File/ASN1/Maps/IssuerAltName.php
new file mode 100644
index 000000000..d4c69dd74
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/IssuerAltName.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * IssuerAltName
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+/**
+ * IssuerAltName
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class IssuerAltName
+{
+    public const MAP = GeneralNames::MAP;
+}
diff --git a/phpseclib/File/ASN1/Maps/IssuingDistributionPoint.php b/phpseclib/File/ASN1/Maps/IssuingDistributionPoint.php
new file mode 100644
index 000000000..47f60c8b5
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/IssuingDistributionPoint.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * IssuingDistributionPoint
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * IssuingDistributionPoint
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class IssuingDistributionPoint
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'distributionPoint' => [
+                'constant' => 0,
+                'optional' => true,
+                'explicit' => true,
+            ] + DistributionPointName::MAP,
+            'onlyContainsUserCerts' => [
+                'type' => ASN1::TYPE_BOOLEAN,
+                'constant' => 1,
+                'optional' => true,
+                'default' => false,
+                'implicit' => true,
+            ],
+            'onlyContainsCACerts' => [
+                'type' => ASN1::TYPE_BOOLEAN,
+                'constant' => 2,
+                'optional' => true,
+                'default' => false,
+                'implicit' => true,
+            ],
+            'onlySomeReasons' => [
+                'constant' => 3,
+                'optional' => true,
+                'implicit' => true,
+            ] + ReasonFlags::MAP,
+            'indirectCRL' => [
+                'type' => ASN1::TYPE_BOOLEAN,
+                'constant' => 4,
+                'optional' => true,
+                'default' => false,
+                'implicit' => true,
+            ],
+            'onlyContainsAttributeCerts' => [
+                'type' => ASN1::TYPE_BOOLEAN,
+                'constant' => 5,
+                'optional' => true,
+                'default' => false,
+                'implicit' => true,
+            ],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/KeyIdentifier.php b/phpseclib/File/ASN1/Maps/KeyIdentifier.php
new file mode 100644
index 000000000..753050e91
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/KeyIdentifier.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * KeyIdentifier
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * KeyIdentifier
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class KeyIdentifier
+{
+    public const MAP = ['type' => ASN1::TYPE_OCTET_STRING];
+}
diff --git a/phpseclib/File/ASN1/Maps/KeyPurposeId.php b/phpseclib/File/ASN1/Maps/KeyPurposeId.php
new file mode 100644
index 000000000..f82705c63
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/KeyPurposeId.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * KeyPurposeId
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * KeyPurposeId
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class KeyPurposeId
+{
+    public const MAP = ['type' => ASN1::TYPE_OBJECT_IDENTIFIER];
+}
diff --git a/phpseclib/File/ASN1/Maps/KeyUsage.php b/phpseclib/File/ASN1/Maps/KeyUsage.php
new file mode 100644
index 000000000..3b028aa80
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/KeyUsage.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * KeyUsage
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * KeyUsage
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class KeyUsage
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_BIT_STRING,
+        'mapping' => [
+            'digitalSignature',
+            'nonRepudiation',
+            'keyEncipherment',
+            'dataEncipherment',
+            'keyAgreement',
+            'keyCertSign',
+            'cRLSign',
+            'encipherOnly',
+            'decipherOnly',
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/MaskGenAlgorithm.php b/phpseclib/File/ASN1/Maps/MaskGenAlgorithm.php
new file mode 100644
index 000000000..097a35dd6
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/MaskGenAlgorithm.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * MaskGenAglorithm
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+/**
+ * MaskGenAglorithm
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class MaskGenAlgorithm
+{
+    public const MAP = AlgorithmIdentifier::MAP;
+}
diff --git a/phpseclib/File/ASN1/Maps/Name.php b/phpseclib/File/ASN1/Maps/Name.php
new file mode 100644
index 000000000..0b7740a45
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/Name.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Name
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * Name
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Name
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_CHOICE,
+        'children' => [
+            'rdnSequence' => RDNSequence::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/NameConstraints.php b/phpseclib/File/ASN1/Maps/NameConstraints.php
new file mode 100644
index 000000000..bf8e199ca
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/NameConstraints.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * NameConstraints
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * NameConstraints
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class NameConstraints
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'permittedSubtrees' => [
+                'constant' => 0,
+                'optional' => true,
+                'implicit' => true,
+            ] + GeneralSubtrees::MAP,
+            'excludedSubtrees' => [
+                'constant' => 1,
+                'optional' => true,
+                'implicit' => true,
+            ] + GeneralSubtrees::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/NetworkAddress.php b/phpseclib/File/ASN1/Maps/NetworkAddress.php
new file mode 100644
index 000000000..582820fb9
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/NetworkAddress.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * NetworkAddress
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * NetworkAddress
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class NetworkAddress
+{
+    public const MAP = ['type' => ASN1::TYPE_NUMERIC_STRING];
+}
diff --git a/phpseclib/File/ASN1/Maps/NoticeReference.php b/phpseclib/File/ASN1/Maps/NoticeReference.php
new file mode 100644
index 000000000..58778dd41
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/NoticeReference.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * NoticeReference
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * NoticeReference
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class NoticeReference
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'organization' => DisplayText::MAP,
+            'noticeNumbers' => [
+                'type' => ASN1::TYPE_SEQUENCE,
+                'min' => 1,
+                'max' => 200,
+                'children' => ['type' => ASN1::TYPE_INTEGER],
+            ],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/NumericUserIdentifier.php b/phpseclib/File/ASN1/Maps/NumericUserIdentifier.php
new file mode 100644
index 000000000..caaae9797
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/NumericUserIdentifier.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * NumericUserIdentifier
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * NumericUserIdentifier
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class NumericUserIdentifier
+{
+    public const MAP = ['type' => ASN1::TYPE_NUMERIC_STRING];
+}
diff --git a/phpseclib/File/ASN1/Maps/ORAddress.php b/phpseclib/File/ASN1/Maps/ORAddress.php
new file mode 100644
index 000000000..a3ccde97d
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/ORAddress.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * ORAddress
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * ORAddress
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class ORAddress
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'built-in-standard-attributes' => BuiltInStandardAttributes::MAP,
+            'built-in-domain-defined-attributes' => ['optional' => true] + BuiltInDomainDefinedAttributes::MAP,
+            'extension-attributes' => ['optional' => true] + ExtensionAttributes::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/OneAsymmetricKey.php b/phpseclib/File/ASN1/Maps/OneAsymmetricKey.php
new file mode 100644
index 000000000..366b403e3
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/OneAsymmetricKey.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * OneAsymmetricKey
+ *
+ * See https://tools.ietf.org/html/rfc5958
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * OneAsymmetricKey
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class OneAsymmetricKey
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'version' => [
+                'type' => ASN1::TYPE_INTEGER,
+                'mapping' => ['v1', 'v2'],
+            ],
+            'privateKeyAlgorithm' => AlgorithmIdentifier::MAP,
+            'privateKey' => PrivateKey::MAP,
+            'attributes' => [
+                'constant' => 0,
+                'optional' => true,
+                'implicit' => true,
+            ] + Attributes::MAP,
+            'publicKey' => [
+                'constant' => 1,
+                'optional' => true,
+                'implicit' => true,
+            ] + PublicKey::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/OrganizationName.php b/phpseclib/File/ASN1/Maps/OrganizationName.php
new file mode 100644
index 000000000..2f87c3b40
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/OrganizationName.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * OrganizationName
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * OrganizationName
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class OrganizationName
+{
+    public const MAP = ['type' => ASN1::TYPE_PRINTABLE_STRING];
+}
diff --git a/phpseclib/File/ASN1/Maps/OrganizationalUnitNames.php b/phpseclib/File/ASN1/Maps/OrganizationalUnitNames.php
new file mode 100644
index 000000000..247a3c3f2
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/OrganizationalUnitNames.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * OrganizationalUnitNames
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * OrganizationalUnitNames
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class OrganizationalUnitNames
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'min' => 1,
+        'max' => 4, // ub-organizational-units
+        'children' => ['type' => ASN1::TYPE_PRINTABLE_STRING],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/OtherPrimeInfo.php b/phpseclib/File/ASN1/Maps/OtherPrimeInfo.php
new file mode 100644
index 000000000..2edf22fd7
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/OtherPrimeInfo.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * OtherPrimeInfo
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * OtherPrimeInfo
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class OtherPrimeInfo
+{
+    // version must be multi if otherPrimeInfos present
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'prime' => ['type' => ASN1::TYPE_INTEGER],      // ri
+            'exponent' => ['type' => ASN1::TYPE_INTEGER],   // di
+            'coefficient' => ['type' => ASN1::TYPE_INTEGER], // ti
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/OtherPrimeInfos.php b/phpseclib/File/ASN1/Maps/OtherPrimeInfos.php
new file mode 100644
index 000000000..4953dd8ca
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/OtherPrimeInfos.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * OtherPrimeInfos
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * OtherPrimeInfos
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class OtherPrimeInfos
+{
+    // version must be multi if otherPrimeInfos present
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'min' => 1,
+        'max' => -1,
+        'children' => OtherPrimeInfo::MAP,
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/PBEParameter.php b/phpseclib/File/ASN1/Maps/PBEParameter.php
new file mode 100644
index 000000000..cd1c88aae
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/PBEParameter.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * PBEParameter
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * PBEParameter
+ *
+ * from https://tools.ietf.org/html/rfc2898#appendix-A.3
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PBEParameter
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'salt' => ['type' => ASN1::TYPE_OCTET_STRING],
+            'iterationCount' => ['type' => ASN1::TYPE_INTEGER],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/PBES2params.php b/phpseclib/File/ASN1/Maps/PBES2params.php
new file mode 100644
index 000000000..415b6f7e0
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/PBES2params.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * PBES2params
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * PBES2params
+ *
+ * from https://tools.ietf.org/html/rfc2898#appendix-A.3
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PBES2params
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'keyDerivationFunc' => AlgorithmIdentifier::MAP,
+            'encryptionScheme' => AlgorithmIdentifier::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/PBKDF2params.php b/phpseclib/File/ASN1/Maps/PBKDF2params.php
new file mode 100644
index 000000000..d3d089ad1
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/PBKDF2params.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * PBKDF2params
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * PBKDF2params
+ *
+ * from https://tools.ietf.org/html/rfc2898#appendix-A.3
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PBKDF2params
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            // technically, this is a CHOICE in RFC2898 but the other "choice" is, currently, more of a placeholder
+            // in the RFC
+            'salt' => ['type' => ASN1::TYPE_OCTET_STRING],
+            'iterationCount' => ['type' => ASN1::TYPE_INTEGER],
+            'keyLength' => [
+                'type' => ASN1::TYPE_INTEGER,
+                'optional' => true,
+            ],
+            'prf' => AlgorithmIdentifier::MAP + ['optional' => true],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/PBMAC1params.php b/phpseclib/File/ASN1/Maps/PBMAC1params.php
new file mode 100644
index 000000000..ee114b61d
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/PBMAC1params.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * PBMAC1params
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * PBMAC1params
+ *
+ * from https://tools.ietf.org/html/rfc2898#appendix-A.3
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PBMAC1params
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'keyDerivationFunc' => AlgorithmIdentifier::MAP,
+            'messageAuthScheme' => AlgorithmIdentifier::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/PKCS9String.php b/phpseclib/File/ASN1/Maps/PKCS9String.php
new file mode 100644
index 000000000..e5b380669
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/PKCS9String.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * PKCS9String
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * PKCS9String
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PKCS9String
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_CHOICE,
+        'children' => [
+            'ia5String' => ['type' => ASN1::TYPE_IA5_STRING],
+            'directoryString' => DirectoryString::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/Pentanomial.php b/phpseclib/File/ASN1/Maps/Pentanomial.php
new file mode 100644
index 000000000..48a4b77a0
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/Pentanomial.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Pentanomial
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * Pentanomial
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Pentanomial
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'k1' => ['type' => ASN1::TYPE_INTEGER], // k1 > 0
+            'k2' => ['type' => ASN1::TYPE_INTEGER], // k2 > k1
+            'k3' => ['type' => ASN1::TYPE_INTEGER], // k3 > h2
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/PersonalName.php b/phpseclib/File/ASN1/Maps/PersonalName.php
new file mode 100644
index 000000000..d84c85887
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/PersonalName.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * PersonalName
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * PersonalName
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PersonalName
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SET,
+        'children' => [
+            'surname' => [
+                'type' => ASN1::TYPE_PRINTABLE_STRING,
+                'constant' => 0,
+                'optional' => true,
+                'implicit' => true,
+            ],
+            'given-name' => [
+                'type' => ASN1::TYPE_PRINTABLE_STRING,
+                'constant' => 1,
+                'optional' => true,
+                'implicit' => true,
+            ],
+            'initials' => [
+                'type' => ASN1::TYPE_PRINTABLE_STRING,
+                'constant' => 2,
+                'optional' => true,
+                'implicit' => true,
+            ],
+            'generation-qualifier' => [
+                'type' => ASN1::TYPE_PRINTABLE_STRING,
+                'constant' => 3,
+                'optional' => true,
+                'implicit' => true,
+            ],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/PolicyInformation.php b/phpseclib/File/ASN1/Maps/PolicyInformation.php
new file mode 100644
index 000000000..d735eb61d
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/PolicyInformation.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * PolicyInformation
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * PolicyInformation
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PolicyInformation
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'policyIdentifier' => CertPolicyId::MAP,
+            'policyQualifiers' => [
+                'type' => ASN1::TYPE_SEQUENCE,
+                'min' => 0,
+                'max' => -1,
+                'optional' => true,
+                'children' => PolicyQualifierInfo::MAP,
+            ],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/PolicyMappings.php b/phpseclib/File/ASN1/Maps/PolicyMappings.php
new file mode 100644
index 000000000..ab29466ae
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/PolicyMappings.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * PolicyMappings
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * PolicyMappings
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PolicyMappings
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'min' => 1,
+        'max' => -1,
+        'children' => [
+            'type' => ASN1::TYPE_SEQUENCE,
+            'children' => [
+                'issuerDomainPolicy' => CertPolicyId::MAP,
+                'subjectDomainPolicy' => CertPolicyId::MAP,
+            ],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/PolicyQualifierId.php b/phpseclib/File/ASN1/Maps/PolicyQualifierId.php
new file mode 100644
index 000000000..5557505eb
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/PolicyQualifierId.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * PolicyQualifierId
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * PolicyQualifierId
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PolicyQualifierId
+{
+    public const MAP = ['type' => ASN1::TYPE_OBJECT_IDENTIFIER];
+}
diff --git a/phpseclib/File/ASN1/Maps/PolicyQualifierInfo.php b/phpseclib/File/ASN1/Maps/PolicyQualifierInfo.php
new file mode 100644
index 000000000..3f9de69ad
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/PolicyQualifierInfo.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * PolicyQualifierInfo
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * PolicyQualifierInfo
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PolicyQualifierInfo
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'policyQualifierId' => PolicyQualifierId::MAP,
+            'qualifier' => ['type' => ASN1::TYPE_ANY],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/PostalAddress.php b/phpseclib/File/ASN1/Maps/PostalAddress.php
new file mode 100644
index 000000000..77c95b6b4
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/PostalAddress.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * PostalAddress
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * PostalAddress
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PostalAddress
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'optional' => true,
+        'min' => 1,
+        'max' => -1,
+        'children' => DirectoryString::MAP,
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/Prime_p.php b/phpseclib/File/ASN1/Maps/Prime_p.php
new file mode 100644
index 000000000..4209140ce
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/Prime_p.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Prime_p
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * Prime_p
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Prime_p
+{
+    public const MAP = ['type' => ASN1::TYPE_INTEGER];
+}
diff --git a/phpseclib/File/ASN1/Maps/PrivateDomainName.php b/phpseclib/File/ASN1/Maps/PrivateDomainName.php
new file mode 100644
index 000000000..efb21a31e
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/PrivateDomainName.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * PrivateDomainName
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * PrivateDomainName
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PrivateDomainName
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_CHOICE,
+        'children' => [
+            'numeric' => ['type' => ASN1::TYPE_NUMERIC_STRING],
+            'printable' => ['type' => ASN1::TYPE_PRINTABLE_STRING],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/PrivateKey.php b/phpseclib/File/ASN1/Maps/PrivateKey.php
new file mode 100644
index 000000000..c7f8f92fa
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/PrivateKey.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * PrivateKey
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * PrivateKey
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PrivateKey
+{
+    public const MAP = ['type' => ASN1::TYPE_OCTET_STRING];
+}
diff --git a/phpseclib/File/ASN1/Maps/PrivateKeyInfo.php b/phpseclib/File/ASN1/Maps/PrivateKeyInfo.php
new file mode 100644
index 000000000..84146b8c9
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/PrivateKeyInfo.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * PrivateKeyInfo
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * PrivateKeyInfo
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PrivateKeyInfo
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'version' => [
+                'type' => ASN1::TYPE_INTEGER,
+                'mapping' => ['v1'],
+            ],
+            'privateKeyAlgorithm' => AlgorithmIdentifier::MAP,
+            'privateKey' => PrivateKey::MAP,
+            'attributes' => [
+                'constant' => 0,
+                'optional' => true,
+                'implicit' => true,
+            ] + Attributes::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/PrivateKeyUsagePeriod.php b/phpseclib/File/ASN1/Maps/PrivateKeyUsagePeriod.php
new file mode 100644
index 000000000..2c78812c5
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/PrivateKeyUsagePeriod.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * PrivateKeyUsagePeriod
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * PrivateKeyUsagePeriod
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PrivateKeyUsagePeriod
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'notBefore' => [
+                'constant' => 0,
+                'optional' => true,
+                'implicit' => true,
+                'type' => ASN1::TYPE_GENERALIZED_TIME, ],
+            'notAfter' => [
+                'constant' => 1,
+                'optional' => true,
+                'implicit' => true,
+                'type' => ASN1::TYPE_GENERALIZED_TIME, ],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/PublicKey.php b/phpseclib/File/ASN1/Maps/PublicKey.php
new file mode 100644
index 000000000..576f1e65c
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/PublicKey.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * PublicKey
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * PublicKey
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PublicKey
+{
+    public const MAP = ['type' => ASN1::TYPE_BIT_STRING];
+}
diff --git a/phpseclib/File/ASN1/Maps/PublicKeyAndChallenge.php b/phpseclib/File/ASN1/Maps/PublicKeyAndChallenge.php
new file mode 100644
index 000000000..d725c58d5
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/PublicKeyAndChallenge.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * PublicKeyAndChallenge
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * PublicKeyAndChallenge
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PublicKeyAndChallenge
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'spki' => SubjectPublicKeyInfo::MAP,
+            'challenge' => ['type' => ASN1::TYPE_IA5_STRING],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/PublicKeyInfo.php b/phpseclib/File/ASN1/Maps/PublicKeyInfo.php
new file mode 100644
index 000000000..0bf91cc6d
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/PublicKeyInfo.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * PublicKeyInfo
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * PublicKeyInfo
+ *
+ * this format is not formally defined anywhere but is none-the-less the form you
+ * get when you do "openssl rsa -in private.pem -outform PEM -pubout"
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PublicKeyInfo
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'publicKeyAlgorithm' => AlgorithmIdentifier::MAP,
+            'publicKey' => ['type' => ASN1::TYPE_BIT_STRING],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/RC2CBCParameter.php b/phpseclib/File/ASN1/Maps/RC2CBCParameter.php
new file mode 100644
index 000000000..22b8096f5
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/RC2CBCParameter.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * RC2CBCParameter
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * RC2CBCParameter
+ *
+ * from https://tools.ietf.org/html/rfc2898#appendix-A.3
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class RC2CBCParameter
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'rc2ParametersVersion' => [
+                'type' => ASN1::TYPE_INTEGER,
+                'optional' => true,
+            ],
+            'iv' => ['type' => ASN1::TYPE_OCTET_STRING],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/RDNSequence.php b/phpseclib/File/ASN1/Maps/RDNSequence.php
new file mode 100644
index 000000000..9c3a39816
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/RDNSequence.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * RDNSequence
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * RDNSequence
+ *
+ * In practice, RDNs containing multiple name-value pairs (called "multivalued RDNs") are rare,
+ * but they can be useful at times when either there is no unique attribute in the entry or you
+ * want to ensure that the entry's DN contains some useful identifying information.
+ *
+ * - https://www.opends.org/wiki/page/DefinitionRelativeDistinguishedName
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class RDNSequence
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        // RDNSequence does not define a min or a max, which means it doesn't have one
+        'min' => 0,
+        'max' => -1,
+        'children' => RelativeDistinguishedName::MAP,
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/RSAPrivateKey.php b/phpseclib/File/ASN1/Maps/RSAPrivateKey.php
new file mode 100644
index 000000000..3084a5e2c
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/RSAPrivateKey.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * RSAPrivateKey
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * RSAPrivateKey
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class RSAPrivateKey
+{
+    // version must be multi if otherPrimeInfos present
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'version' => [
+                'type' => ASN1::TYPE_INTEGER,
+                'mapping' => ['two-prime', 'multi'],
+            ],
+            'modulus' => ['type' => ASN1::TYPE_INTEGER],         // n
+            'publicExponent' => ['type' => ASN1::TYPE_INTEGER],  // e
+            'privateExponent' => ['type' => ASN1::TYPE_INTEGER], // d
+            'prime1' => ['type' => ASN1::TYPE_INTEGER],          // p
+            'prime2' => ['type' => ASN1::TYPE_INTEGER],          // q
+            'exponent1' => ['type' => ASN1::TYPE_INTEGER],       // d mod (p-1)
+            'exponent2' => ['type' => ASN1::TYPE_INTEGER],       // d mod (q-1)
+            'coefficient' => ['type' => ASN1::TYPE_INTEGER],     // (inverse of q) mod p
+            'otherPrimeInfos' => OtherPrimeInfos::MAP + ['optional' => true],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/RSAPublicKey.php b/phpseclib/File/ASN1/Maps/RSAPublicKey.php
new file mode 100644
index 000000000..5ac03f579
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/RSAPublicKey.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * RSAPublicKey
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * RSAPublicKey
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class RSAPublicKey
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'modulus' => ['type' => ASN1::TYPE_INTEGER],
+            'publicExponent' => ['type' => ASN1::TYPE_INTEGER],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/RSASSA_PSS_params.php b/phpseclib/File/ASN1/Maps/RSASSA_PSS_params.php
new file mode 100644
index 000000000..b640d3bc7
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/RSASSA_PSS_params.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * RSASSA_PSS_params
+ *
+ * As defined in https://tools.ietf.org/html/rfc4055#section-3.1
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * RSASSA_PSS_params
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class RSASSA_PSS_params
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'hashAlgorithm' => [
+                'constant' => 0,
+                'optional' => true,
+                'explicit' => true,
+                //'default'  => 'sha1Identifier'
+            ] + HashAlgorithm::MAP,
+            'maskGenAlgorithm' => [
+                'constant' => 1,
+                'optional' => true,
+                'explicit' => true,
+                //'default'  => 'mgf1SHA1Identifier'
+            ] + MaskGenAlgorithm::MAP,
+            'saltLength' => [
+                'type' => ASN1::TYPE_INTEGER,
+                'constant' => 2,
+                'optional' => true,
+                'explicit' => true,
+                'default' => 20,
+            ],
+            'trailerField' => [
+                'type' => ASN1::TYPE_INTEGER,
+                'constant' => 3,
+                'optional' => true,
+                'explicit' => true,
+                'default' => 1,
+            ],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/ReasonFlags.php b/phpseclib/File/ASN1/Maps/ReasonFlags.php
new file mode 100644
index 000000000..6b9600cce
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/ReasonFlags.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * ReasonFlags
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * ReasonFlags
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class ReasonFlags
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_BIT_STRING,
+        'mapping' => [
+            'unused',
+            'keyCompromise',
+            'cACompromise',
+            'affiliationChanged',
+            'superseded',
+            'cessationOfOperation',
+            'certificateHold',
+            'privilegeWithdrawn',
+            'aACompromise',
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/RelativeDistinguishedName.php b/phpseclib/File/ASN1/Maps/RelativeDistinguishedName.php
new file mode 100644
index 000000000..3e14f2e3d
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/RelativeDistinguishedName.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * RelativeDistinguishedName
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * RelativeDistinguishedName
+ *
+ * In practice, RDNs containing multiple name-value pairs (called "multivalued RDNs") are rare,
+ * but they can be useful at times when either there is no unique attribute in the entry or you
+ * want to ensure that the entry's DN contains some useful identifying information.
+ *
+ * - https://www.opends.org/wiki/page/DefinitionRelativeDistinguishedName
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class RelativeDistinguishedName
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SET,
+        'min' => 1,
+        'max' => -1,
+        'children' => AttributeTypeAndValue::MAP,
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/RevokedCertificate.php b/phpseclib/File/ASN1/Maps/RevokedCertificate.php
new file mode 100644
index 000000000..f96c63286
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/RevokedCertificate.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * RevokedCertificate
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * RevokedCertificate
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class RevokedCertificate
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'userCertificate' => CertificateSerialNumber::MAP,
+            'revocationDate' => Time::MAP,
+            'crlEntryExtensions' => [
+                'optional' => true,
+            ] + Extensions::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/SignedPublicKeyAndChallenge.php b/phpseclib/File/ASN1/Maps/SignedPublicKeyAndChallenge.php
new file mode 100644
index 000000000..efb33a954
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/SignedPublicKeyAndChallenge.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * SignedPublicKeyAndChallenge
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * SignedPublicKeyAndChallenge
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class SignedPublicKeyAndChallenge
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'publicKeyAndChallenge' => PublicKeyAndChallenge::MAP,
+            'signatureAlgorithm' => AlgorithmIdentifier::MAP,
+            'signature' => ['type' => ASN1::TYPE_BIT_STRING],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/SpecifiedECDomain.php b/phpseclib/File/ASN1/Maps/SpecifiedECDomain.php
new file mode 100644
index 000000000..e958a9ba4
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/SpecifiedECDomain.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * SpecifiedECDomain
+ *
+ * From: http://www.secg.org/sec1-v2.pdf#page=109
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * SpecifiedECDomain
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class SpecifiedECDomain
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'version' => [
+                'type' => ASN1::TYPE_INTEGER,
+                'mapping' => [1 => 'ecdpVer1', 'ecdpVer2', 'ecdpVer3'],
+            ],
+            'fieldID' => FieldID::MAP,
+            'curve' => Curve::MAP,
+            'base' => ECPoint::MAP,
+            'order' => ['type' => ASN1::TYPE_INTEGER],
+            'cofactor' => [
+                'type' => ASN1::TYPE_INTEGER,
+                'optional' => true,
+            ],
+            'hash' => ['optional' => true] + HashAlgorithm::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/SubjectAltName.php b/phpseclib/File/ASN1/Maps/SubjectAltName.php
new file mode 100644
index 000000000..7fa74c21f
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/SubjectAltName.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * SubjectAltName
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+/**
+ * SubjectAltName
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class SubjectAltName
+{
+    public const MAP = GeneralNames::MAP;
+}
diff --git a/phpseclib/File/ASN1/Maps/SubjectDirectoryAttributes.php b/phpseclib/File/ASN1/Maps/SubjectDirectoryAttributes.php
new file mode 100644
index 000000000..7cd72ec10
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/SubjectDirectoryAttributes.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * SubjectDirectoryAttributes
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * SubjectDirectoryAttributes
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class SubjectDirectoryAttributes
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'min' => 1,
+        'max' => -1,
+        'children' => Attribute::MAP,
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/SubjectInfoAccessSyntax.php b/phpseclib/File/ASN1/Maps/SubjectInfoAccessSyntax.php
new file mode 100644
index 000000000..967d58b79
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/SubjectInfoAccessSyntax.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * SubjectInfoAccessSyntax
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * SubjectInfoAccessSyntax
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class SubjectInfoAccessSyntax
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'min' => 1,
+        'max' => -1,
+        'children' => AccessDescription::MAP,
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/SubjectPublicKeyInfo.php b/phpseclib/File/ASN1/Maps/SubjectPublicKeyInfo.php
new file mode 100644
index 000000000..aeedc7409
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/SubjectPublicKeyInfo.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * SubjectPublicKeyInfo
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * SubjectPublicKeyInfo
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class SubjectPublicKeyInfo
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'algorithm' => AlgorithmIdentifier::MAP,
+            'subjectPublicKey' => ['type' => ASN1::TYPE_BIT_STRING],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/TBSCertList.php b/phpseclib/File/ASN1/Maps/TBSCertList.php
new file mode 100644
index 000000000..49f216c11
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/TBSCertList.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * TBSCertList
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * TBSCertList
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class TBSCertList
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'version' => [
+                'type' => ASN1::TYPE_INTEGER,
+                'mapping' => ['v1', 'v2'],
+                'optional' => true,
+                'default' => 'v1',
+            ],
+            'signature' => AlgorithmIdentifier::MAP,
+            'issuer' => Name::MAP,
+            'thisUpdate' => Time::MAP,
+            'nextUpdate' => [
+                'optional' => true,
+            ] + Time::MAP,
+            'revokedCertificates' => [
+                'type' => ASN1::TYPE_SEQUENCE,
+                'optional' => true,
+                'min' => 0,
+                'max' => -1,
+                'children' => RevokedCertificate::MAP,
+            ],
+            'crlExtensions' => [
+                'constant' => 0,
+                'optional' => true,
+                'explicit' => true,
+            ] + Extensions::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/TBSCertificate.php b/phpseclib/File/ASN1/Maps/TBSCertificate.php
new file mode 100644
index 000000000..08a62588b
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/TBSCertificate.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * TBSCertificate
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * TBSCertificate
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class TBSCertificate
+{
+    // assert($TBSCertificate['children']['signature'] == $Certificate['children']['signatureAlgorithm'])
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            // technically, default implies optional, but we'll define it as being optional, none-the-less, just to
+            // reenforce that fact
+            'version' => [
+                'type' => ASN1::TYPE_INTEGER,
+                'constant' => 0,
+                'optional' => true,
+                'explicit' => true,
+                'mapping' => ['v1', 'v2', 'v3'],
+                'default' => 'v1',
+            ],
+            'serialNumber' => CertificateSerialNumber::MAP,
+            'signature' => AlgorithmIdentifier::MAP,
+            'issuer' => Name::MAP,
+            'validity' => Validity::MAP,
+            'subject' => Name::MAP,
+            'subjectPublicKeyInfo' => SubjectPublicKeyInfo::MAP,
+            // implicit means that the T in the TLV structure is to be rewritten, regardless of the type
+            'issuerUniqueID' => [
+                'constant' => 1,
+                'optional' => true,
+                'implicit' => true,
+            ] + UniqueIdentifier::MAP,
+            'subjectUniqueID' => [
+                'constant' => 2,
+                'optional' => true,
+                'implicit' => true,
+            ] + UniqueIdentifier::MAP,
+            // <http://tools.ietf.org/html/rfc2459#page-74> doesn't use the EXPLICIT keyword but if
+            // it's not IMPLICIT, it's EXPLICIT
+            'extensions' => [
+                'constant' => 3,
+                'optional' => true,
+                'explicit' => true,
+            ] + Extensions::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/TerminalIdentifier.php b/phpseclib/File/ASN1/Maps/TerminalIdentifier.php
new file mode 100644
index 000000000..3153a99c2
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/TerminalIdentifier.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * TerminalIdentifier
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * TerminalIdentifier
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class TerminalIdentifier
+{
+    public const MAP = ['type' => ASN1::TYPE_PRINTABLE_STRING];
+}
diff --git a/phpseclib/File/ASN1/Maps/Time.php b/phpseclib/File/ASN1/Maps/Time.php
new file mode 100644
index 000000000..431d1e18d
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/Time.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Time
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * Time
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Time
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_CHOICE,
+        'children' => [
+            'utcTime' => ['type' => ASN1::TYPE_UTC_TIME],
+            'generalTime' => ['type' => ASN1::TYPE_GENERALIZED_TIME],
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/Trinomial.php b/phpseclib/File/ASN1/Maps/Trinomial.php
new file mode 100644
index 000000000..46c525dbd
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/Trinomial.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Trinomial
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * Trinomial
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Trinomial
+{
+    public const MAP = ['type' => ASN1::TYPE_INTEGER];
+}
diff --git a/phpseclib/File/ASN1/Maps/UniqueIdentifier.php b/phpseclib/File/ASN1/Maps/UniqueIdentifier.php
new file mode 100644
index 000000000..37e4be739
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/UniqueIdentifier.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * UniqueIdentifier
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * UniqueIdentifier
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class UniqueIdentifier
+{
+    public const MAP = ['type' => ASN1::TYPE_BIT_STRING];
+}
diff --git a/phpseclib/File/ASN1/Maps/UserNotice.php b/phpseclib/File/ASN1/Maps/UserNotice.php
new file mode 100644
index 000000000..1f172b985
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/UserNotice.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * UserNotice
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * UserNotice
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class UserNotice
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'noticeRef' => [
+                'optional' => true,
+                'implicit' => true,
+            ] + NoticeReference::MAP,
+            'explicitText' => [
+                'optional' => true,
+                'implicit' => true,
+            ] + DisplayText::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/Validity.php b/phpseclib/File/ASN1/Maps/Validity.php
new file mode 100644
index 000000000..095796fe5
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/Validity.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Validity
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * Validity
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Validity
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_SEQUENCE,
+        'children' => [
+            'notBefore' => Time::MAP,
+            'notAfter' => Time::MAP,
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/netscape_ca_policy_url.php b/phpseclib/File/ASN1/Maps/netscape_ca_policy_url.php
new file mode 100644
index 000000000..8ee94ac3a
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/netscape_ca_policy_url.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * netscape_ca_policy_url
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * netscape_ca_policy_url
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class netscape_ca_policy_url
+{
+    public const MAP = ['type' => ASN1::TYPE_IA5_STRING];
+}
diff --git a/phpseclib/File/ASN1/Maps/netscape_cert_type.php b/phpseclib/File/ASN1/Maps/netscape_cert_type.php
new file mode 100644
index 000000000..bfaa63894
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/netscape_cert_type.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * netscape_cert_type
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * netscape_cert_type
+ *
+ * mapping is from <http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn3.html>
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class netscape_cert_type
+{
+    public const MAP = [
+        'type' => ASN1::TYPE_BIT_STRING,
+        'mapping' => [
+            'SSLClient',
+            'SSLServer',
+            'Email',
+            'ObjectSigning',
+            'Reserved',
+            'SSLCA',
+            'EmailCA',
+            'ObjectSigningCA',
+        ],
+    ];
+}
diff --git a/phpseclib/File/ASN1/Maps/netscape_comment.php b/phpseclib/File/ASN1/Maps/netscape_comment.php
new file mode 100644
index 000000000..fd7f0ca3c
--- /dev/null
+++ b/phpseclib/File/ASN1/Maps/netscape_comment.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * netscape_comment
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\File\ASN1\Maps;
+
+use phpseclib3\File\ASN1;
+
+/**
+ * netscape_comment
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class netscape_comment
+{
+    public const MAP = ['type' => ASN1::TYPE_IA5_STRING];
+}
diff --git a/phpseclib/File/X509.php b/phpseclib/File/X509.php
index 47e723b2c..805b470ea 100644
--- a/phpseclib/File/X509.php
+++ b/phpseclib/File/X509.php
@@ -16,30 +16,36 @@
  * be encoded.  It can be encoded explicitly or left out all together.  This would effect the signature value and thus may invalidate the
  * the certificate all together unless the certificate is re-signed.
  *
- * @category  File
- * @package   X509
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2012 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\File;
-
-use phpseclib\Crypt\Hash;
-use phpseclib\Crypt\RSA;
-use phpseclib\Crypt\Random;
-use phpseclib\File\ASN1;
-use phpseclib\File\ASN1\Element;
-use phpseclib\Math\BigInteger;
-use phpseclib\Exception\UnsupportedAlgorithmException;
+declare(strict_types=1);
+
+namespace phpseclib3\File;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Common\PrivateKey;
+use phpseclib3\Crypt\Common\PublicKey;
+use phpseclib3\Crypt\DSA;
+use phpseclib3\Crypt\EC;
+use phpseclib3\Crypt\Hash;
+use phpseclib3\Crypt\PublicKeyLoader;
+use phpseclib3\Crypt\Random;
+use phpseclib3\Crypt\RSA;
+use phpseclib3\Crypt\RSA\Formats\Keys\PSS;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Exception\UnsupportedAlgorithmException;
+use phpseclib3\File\ASN1\Element;
+use phpseclib3\File\ASN1\Maps;
+use phpseclib3\Math\BigInteger;
 
 /**
  * Pure-PHP X.509 Parser
  *
- * @package X509
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class X509
 {
@@ -47,227 +53,158 @@ class X509
      * Flag to only accept signatures signed by certificate authorities
      *
      * Not really used anymore but retained all the same to suppress E_NOTICEs from old installs
-     *
-     * @access public
      */
-    const VALIDATE_SIGNATURE_BY_CA = 1;
+    public const VALIDATE_SIGNATURE_BY_CA = 1;
 
-    /**#@+
-     * @access public
-     * @see \phpseclib\File\X509::getDN()
-    */
     /**
      * Return internal array representation
+     *
+     * @see \phpseclib3\File\X509::getDN()
      */
-    const DN_ARRAY = 0;
+    public const DN_ARRAY = 0;
     /**
      * Return string
+     *
+     * @see \phpseclib3\File\X509::getDN()
      */
-    const DN_STRING = 1;
+    public const DN_STRING = 1;
     /**
      * Return ASN.1 name string
+     *
+     * @see \phpseclib3\File\X509::getDN()
      */
-    const DN_ASN1 = 2;
+    public const DN_ASN1 = 2;
     /**
      * Return OpenSSL compatible array
+     *
+     * @see \phpseclib3\File\X509::getDN()
      */
-    const DN_OPENSSL = 3;
+    public const DN_OPENSSL = 3;
     /**
      * Return canonical ASN.1 RDNs string
+     *
+     * @see \phpseclib3\File\X509::getDN()
      */
-    const DN_CANON = 4;
+    public const DN_CANON = 4;
     /**
      * Return name hash for file indexing
+     *
+     * @see \phpseclib3\File\X509::getDN()
      */
-    const DN_HASH = 5;
-    /**#@-*/
-
-    /**#@+
-     * @access public
-     * @see \phpseclib\File\X509::saveX509()
-     * @see \phpseclib\File\X509::saveCSR()
-     * @see \phpseclib\File\X509::saveCRL()
-    */
+    public const DN_HASH = 5;
+
     /**
      * Save as PEM
      *
      * ie. a base64-encoded PEM with a header and a footer
+     *
+     * @see \phpseclib3\File\X509::saveX509()
+     * @see \phpseclib3\File\X509::saveCSR()
+     * @see \phpseclib3\File\X509::saveCRL()
      */
-    const FORMAT_PEM = 0;
+    public const FORMAT_PEM = 0;
     /**
      * Save as DER
+     *
+     * @see \phpseclib3\File\X509::saveX509()
+     * @see \phpseclib3\File\X509::saveCSR()
+     * @see \phpseclib3\File\X509::saveCRL()
      */
-    const FORMAT_DER = 1;
+    public const FORMAT_DER = 1;
     /**
      * Save as a SPKAC
      *
+     * @see \phpseclib3\File\X509::saveX509()
+     * @see \phpseclib3\File\X509::saveCSR()
+     * @see \phpseclib3\File\X509::saveCRL()
+     *
      * Only works on CSRs. Not currently supported.
      */
-    const FORMAT_SPKAC = 2;
+    public const FORMAT_SPKAC = 2;
     /**
      * Auto-detect the format
      *
      * Used only by the load*() functions
+     *
+     * @see \phpseclib3\File\X509::saveX509()
+     * @see \phpseclib3\File\X509::saveCSR()
+     * @see \phpseclib3\File\X509::saveCRL()
      */
-    const FORMAT_AUTO_DETECT = 3;
-    /**#@-*/
+    public const FORMAT_AUTO_DETECT = 3;
 
     /**
      * Attribute value disposition.
      * If disposition is >= 0, this is the index of the target value.
      */
-    const ATTR_ALL = -1; // All attribute values (array).
-    const ATTR_APPEND = -2; // Add a value.
-    const ATTR_REPLACE = -3; // Clear first, then add a value.
-
-    /**
-     * ASN.1 syntax for X.509 certificates
-     *
-     * @var array
-     * @access private
-     */
-    var $Certificate;
-
-    /**#@+
-     * ASN.1 syntax for various extensions
-     *
-     * @access private
-     */
-    var $DirectoryString;
-    var $PKCS9String;
-    var $AttributeValue;
-    var $Extensions;
-    var $KeyUsage;
-    var $ExtKeyUsageSyntax;
-    var $BasicConstraints;
-    var $KeyIdentifier;
-    var $CRLDistributionPoints;
-    var $AuthorityKeyIdentifier;
-    var $CertificatePolicies;
-    var $AuthorityInfoAccessSyntax;
-    var $SubjectAltName;
-    var $PrivateKeyUsagePeriod;
-    var $IssuerAltName;
-    var $PolicyMappings;
-    var $NameConstraints;
-
-    var $CPSuri;
-    var $UserNotice;
-
-    var $netscape_cert_type;
-    var $netscape_comment;
-    var $netscape_ca_policy_url;
-
-    var $Name;
-    var $RelativeDistinguishedName;
-    var $CRLNumber;
-    var $CRLReason;
-    var $IssuingDistributionPoint;
-    var $InvalidityDate;
-    var $CertificateIssuer;
-    var $HoldInstructionCode;
-    var $SignedPublicKeyAndChallenge;
-    /**#@-*/
-
-    /**
-     * ASN.1 syntax for Certificate Signing Requests (RFC2986)
-     *
-     * @var array
-     * @access private
-     */
-    var $CertificationRequest;
-
-    /**
-     * ASN.1 syntax for Certificate Revocation Lists (RFC5280)
-     *
-     * @var array
-     * @access private
-     */
-    var $CertificateList;
+    public const ATTR_ALL = -1; // All attribute values (array).
+    public const ATTR_APPEND = -2; // Add a value.
+    public const ATTR_REPLACE = -3; // Clear first, then add a value.
 
     /**
      * Distinguished Name
      *
      * @var array
-     * @access private
      */
-    var $dn;
+    private $dn;
 
     /**
      * Public key
      *
-     * @var string
-     * @access private
+     * @var string|PublicKey
      */
-    var $publicKey;
+    private $publicKey;
 
     /**
      * Private key
      *
-     * @var string
-     * @access private
-     */
-    var $privateKey;
-
-    /**
-     * Object identifiers for X.509 certificates
-     *
-     * @var array
-     * @access private
-     * @link http://en.wikipedia.org/wiki/Object_identifier
+     * @var string|PrivateKey
      */
-    var $oids;
+    private $privateKey;
 
     /**
      * The certificate authorities
      *
      * @var array
-     * @access private
      */
-    var $CAs;
+    private $CAs = [];
 
     /**
      * The currently loaded certificate
      *
      * @var array
-     * @access private
      */
-    var $currentCert;
+    private $currentCert;
 
     /**
      * The signature subject
      *
-     * There's no guarantee \phpseclib\File\X509 is going to reencode an X.509 cert in the same way it was originally
+     * There's no guarantee \phpseclib3\File\X509 is going to re-encode an X.509 cert in the same way it was originally
      * encoded so we take save the portion of the original cert that the signature would have made for.
      *
      * @var string
-     * @access private
      */
-    var $signatureSubject;
+    private $signatureSubject;
 
     /**
      * Certificate Start Date
      *
      * @var string
-     * @access private
      */
-    var $startDate;
+    private $startDate;
 
     /**
      * Certificate End Date
      *
-     * @var string
-     * @access private
+     * @var string|Element
      */
-    var $endDate;
+    private $endDate;
 
     /**
      * Serial Number
      *
      * @var string
-     * @access private
      */
-    var $serialNumber;
+    private $serialNumber;
 
     /**
      * Key Identifier
@@ -276,1132 +213,208 @@ class X509
      * {@link http://tools.ietf.org/html/rfc5280#section-4.2.1.2 RFC5280#section-4.2.1.2}.
      *
      * @var string
-     * @access private
      */
-    var $currentKeyIdentifier;
+    private $currentKeyIdentifier;
 
     /**
      * CA Flag
      *
      * @var bool
-     * @access private
      */
-    var $caFlag = false;
+    private $caFlag = false;
 
     /**
      * SPKAC Challenge
      *
      * @var string
-     * @access private
      */
-    var $challenge;
+    private $challenge;
 
     /**
-     * Default Constructor.
+     * @var array
+     */
+    private $extensionValues = [];
+
+    /**
+     * OIDs loaded
      *
-     * @return \phpseclib\File\X509
-     * @access public
+     * @var bool
      */
-    function __construct()
-    {
-        // Explicitly Tagged Module, 1988 Syntax
-        // http://tools.ietf.org/html/rfc5280#appendix-A.1
+    private static $oidsLoaded = false;
 
-        $this->DirectoryString = array(
-            'type'     => ASN1::TYPE_CHOICE,
-            'children' => array(
-                'teletexString'   => array('type' => ASN1::TYPE_TELETEX_STRING),
-                'printableString' => array('type' => ASN1::TYPE_PRINTABLE_STRING),
-                'universalString' => array('type' => ASN1::TYPE_UNIVERSAL_STRING),
-                'utf8String'      => array('type' => ASN1::TYPE_UTF8_STRING),
-                'bmpString'       => array('type' => ASN1::TYPE_BMP_STRING)
-            )
-        );
-
-        $this->PKCS9String = array(
-            'type'     => ASN1::TYPE_CHOICE,
-            'children' => array(
-                'ia5String'       => array('type' => ASN1::TYPE_IA5_STRING),
-                'directoryString' => $this->DirectoryString
-            )
-        );
-
-        $this->AttributeValue = array('type' => ASN1::TYPE_ANY);
-
-        $AttributeType = array('type' => ASN1::TYPE_OBJECT_IDENTIFIER);
-
-        $AttributeTypeAndValue = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'type' => $AttributeType,
-                'value'=> $this->AttributeValue
-            )
-        );
+    /**
+     * Recursion Limit
+     *
+     * @var int
+     */
+    private static $recur_limit = 5;
 
-        /*
-        In practice, RDNs containing multiple name-value pairs (called "multivalued RDNs") are rare,
-        but they can be useful at times when either there is no unique attribute in the entry or you
-        want to ensure that the entry's DN contains some useful identifying information.
+    /**
+     * URL fetch flag
+     *
+     * @var bool
+     */
+    private static $disable_url_fetch = false;
 
-        - https://www.opends.org/wiki/page/DefinitionRelativeDistinguishedName
-        */
-        $this->RelativeDistinguishedName = array(
-            'type'     => ASN1::TYPE_SET,
-            'min'      => 1,
-            'max'      => -1,
-            'children' => $AttributeTypeAndValue
-        );
-
-        // http://tools.ietf.org/html/rfc5280#section-4.1.2.4
-        $RDNSequence = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            // RDNSequence does not define a min or a max, which means it doesn't have one
-            'min'      => 0,
-            'max'      => -1,
-            'children' => $this->RelativeDistinguishedName
-        );
-
-        $this->Name = array(
-            'type'     => ASN1::TYPE_CHOICE,
-            'children' => array(
-                'rdnSequence' => $RDNSequence
-            )
-        );
-
-        // http://tools.ietf.org/html/rfc5280#section-4.1.1.2
-        $AlgorithmIdentifier = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'algorithm'  => array('type' => ASN1::TYPE_OBJECT_IDENTIFIER),
-                'parameters' => array(
-                                    'type'     => ASN1::TYPE_ANY,
-                                    'optional' => true
-                                )
-            )
-        );
+    /**
+     * @var array
+     */
+    private static $extensions = [];
 
-        /*
-           A certificate using system MUST reject the certificate if it encounters
-           a critical extension it does not recognize; however, a non-critical
-           extension may be ignored if it is not recognized.
+    /**
+     * @var ?array
+     */
+    private $ipAddresses = null;
 
-           http://tools.ietf.org/html/rfc5280#section-4.2
-        */
-        $Extension = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'extnId'   => array('type' => ASN1::TYPE_OBJECT_IDENTIFIER),
-                'critical' => array(
-                                  'type'     => ASN1::TYPE_BOOLEAN,
-                                  'optional' => true,
-                                  'default'  => false
-                              ),
-                'extnValue' => array('type' => ASN1::TYPE_OCTET_STRING)
-            )
-        );
-
-        $this->Extensions = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'min'      => 1,
-            // technically, it's MAX, but we'll assume anything < 0 is MAX
-            'max'      => -1,
-            // if 'children' isn't an array then 'min' and 'max' must be defined
-            'children' => $Extension
-        );
-
-        $SubjectPublicKeyInfo = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'algorithm'        => $AlgorithmIdentifier,
-                'subjectPublicKey' => array('type' => ASN1::TYPE_BIT_STRING)
-            )
-        );
-
-        $UniqueIdentifier = array('type' => ASN1::TYPE_BIT_STRING);
-
-        $Time = array(
-            'type'     => ASN1::TYPE_CHOICE,
-            'children' => array(
-                'utcTime'     => array('type' => ASN1::TYPE_UTC_TIME),
-                'generalTime' => array('type' => ASN1::TYPE_GENERALIZED_TIME)
-            )
-        );
-
-        // http://tools.ietf.org/html/rfc5280#section-4.1.2.5
-        $Validity = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'notBefore' => $Time,
-                'notAfter'  => $Time
-            )
-        );
-
-        $CertificateSerialNumber = array('type' => ASN1::TYPE_INTEGER);
-
-        $Version = array(
-            'type'    => ASN1::TYPE_INTEGER,
-            'mapping' => array('v1', 'v2', 'v3')
-        );
-
-        // assert($TBSCertificate['children']['signature'] == $Certificate['children']['signatureAlgorithm'])
-        $TBSCertificate = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                // technically, default implies optional, but we'll define it as being optional, none-the-less, just to
-                // reenforce that fact
-                'version'             => array(
-                                             'constant' => 0,
-                                             'optional' => true,
-                                             'explicit' => true,
-                                             'default'  => 'v1'
-                                         ) + $Version,
-                'serialNumber'         => $CertificateSerialNumber,
-                'signature'            => $AlgorithmIdentifier,
-                'issuer'               => $this->Name,
-                'validity'             => $Validity,
-                'subject'              => $this->Name,
-                'subjectPublicKeyInfo' => $SubjectPublicKeyInfo,
-                // implicit means that the T in the TLV structure is to be rewritten, regardless of the type
-                'issuerUniqueID'       => array(
-                                               'constant' => 1,
-                                               'optional' => true,
-                                               'implicit' => true
-                                           ) + $UniqueIdentifier,
-                'subjectUniqueID'       => array(
-                                               'constant' => 2,
-                                               'optional' => true,
-                                               'implicit' => true
-                                           ) + $UniqueIdentifier,
-                // <http://tools.ietf.org/html/rfc2459#page-74> doesn't use the EXPLICIT keyword but if
-                // it's not IMPLICIT, it's EXPLICIT
-                'extensions'            => array(
-                                               'constant' => 3,
-                                               'optional' => true,
-                                               'explicit' => true
-                                           ) + $this->Extensions
-            )
-        );
-
-        $this->Certificate = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                 'tbsCertificate'     => $TBSCertificate,
-                 'signatureAlgorithm' => $AlgorithmIdentifier,
-                 'signature'          => array('type' => ASN1::TYPE_BIT_STRING)
-            )
-        );
-
-        $this->KeyUsage = array(
-            'type'    => ASN1::TYPE_BIT_STRING,
-            'mapping' => array(
-                'digitalSignature',
-                'nonRepudiation',
-                'keyEncipherment',
-                'dataEncipherment',
-                'keyAgreement',
-                'keyCertSign',
-                'cRLSign',
-                'encipherOnly',
-                'decipherOnly'
-            )
-        );
-
-        $this->BasicConstraints = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'cA'                => array(
-                                                 'type'     => ASN1::TYPE_BOOLEAN,
-                                                 'optional' => true,
-                                                 'default'  => false
-                                       ),
-                'pathLenConstraint' => array(
-                                                 'type' => ASN1::TYPE_INTEGER,
-                                                 'optional' => true
-                                       )
-            )
-        );
-
-        $this->KeyIdentifier = array('type' => ASN1::TYPE_OCTET_STRING);
-
-        $OrganizationalUnitNames = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'min'      => 1,
-            'max'      => 4, // ub-organizational-units
-            'children' => array('type' => ASN1::TYPE_PRINTABLE_STRING)
-        );
-
-        $PersonalName = array(
-            'type'     => ASN1::TYPE_SET,
-            'children' => array(
-                'surname'              => array(
-                                           'type' => ASN1::TYPE_PRINTABLE_STRING,
-                                           'constant' => 0,
-                                           'optional' => true,
-                                           'implicit' => true
-                                         ),
-                'given-name'           => array(
-                                           'type' => ASN1::TYPE_PRINTABLE_STRING,
-                                           'constant' => 1,
-                                           'optional' => true,
-                                           'implicit' => true
-                                         ),
-                'initials'             => array(
-                                           'type' => ASN1::TYPE_PRINTABLE_STRING,
-                                           'constant' => 2,
-                                           'optional' => true,
-                                           'implicit' => true
-                                         ),
-                'generation-qualifier' => array(
-                                           'type' => ASN1::TYPE_PRINTABLE_STRING,
-                                           'constant' => 3,
-                                           'optional' => true,
-                                           'implicit' => true
-                                         )
-            )
-        );
-
-        $NumericUserIdentifier = array('type' => ASN1::TYPE_NUMERIC_STRING);
-
-        $OrganizationName = array('type' => ASN1::TYPE_PRINTABLE_STRING);
-
-        $PrivateDomainName = array(
-            'type'     => ASN1::TYPE_CHOICE,
-            'children' => array(
-                'numeric'   => array('type' => ASN1::TYPE_NUMERIC_STRING),
-                'printable' => array('type' => ASN1::TYPE_PRINTABLE_STRING)
-            )
-        );
-
-        $TerminalIdentifier = array('type' => ASN1::TYPE_PRINTABLE_STRING);
-
-        $NetworkAddress = array('type' => ASN1::TYPE_NUMERIC_STRING);
-
-        $AdministrationDomainName = array(
-            'type'     => ASN1::TYPE_CHOICE,
-            // if class isn't present it's assumed to be \phpseclib\File\ASN1::CLASS_UNIVERSAL or
-            // (if constant is present) \phpseclib\File\ASN1::CLASS_CONTEXT_SPECIFIC
-            'class'    => ASN1::CLASS_APPLICATION,
-            'cast'     => 2,
-            'children' => array(
-                'numeric'   => array('type' => ASN1::TYPE_NUMERIC_STRING),
-                'printable' => array('type' => ASN1::TYPE_PRINTABLE_STRING)
-            )
-        );
-
-        $CountryName = array(
-            'type'     => ASN1::TYPE_CHOICE,
-            // if class isn't present it's assumed to be \phpseclib\File\ASN1::CLASS_UNIVERSAL or
-            // (if constant is present) \phpseclib\File\ASN1::CLASS_CONTEXT_SPECIFIC
-            'class'    => ASN1::CLASS_APPLICATION,
-            'cast'     => 1,
-            'children' => array(
-                'x121-dcc-code'        => array('type' => ASN1::TYPE_NUMERIC_STRING),
-                'iso-3166-alpha2-code' => array('type' => ASN1::TYPE_PRINTABLE_STRING)
-            )
-        );
-
-        $AnotherName = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                 'type-id' => array('type' => ASN1::TYPE_OBJECT_IDENTIFIER),
-                 'value'   => array(
-                                  'type' => ASN1::TYPE_ANY,
-                                  'constant' => 0,
-                                  'optional' => true,
-                                  'explicit' => true
-                              )
-            )
-        );
-
-        $ExtensionAttribute = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                 'extension-attribute-type'  => array(
-                                                    'type' => ASN1::TYPE_PRINTABLE_STRING,
-                                                    'constant' => 0,
-                                                    'optional' => true,
-                                                    'implicit' => true
-                                                ),
-                 'extension-attribute-value' => array(
-                                                    'type' => ASN1::TYPE_ANY,
-                                                    'constant' => 1,
-                                                    'optional' => true,
-                                                    'explicit' => true
-                                                )
-            )
-        );
-
-        $ExtensionAttributes = array(
-            'type'     => ASN1::TYPE_SET,
-            'min'      => 1,
-            'max'      => 256, // ub-extension-attributes
-            'children' => $ExtensionAttribute
-        );
-
-        $BuiltInDomainDefinedAttribute = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                 'type'  => array('type' => ASN1::TYPE_PRINTABLE_STRING),
-                 'value' => array('type' => ASN1::TYPE_PRINTABLE_STRING)
-            )
-        );
-
-        $BuiltInDomainDefinedAttributes = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'min'      => 1,
-            'max'      => 4, // ub-domain-defined-attributes
-            'children' => $BuiltInDomainDefinedAttribute
-        );
-
-        $BuiltInStandardAttributes =  array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'country-name'               => array('optional' => true) + $CountryName,
-                'administration-domain-name' => array('optional' => true) + $AdministrationDomainName,
-                'network-address'            => array(
-                                                 'constant' => 0,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $NetworkAddress,
-                'terminal-identifier'        => array(
-                                                 'constant' => 1,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $TerminalIdentifier,
-                'private-domain-name'        => array(
-                                                 'constant' => 2,
-                                                 'optional' => true,
-                                                 'explicit' => true
-                                               ) + $PrivateDomainName,
-                'organization-name'          => array(
-                                                 'constant' => 3,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $OrganizationName,
-                'numeric-user-identifier'    => array(
-                                                 'constant' => 4,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $NumericUserIdentifier,
-                'personal-name'              => array(
-                                                 'constant' => 5,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $PersonalName,
-                'organizational-unit-names'  => array(
-                                                 'constant' => 6,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $OrganizationalUnitNames
-            )
-        );
-
-        $ORAddress = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                 'built-in-standard-attributes'       => $BuiltInStandardAttributes,
-                 'built-in-domain-defined-attributes' => array('optional' => true) + $BuiltInDomainDefinedAttributes,
-                 'extension-attributes'               => array('optional' => true) + $ExtensionAttributes
-            )
-        );
-
-        $EDIPartyName = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                 'nameAssigner' => array(
-                                    'constant' => 0,
-                                    'optional' => true,
-                                    'implicit' => true
-                                ) + $this->DirectoryString,
-                 // partyName is technically required but \phpseclib\File\ASN1 doesn't currently support non-optional constants and
-                 // setting it to optional gets the job done in any event.
-                 'partyName'    => array(
-                                    'constant' => 1,
-                                    'optional' => true,
-                                    'implicit' => true
-                                ) + $this->DirectoryString
-            )
-        );
-
-        $GeneralName = array(
-            'type'     => ASN1::TYPE_CHOICE,
-            'children' => array(
-                'otherName'                 => array(
-                                                 'constant' => 0,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $AnotherName,
-                'rfc822Name'                => array(
-                                                 'type' => ASN1::TYPE_IA5_STRING,
-                                                 'constant' => 1,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ),
-                'dNSName'                   => array(
-                                                 'type' => ASN1::TYPE_IA5_STRING,
-                                                 'constant' => 2,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ),
-                'x400Address'               => array(
-                                                 'constant' => 3,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $ORAddress,
-                'directoryName'             => array(
-                                                 'constant' => 4,
-                                                 'optional' => true,
-                                                 'explicit' => true
-                                               ) + $this->Name,
-                'ediPartyName'              => array(
-                                                 'constant' => 5,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $EDIPartyName,
-                'uniformResourceIdentifier' => array(
-                                                 'type' => ASN1::TYPE_IA5_STRING,
-                                                 'constant' => 6,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ),
-                'iPAddress'                 => array(
-                                                 'type' => ASN1::TYPE_OCTET_STRING,
-                                                 'constant' => 7,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ),
-                'registeredID'              => array(
-                                                 'type' => ASN1::TYPE_OBJECT_IDENTIFIER,
-                                                 'constant' => 8,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               )
-            )
-        );
-
-        $GeneralNames = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'min'      => 1,
-            'max'      => -1,
-            'children' => $GeneralName
-        );
-
-        $this->IssuerAltName = $GeneralNames;
-
-        $ReasonFlags = array(
-            'type'    => ASN1::TYPE_BIT_STRING,
-            'mapping' => array(
-                'unused',
-                'keyCompromise',
-                'cACompromise',
-                'affiliationChanged',
-                'superseded',
-                'cessationOfOperation',
-                'certificateHold',
-                'privilegeWithdrawn',
-                'aACompromise'
-            )
-        );
-
-        $DistributionPointName = array(
-            'type'     => ASN1::TYPE_CHOICE,
-            'children' => array(
-                'fullName'                => array(
-                                                 'constant' => 0,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                       ) + $GeneralNames,
-                'nameRelativeToCRLIssuer' => array(
-                                                 'constant' => 1,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                       ) + $this->RelativeDistinguishedName
-            )
-        );
-
-        $DistributionPoint = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'distributionPoint' => array(
-                                                 'constant' => 0,
-                                                 'optional' => true,
-                                                 'explicit' => true
-                                       ) + $DistributionPointName,
-                'reasons'           => array(
-                                                 'constant' => 1,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                       ) + $ReasonFlags,
-                'cRLIssuer'         => array(
-                                                 'constant' => 2,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                       ) + $GeneralNames
-            )
-        );
-
-        $this->CRLDistributionPoints = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'min'      => 1,
-            'max'      => -1,
-            'children' => $DistributionPoint
-        );
-
-        $this->AuthorityKeyIdentifier = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'keyIdentifier'             => array(
-                                                 'constant' => 0,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $this->KeyIdentifier,
-                'authorityCertIssuer'       => array(
-                                                 'constant' => 1,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $GeneralNames,
-                'authorityCertSerialNumber' => array(
-                                                 'constant' => 2,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $CertificateSerialNumber
-            )
-        );
-
-        $PolicyQualifierId = array('type' => ASN1::TYPE_OBJECT_IDENTIFIER);
-
-        $PolicyQualifierInfo = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'policyQualifierId' => $PolicyQualifierId,
-                'qualifier'         => array('type' => ASN1::TYPE_ANY)
-            )
-        );
-
-        $CertPolicyId = array('type' => ASN1::TYPE_OBJECT_IDENTIFIER);
-
-        $PolicyInformation = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'policyIdentifier' => $CertPolicyId,
-                'policyQualifiers' => array(
-                                          'type'     => ASN1::TYPE_SEQUENCE,
-                                          'min'      => 0,
-                                          'max'      => -1,
-                                          'optional' => true,
-                                          'children' => $PolicyQualifierInfo
-                                      )
-            )
-        );
-
-        $this->CertificatePolicies = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'min'      => 1,
-            'max'      => -1,
-            'children' => $PolicyInformation
-        );
-
-        $this->PolicyMappings = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'min'      => 1,
-            'max'      => -1,
-            'children' => array(
-                              'type'     => ASN1::TYPE_SEQUENCE,
-                              'children' => array(
-                                  'issuerDomainPolicy' => $CertPolicyId,
-                                  'subjectDomainPolicy' => $CertPolicyId
-                              )
-                       )
-        );
-
-        $KeyPurposeId = array('type' => ASN1::TYPE_OBJECT_IDENTIFIER);
-
-        $this->ExtKeyUsageSyntax = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'min'      => 1,
-            'max'      => -1,
-            'children' => $KeyPurposeId
-        );
-
-        $AccessDescription = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'accessMethod'   => array('type' => ASN1::TYPE_OBJECT_IDENTIFIER),
-                'accessLocation' => $GeneralName
-            )
-        );
-
-        $this->AuthorityInfoAccessSyntax = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'min'      => 1,
-            'max'      => -1,
-            'children' => $AccessDescription
-        );
-
-        $this->SubjectAltName = $GeneralNames;
-
-        $this->PrivateKeyUsagePeriod = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'notBefore' => array(
-                                                 'constant' => 0,
-                                                 'optional' => true,
-                                                 'implicit' => true,
-                                                 'type' => ASN1::TYPE_GENERALIZED_TIME),
-                'notAfter'  => array(
-                                                 'constant' => 1,
-                                                 'optional' => true,
-                                                 'implicit' => true,
-                                                 'type' => ASN1::TYPE_GENERALIZED_TIME)
-            )
-        );
-
-        $BaseDistance = array('type' => ASN1::TYPE_INTEGER);
-
-        $GeneralSubtree = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'base'    => $GeneralName,
-                'minimum' => array(
-                                 'constant' => 0,
-                                 'optional' => true,
-                                 'implicit' => true,
-                                 'default' => new BigInteger(0)
-                             ) + $BaseDistance,
-                'maximum' => array(
-                                 'constant' => 1,
-                                 'optional' => true,
-                                 'implicit' => true,
-                             ) + $BaseDistance
-            )
-        );
-
-        $GeneralSubtrees = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'min'      => 1,
-            'max'      => -1,
-            'children' => $GeneralSubtree
-        );
-
-        $this->NameConstraints = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'permittedSubtrees' => array(
-                                           'constant' => 0,
-                                           'optional' => true,
-                                           'implicit' => true
-                                       ) + $GeneralSubtrees,
-                'excludedSubtrees'  => array(
-                                           'constant' => 1,
-                                           'optional' => true,
-                                           'implicit' => true
-                                       ) + $GeneralSubtrees
-            )
-        );
-
-        $this->CPSuri = array('type' => ASN1::TYPE_IA5_STRING);
-
-        $DisplayText = array(
-            'type'     => ASN1::TYPE_CHOICE,
-            'children' => array(
-                'ia5String'     => array('type' => ASN1::TYPE_IA5_STRING),
-                'visibleString' => array('type' => ASN1::TYPE_VISIBLE_STRING),
-                'bmpString'     => array('type' => ASN1::TYPE_BMP_STRING),
-                'utf8String'    => array('type' => ASN1::TYPE_UTF8_STRING)
-            )
-        );
-
-        $NoticeReference = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'organization'  => $DisplayText,
-                'noticeNumbers' => array(
-                                       'type'     => ASN1::TYPE_SEQUENCE,
-                                       'min'      => 1,
-                                       'max'      => 200,
-                                       'children' => array('type' => ASN1::TYPE_INTEGER)
-                                   )
-            )
-        );
-
-        $this->UserNotice = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'noticeRef' => array(
-                                           'optional' => true,
-                                           'implicit' => true
-                                       ) + $NoticeReference,
-                'explicitText'  => array(
-                                           'optional' => true,
-                                           'implicit' => true
-                                       ) + $DisplayText
-            )
-        );
-
-        // mapping is from <http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn3.html>
-        $this->netscape_cert_type = array(
-            'type'    => ASN1::TYPE_BIT_STRING,
-            'mapping' => array(
-                'SSLClient',
-                'SSLServer',
-                'Email',
-                'ObjectSigning',
-                'Reserved',
-                'SSLCA',
-                'EmailCA',
-                'ObjectSigningCA'
-            )
-        );
-
-        $this->netscape_comment = array('type' => ASN1::TYPE_IA5_STRING);
-        $this->netscape_ca_policy_url = array('type' => ASN1::TYPE_IA5_STRING);
-
-        // attribute is used in RFC2986 but we're using the RFC5280 definition
-
-        $Attribute = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'type' => $AttributeType,
-                'value'=> array(
-                              'type'     => ASN1::TYPE_SET,
-                              'min'      => 1,
-                              'max'      => -1,
-                              'children' => $this->AttributeValue
-                          )
-            )
-        );
-
-        // adapted from <http://tools.ietf.org/html/rfc2986>
-
-        $Attributes = array(
-            'type'     => ASN1::TYPE_SET,
-            'min'      => 1,
-            'max'      => -1,
-            'children' => $Attribute
-        );
-
-        $CertificationRequestInfo = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'version'       => array(
-                                       'type' => ASN1::TYPE_INTEGER,
-                                       'mapping' => array('v1')
-                                   ),
-                'subject'       => $this->Name,
-                'subjectPKInfo' => $SubjectPublicKeyInfo,
-                'attributes'    => array(
-                                       'constant' => 0,
-                                       'optional' => true,
-                                       'implicit' => true
-                                   ) + $Attributes,
-            )
-        );
-
-        $this->CertificationRequest = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'certificationRequestInfo' => $CertificationRequestInfo,
-                'signatureAlgorithm'       => $AlgorithmIdentifier,
-                'signature'                => array('type' => ASN1::TYPE_BIT_STRING)
-            )
-        );
-
-        $RevokedCertificate = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                              'userCertificate'    => $CertificateSerialNumber,
-                              'revocationDate'     => $Time,
-                              'crlEntryExtensions' => array(
-                                                          'optional' => true
-                                                      ) + $this->Extensions
-                          )
-        );
-
-        $TBSCertList = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'version'             => array(
-                                             'optional' => true,
-                                             'default'  => 'v1'
-                                         ) + $Version,
-                'signature'           => $AlgorithmIdentifier,
-                'issuer'              => $this->Name,
-                'thisUpdate'          => $Time,
-                'nextUpdate'          => array(
-                                             'optional' => true
-                                         ) + $Time,
-                'revokedCertificates' => array(
-                                             'type'     => ASN1::TYPE_SEQUENCE,
-                                             'optional' => true,
-                                             'min'      => 0,
-                                             'max'      => -1,
-                                             'children' => $RevokedCertificate
-                                         ),
-                'crlExtensions'       => array(
-                                             'constant' => 0,
-                                             'optional' => true,
-                                             'explicit' => true
-                                         ) + $this->Extensions
-            )
-        );
-
-        $this->CertificateList = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'tbsCertList'        => $TBSCertList,
-                'signatureAlgorithm' => $AlgorithmIdentifier,
-                'signature'          => array('type' => ASN1::TYPE_BIT_STRING)
-            )
-        );
-
-        $this->CRLNumber = array('type' => ASN1::TYPE_INTEGER);
-
-        $this->CRLReason = array('type' => ASN1::TYPE_ENUMERATED,
-           'mapping' => array(
-                            'unspecified',
-                            'keyCompromise',
-                            'cACompromise',
-                            'affiliationChanged',
-                            'superseded',
-                            'cessationOfOperation',
-                            'certificateHold',
-                            // Value 7 is not used.
-                            8 => 'removeFromCRL',
-                            'privilegeWithdrawn',
-                            'aACompromise'
-            )
-        );
-
-        $this->IssuingDistributionPoint = array('type' => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'distributionPoint'          => array(
-                                                    'constant' => 0,
-                                                    'optional' => true,
-                                                    'explicit' => true
-                                                ) + $DistributionPointName,
-                'onlyContainsUserCerts'      => array(
-                                                    'type'     => ASN1::TYPE_BOOLEAN,
-                                                    'constant' => 1,
-                                                    'optional' => true,
-                                                    'default'  => false,
-                                                    'implicit' => true
-                                                ),
-                'onlyContainsCACerts'        => array(
-                                                    'type'     => ASN1::TYPE_BOOLEAN,
-                                                    'constant' => 2,
-                                                    'optional' => true,
-                                                    'default'  => false,
-                                                    'implicit' => true
-                                                ),
-                'onlySomeReasons'           => array(
-                                                    'constant' => 3,
-                                                    'optional' => true,
-                                                    'implicit' => true
-                                                ) + $ReasonFlags,
-                'indirectCRL'               => array(
-                                                    'type'     => ASN1::TYPE_BOOLEAN,
-                                                    'constant' => 4,
-                                                    'optional' => true,
-                                                    'default'  => false,
-                                                    'implicit' => true
-                                                ),
-                'onlyContainsAttributeCerts' => array(
-                                                    'type'     => ASN1::TYPE_BOOLEAN,
-                                                    'constant' => 5,
-                                                    'optional' => true,
-                                                    'default'  => false,
-                                                    'implicit' => true
-                                                )
-                          )
-        );
-
-        $this->InvalidityDate = array('type' => ASN1::TYPE_GENERALIZED_TIME);
-
-        $this->CertificateIssuer = $GeneralNames;
-
-        $this->HoldInstructionCode = array('type' => ASN1::TYPE_OBJECT_IDENTIFIER);
-
-        $PublicKeyAndChallenge = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'spki'      => $SubjectPublicKeyInfo,
-                'challenge' => array('type' => ASN1::TYPE_IA5_STRING)
-            )
-        );
-
-        $this->SignedPublicKeyAndChallenge = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'publicKeyAndChallenge' => $PublicKeyAndChallenge,
-                'signatureAlgorithm'    => $AlgorithmIdentifier,
-                'signature'             => array('type' => ASN1::TYPE_BIT_STRING)
-            )
-        );
-
-        // OIDs from RFC5280 and those RFCs mentioned in RFC5280#section-4.1.1.2
-        $this->oids = array(
-            '1.3.6.1.5.5.7' => 'id-pkix',
-            '1.3.6.1.5.5.7.1' => 'id-pe',
-            '1.3.6.1.5.5.7.2' => 'id-qt',
-            '1.3.6.1.5.5.7.3' => 'id-kp',
-            '1.3.6.1.5.5.7.48' => 'id-ad',
-            '1.3.6.1.5.5.7.2.1' => 'id-qt-cps',
-            '1.3.6.1.5.5.7.2.2' => 'id-qt-unotice',
-            '1.3.6.1.5.5.7.48.1' =>'id-ad-ocsp',
-            '1.3.6.1.5.5.7.48.2' => 'id-ad-caIssuers',
-            '1.3.6.1.5.5.7.48.3' => 'id-ad-timeStamping',
-            '1.3.6.1.5.5.7.48.5' => 'id-ad-caRepository',
-            '2.5.4' => 'id-at',
-            '2.5.4.41' => 'id-at-name',
-            '2.5.4.4' => 'id-at-surname',
-            '2.5.4.42' => 'id-at-givenName',
-            '2.5.4.43' => 'id-at-initials',
-            '2.5.4.44' => 'id-at-generationQualifier',
-            '2.5.4.3' => 'id-at-commonName',
-            '2.5.4.7' => 'id-at-localityName',
-            '2.5.4.8' => 'id-at-stateOrProvinceName',
-            '2.5.4.10' => 'id-at-organizationName',
-            '2.5.4.11' => 'id-at-organizationalUnitName',
-            '2.5.4.12' => 'id-at-title',
-            '2.5.4.13' => 'id-at-description',
-            '2.5.4.46' => 'id-at-dnQualifier',
-            '2.5.4.6' => 'id-at-countryName',
-            '2.5.4.5' => 'id-at-serialNumber',
-            '2.5.4.65' => 'id-at-pseudonym',
-            '2.5.4.17' => 'id-at-postalCode',
-            '2.5.4.9' => 'id-at-streetAddress',
-            '2.5.4.45' => 'id-at-uniqueIdentifier',
-            '2.5.4.72' => 'id-at-role',
-
-            '0.9.2342.19200300.100.1.25' => 'id-domainComponent',
-            '1.2.840.113549.1.9' => 'pkcs-9',
-            '1.2.840.113549.1.9.1' => 'pkcs-9-at-emailAddress',
-            '2.5.29' => 'id-ce',
-            '2.5.29.35' => 'id-ce-authorityKeyIdentifier',
-            '2.5.29.14' => 'id-ce-subjectKeyIdentifier',
-            '2.5.29.15' => 'id-ce-keyUsage',
-            '2.5.29.16' => 'id-ce-privateKeyUsagePeriod',
-            '2.5.29.32' => 'id-ce-certificatePolicies',
-            '2.5.29.32.0' => 'anyPolicy',
-
-            '2.5.29.33' => 'id-ce-policyMappings',
-            '2.5.29.17' => 'id-ce-subjectAltName',
-            '2.5.29.18' => 'id-ce-issuerAltName',
-            '2.5.29.9' => 'id-ce-subjectDirectoryAttributes',
-            '2.5.29.19' => 'id-ce-basicConstraints',
-            '2.5.29.30' => 'id-ce-nameConstraints',
-            '2.5.29.36' => 'id-ce-policyConstraints',
-            '2.5.29.31' => 'id-ce-cRLDistributionPoints',
-            '2.5.29.37' => 'id-ce-extKeyUsage',
-            '2.5.29.37.0' => 'anyExtendedKeyUsage',
-            '1.3.6.1.5.5.7.3.1' => 'id-kp-serverAuth',
-            '1.3.6.1.5.5.7.3.2' => 'id-kp-clientAuth',
-            '1.3.6.1.5.5.7.3.3' => 'id-kp-codeSigning',
-            '1.3.6.1.5.5.7.3.4' => 'id-kp-emailProtection',
-            '1.3.6.1.5.5.7.3.8' => 'id-kp-timeStamping',
-            '1.3.6.1.5.5.7.3.9' => 'id-kp-OCSPSigning',
-            '2.5.29.54' => 'id-ce-inhibitAnyPolicy',
-            '2.5.29.46' => 'id-ce-freshestCRL',
-            '1.3.6.1.5.5.7.1.1' => 'id-pe-authorityInfoAccess',
-            '1.3.6.1.5.5.7.1.11' => 'id-pe-subjectInfoAccess',
-            '2.5.29.20' => 'id-ce-cRLNumber',
-            '2.5.29.28' => 'id-ce-issuingDistributionPoint',
-            '2.5.29.27' => 'id-ce-deltaCRLIndicator',
-            '2.5.29.21' => 'id-ce-cRLReasons',
-            '2.5.29.29' => 'id-ce-certificateIssuer',
-            '2.5.29.23' => 'id-ce-holdInstructionCode',
-            '1.2.840.10040.2' => 'holdInstruction',
-            '1.2.840.10040.2.1' => 'id-holdinstruction-none',
-            '1.2.840.10040.2.2' => 'id-holdinstruction-callissuer',
-            '1.2.840.10040.2.3' => 'id-holdinstruction-reject',
-            '2.5.29.24' => 'id-ce-invalidityDate',
-
-            '1.2.840.113549.2.2' => 'md2',
-            '1.2.840.113549.2.5' => 'md5',
-            '1.3.14.3.2.26' => 'id-sha1',
-            '1.2.840.10040.4.1' => 'id-dsa',
-            '1.2.840.10040.4.3' => 'id-dsa-with-sha1',
-            '1.2.840.113549.1.1' => 'pkcs-1',
-            '1.2.840.113549.1.1.1' => 'rsaEncryption',
-            '1.2.840.113549.1.1.2' => 'md2WithRSAEncryption',
-            '1.2.840.113549.1.1.4' => 'md5WithRSAEncryption',
-            '1.2.840.113549.1.1.5' => 'sha1WithRSAEncryption',
-            '1.2.840.10046.2.1' => 'dhpublicnumber',
-            '2.16.840.1.101.2.1.1.22' => 'id-keyExchangeAlgorithm',
-            '1.2.840.10045' => 'ansi-X9-62',
-            '1.2.840.10045.4' => 'id-ecSigType',
-            '1.2.840.10045.4.1' => 'ecdsa-with-SHA1',
-            '1.2.840.10045.1' => 'id-fieldType',
-            '1.2.840.10045.1.1' => 'prime-field',
-            '1.2.840.10045.1.2' => 'characteristic-two-field',
-            '1.2.840.10045.1.2.3' => 'id-characteristic-two-basis',
-            '1.2.840.10045.1.2.3.1' => 'gnBasis',
-            '1.2.840.10045.1.2.3.2' => 'tpBasis',
-            '1.2.840.10045.1.2.3.3' => 'ppBasis',
-            '1.2.840.10045.2' => 'id-publicKeyType',
-            '1.2.840.10045.2.1' => 'id-ecPublicKey',
-            '1.2.840.10045.3' => 'ellipticCurve',
-            '1.2.840.10045.3.0' => 'c-TwoCurve',
-            '1.2.840.10045.3.0.1' => 'c2pnb163v1',
-            '1.2.840.10045.3.0.2' => 'c2pnb163v2',
-            '1.2.840.10045.3.0.3' => 'c2pnb163v3',
-            '1.2.840.10045.3.0.4' => 'c2pnb176w1',
-            '1.2.840.10045.3.0.5' => 'c2pnb191v1',
-            '1.2.840.10045.3.0.6' => 'c2pnb191v2',
-            '1.2.840.10045.3.0.7' => 'c2pnb191v3',
-            '1.2.840.10045.3.0.8' => 'c2pnb191v4',
-            '1.2.840.10045.3.0.9' => 'c2pnb191v5',
-            '1.2.840.10045.3.0.10' => 'c2pnb208w1',
-            '1.2.840.10045.3.0.11' => 'c2pnb239v1',
-            '1.2.840.10045.3.0.12' => 'c2pnb239v2',
-            '1.2.840.10045.3.0.13' => 'c2pnb239v3',
-            '1.2.840.10045.3.0.14' => 'c2pnb239v4',
-            '1.2.840.10045.3.0.15' => 'c2pnb239v5',
-            '1.2.840.10045.3.0.16' => 'c2pnb272w1',
-            '1.2.840.10045.3.0.17' => 'c2pnb304w1',
-            '1.2.840.10045.3.0.18' => 'c2pnb359v1',
-            '1.2.840.10045.3.0.19' => 'c2pnb368w1',
-            '1.2.840.10045.3.0.20' => 'c2pnb431r1',
-            '1.2.840.10045.3.1' => 'primeCurve',
-            '1.2.840.10045.3.1.1' => 'prime192v1',
-            '1.2.840.10045.3.1.2' => 'prime192v2',
-            '1.2.840.10045.3.1.3' => 'prime192v3',
-            '1.2.840.10045.3.1.4' => 'prime239v1',
-            '1.2.840.10045.3.1.5' => 'prime239v2',
-            '1.2.840.10045.3.1.6' => 'prime239v3',
-            '1.2.840.10045.3.1.7' => 'prime256v1',
-            '1.2.840.113549.1.1.7' => 'id-RSAES-OAEP',
-            '1.2.840.113549.1.1.9' => 'id-pSpecified',
-            '1.2.840.113549.1.1.10' => 'id-RSASSA-PSS',
-            '1.2.840.113549.1.1.8' => 'id-mgf1',
-            '1.2.840.113549.1.1.14' => 'sha224WithRSAEncryption',
-            '1.2.840.113549.1.1.11' => 'sha256WithRSAEncryption',
-            '1.2.840.113549.1.1.12' => 'sha384WithRSAEncryption',
-            '1.2.840.113549.1.1.13' => 'sha512WithRSAEncryption',
-            '2.16.840.1.101.3.4.2.4' => 'id-sha224',
-            '2.16.840.1.101.3.4.2.1' => 'id-sha256',
-            '2.16.840.1.101.3.4.2.2' => 'id-sha384',
-            '2.16.840.1.101.3.4.2.3' => 'id-sha512',
-            '1.2.643.2.2.4' => 'id-GostR3411-94-with-GostR3410-94',
-            '1.2.643.2.2.3' => 'id-GostR3411-94-with-GostR3410-2001',
-            '1.2.643.2.2.20' => 'id-GostR3410-2001',
-            '1.2.643.2.2.19' => 'id-GostR3410-94',
-            // Netscape Object Identifiers from "Netscape Certificate Extensions"
-            '2.16.840.1.113730' => 'netscape',
-            '2.16.840.1.113730.1' => 'netscape-cert-extension',
-            '2.16.840.1.113730.1.1' => 'netscape-cert-type',
-            '2.16.840.1.113730.1.13' => 'netscape-comment',
-            '2.16.840.1.113730.1.8' => 'netscape-ca-policy-url',
-            // the following are X.509 extensions not supported by phpseclib
-            '1.3.6.1.5.5.7.1.12' => 'id-pe-logotype',
-            '1.2.840.113533.7.65.0' => 'entrustVersInfo',
-            '2.16.840.1.113733.1.6.9' => 'verisignPrivate',
-            // for Certificate Signing Requests
-            // see http://tools.ietf.org/html/rfc2985
-            '1.2.840.113549.1.9.2' => 'pkcs-9-at-unstructuredName', // PKCS #9 unstructured name
-            '1.2.840.113549.1.9.7' => 'pkcs-9-at-challengePassword', // Challenge password for certificate revocations
-            '1.2.840.113549.1.9.14' => 'pkcs-9-at-extensionRequest' // Certificate extension request
-        );
+    /**
+     * @var ?array
+     */
+    private $domains = null;
+
+    public function __construct()
+    {
+        // Explicitly Tagged Module, 1988 Syntax
+        // http://tools.ietf.org/html/rfc5280#appendix-A.1
+
+        if (!self::$oidsLoaded) {
+            // OIDs from RFC5280 and those RFCs mentioned in RFC5280#section-4.1.1.2
+            ASN1::loadOIDs([
+                //'id-pkix' => '1.3.6.1.5.5.7',
+                //'id-pe' => '1.3.6.1.5.5.7.1',
+                //'id-qt' => '1.3.6.1.5.5.7.2',
+                //'id-kp' => '1.3.6.1.5.5.7.3',
+                //'id-ad' => '1.3.6.1.5.5.7.48',
+                'id-qt-cps' => '1.3.6.1.5.5.7.2.1',
+                'id-qt-unotice' => '1.3.6.1.5.5.7.2.2',
+                'id-ad-ocsp' => '1.3.6.1.5.5.7.48.1',
+                'id-ad-caIssuers' => '1.3.6.1.5.5.7.48.2',
+                'id-ad-timeStamping' => '1.3.6.1.5.5.7.48.3',
+                'id-ad-caRepository' => '1.3.6.1.5.5.7.48.5',
+                //'id-at' => '2.5.4',
+                'id-at-name' => '2.5.4.41',
+                'id-at-surname' => '2.5.4.4',
+                'id-at-givenName' => '2.5.4.42',
+                'id-at-initials' => '2.5.4.43',
+                'id-at-generationQualifier' => '2.5.4.44',
+                'id-at-commonName' => '2.5.4.3',
+                'id-at-localityName' => '2.5.4.7',
+                'id-at-stateOrProvinceName' => '2.5.4.8',
+                'id-at-organizationName' => '2.5.4.10',
+                'id-at-organizationalUnitName' => '2.5.4.11',
+                'id-at-title' => '2.5.4.12',
+                'id-at-description' => '2.5.4.13',
+                'id-at-dnQualifier' => '2.5.4.46',
+                'id-at-countryName' => '2.5.4.6',
+                'id-at-serialNumber' => '2.5.4.5',
+                'id-at-pseudonym' => '2.5.4.65',
+                'id-at-postalCode' => '2.5.4.17',
+                'id-at-streetAddress' => '2.5.4.9',
+                'id-at-uniqueIdentifier' => '2.5.4.45',
+                'id-at-role' => '2.5.4.72',
+                'id-at-postalAddress' => '2.5.4.16',
+                'jurisdictionOfIncorporationCountryName' => '1.3.6.1.4.1.311.60.2.1.3',
+                'jurisdictionOfIncorporationStateOrProvinceName' => '1.3.6.1.4.1.311.60.2.1.2',
+                'jurisdictionLocalityName' => '1.3.6.1.4.1.311.60.2.1.1',
+                'id-at-businessCategory' => '2.5.4.15',
+
+                //'id-domainComponent' => '0.9.2342.19200300.100.1.25',
+                //'pkcs-9' => '1.2.840.113549.1.9',
+                'pkcs-9-at-emailAddress' => '1.2.840.113549.1.9.1',
+                //'id-ce' => '2.5.29',
+                'id-ce-authorityKeyIdentifier' => '2.5.29.35',
+                'id-ce-subjectKeyIdentifier' => '2.5.29.14',
+                'id-ce-keyUsage' => '2.5.29.15',
+                'id-ce-privateKeyUsagePeriod' => '2.5.29.16',
+                'id-ce-certificatePolicies' => '2.5.29.32',
+                //'anyPolicy' => '2.5.29.32.0',
+
+                'id-ce-policyMappings' => '2.5.29.33',
+
+                'id-ce-subjectAltName' => '2.5.29.17',
+                'id-ce-issuerAltName' => '2.5.29.18',
+                'id-ce-subjectDirectoryAttributes' => '2.5.29.9',
+                'id-ce-basicConstraints' => '2.5.29.19',
+                'id-ce-nameConstraints' => '2.5.29.30',
+                'id-ce-policyConstraints' => '2.5.29.36',
+                'id-ce-cRLDistributionPoints' => '2.5.29.31',
+                'id-ce-extKeyUsage' => '2.5.29.37',
+                //'anyExtendedKeyUsage' => '2.5.29.37.0',
+                'id-kp-serverAuth' => '1.3.6.1.5.5.7.3.1',
+                'id-kp-clientAuth' => '1.3.6.1.5.5.7.3.2',
+                'id-kp-codeSigning' => '1.3.6.1.5.5.7.3.3',
+                'id-kp-emailProtection' => '1.3.6.1.5.5.7.3.4',
+                'id-kp-timeStamping' => '1.3.6.1.5.5.7.3.8',
+                'id-kp-OCSPSigning' => '1.3.6.1.5.5.7.3.9',
+                'id-ce-inhibitAnyPolicy' => '2.5.29.54',
+                'id-ce-freshestCRL' => '2.5.29.46',
+                'id-pe-authorityInfoAccess' => '1.3.6.1.5.5.7.1.1',
+                'id-pe-subjectInfoAccess' => '1.3.6.1.5.5.7.1.11',
+                'id-ce-cRLNumber' => '2.5.29.20',
+                'id-ce-issuingDistributionPoint' => '2.5.29.28',
+                'id-ce-deltaCRLIndicator' => '2.5.29.27',
+                'id-ce-cRLReasons' => '2.5.29.21',
+                'id-ce-certificateIssuer' => '2.5.29.29',
+                'id-ce-holdInstructionCode' => '2.5.29.23',
+                //'holdInstruction' => '1.2.840.10040.2',
+                'id-holdinstruction-none' => '1.2.840.10040.2.1',
+                'id-holdinstruction-callissuer' => '1.2.840.10040.2.2',
+                'id-holdinstruction-reject' => '1.2.840.10040.2.3',
+                'id-ce-invalidityDate' => '2.5.29.24',
+
+                'rsaEncryption' => '1.2.840.113549.1.1.1',
+                'md2WithRSAEncryption' => '1.2.840.113549.1.1.2',
+                'md5WithRSAEncryption' => '1.2.840.113549.1.1.4',
+                'sha1WithRSAEncryption' => '1.2.840.113549.1.1.5',
+                'sha224WithRSAEncryption' => '1.2.840.113549.1.1.14',
+                'sha256WithRSAEncryption' => '1.2.840.113549.1.1.11',
+                'sha384WithRSAEncryption' => '1.2.840.113549.1.1.12',
+                'sha512WithRSAEncryption' => '1.2.840.113549.1.1.13',
+
+                'id-ecPublicKey' => '1.2.840.10045.2.1',
+                'ecdsa-with-SHA1' => '1.2.840.10045.4.1',
+                // from https://tools.ietf.org/html/rfc5758#section-3.2
+                'ecdsa-with-SHA224' => '1.2.840.10045.4.3.1',
+                'ecdsa-with-SHA256' => '1.2.840.10045.4.3.2',
+                'ecdsa-with-SHA384' => '1.2.840.10045.4.3.3',
+                'ecdsa-with-SHA512' => '1.2.840.10045.4.3.4',
+
+                'id-dsa' => '1.2.840.10040.4.1',
+                'id-dsa-with-sha1' => '1.2.840.10040.4.3',
+                // from https://tools.ietf.org/html/rfc5758#section-3.1
+                'id-dsa-with-sha224' => '2.16.840.1.101.3.4.3.1',
+                'id-dsa-with-sha256' => '2.16.840.1.101.3.4.3.2',
+
+                // from https://tools.ietf.org/html/rfc8410:
+                'id-Ed25519' => '1.3.101.112',
+                'id-Ed448' => '1.3.101.113',
+
+                'id-RSASSA-PSS' => '1.2.840.113549.1.1.10',
+
+                //'id-sha224' => '2.16.840.1.101.3.4.2.4',
+                //'id-sha256' => '2.16.840.1.101.3.4.2.1',
+                //'id-sha384' => '2.16.840.1.101.3.4.2.2',
+                //'id-sha512' => '2.16.840.1.101.3.4.2.3',
+                //'id-GostR3411-94-with-GostR3410-94' => '1.2.643.2.2.4',
+                //'id-GostR3411-94-with-GostR3410-2001' => '1.2.643.2.2.3',
+                //'id-GostR3410-2001' => '1.2.643.2.2.20',
+                //'id-GostR3410-94' => '1.2.643.2.2.19',
+                // Netscape Object Identifiers from "Netscape Certificate Extensions"
+                'netscape' => '2.16.840.1.113730',
+                'netscape-cert-extension' => '2.16.840.1.113730.1',
+                'netscape-cert-type' => '2.16.840.1.113730.1.1',
+                'netscape-comment' => '2.16.840.1.113730.1.13',
+                'netscape-ca-policy-url' => '2.16.840.1.113730.1.8',
+                // the following are X.509 extensions not supported by phpseclib
+                'id-pe-logotype' => '1.3.6.1.5.5.7.1.12',
+                'entrustVersInfo' => '1.2.840.113533.7.65.0',
+                'verisignPrivate' => '2.16.840.1.113733.1.6.9',
+                // for Certificate Signing Requests
+                // see http://tools.ietf.org/html/rfc2985
+                'pkcs-9-at-unstructuredName' => '1.2.840.113549.1.9.2', // PKCS #9 unstructured name
+                'pkcs-9-at-challengePassword' => '1.2.840.113549.1.9.7', // Challenge password for certificate revocations
+                'pkcs-9-at-extensionRequest' => '1.2.840.113549.1.9.14', // Certificate extension request
+            ]);
+        }
     }
 
     /**
@@ -1409,12 +422,9 @@ function __construct()
      *
      * Returns an associative array describing the X.509 cert or a false if the cert failed to load
      *
-     * @param string $cert
-     * @param int $mode
-     * @access public
-     * @return mixed
+     * @param array|string $cert
      */
-    function loadX509($cert, $mode = self::FORMAT_AUTO_DETECT)
+    public function loadX509($cert, int $mode = self::FORMAT_AUTO_DETECT)
     {
         if (is_array($cert) && isset($cert['tbsCertificate'])) {
             unset($this->currentCert);
@@ -1433,10 +443,8 @@ function loadX509($cert, $mode = self::FORMAT_AUTO_DETECT)
             return $cert;
         }
 
-        $asn1 = new ASN1();
-
         if ($mode != self::FORMAT_DER) {
-            $newcert = $this->_extractBER($cert);
+            $newcert = ASN1::extractBER($cert);
             if ($mode == self::FORMAT_PEM && $cert == $newcert) {
                 return false;
             }
@@ -1448,11 +456,10 @@ function loadX509($cert, $mode = self::FORMAT_AUTO_DETECT)
             return false;
         }
 
-        $asn1->loadOIDs($this->oids);
-        $decoded = $asn1->decodeBER($cert);
+        $decoded = ASN1::decodeBER($cert);
 
-        if (!empty($decoded)) {
-            $x509 = $asn1->asn1map($decoded[0], $this->Certificate);
+        if ($decoded) {
+            $x509 = ASN1::asn1map($decoded[0], Maps\Certificate::MAP);
         }
         if (!isset($x509) || $x509 === false) {
             $this->currentCert = false;
@@ -1461,10 +468,18 @@ function loadX509($cert, $mode = self::FORMAT_AUTO_DETECT)
 
         $this->signatureSubject = substr($cert, $decoded[0]['content'][0]['start'], $decoded[0]['content'][0]['length']);
 
-        $this->_mapInExtensions($x509, 'tbsCertificate/extensions', $asn1);
+        if ($this->isSubArrayValid($x509, 'tbsCertificate/extensions')) {
+            $this->mapInExtensions($x509, 'tbsCertificate/extensions');
+        }
+        $this->mapInDNs($x509, 'tbsCertificate/issuer/rdnSequence');
+        $this->mapInDNs($x509, 'tbsCertificate/subject/rdnSequence');
 
-        $key = &$x509['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'];
-        $key = $this->_reformatKey($x509['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['algorithm'], $key);
+        $key = $x509['tbsCertificate']['subjectPublicKeyInfo'];
+        $key = ASN1::encodeDER($key, Maps\SubjectPublicKeyInfo::MAP);
+        $x509['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'] =
+            "-----BEGIN PUBLIC KEY-----\r\n" .
+            chunk_split(base64_encode($key), 64) .
+            "-----END PUBLIC KEY-----";
 
         $this->currentCert = $x509;
         $this->dn = $x509['tbsCertificate']['subject'];
@@ -1478,12 +493,9 @@ function loadX509($cert, $mode = self::FORMAT_AUTO_DETECT)
     /**
      * Save X.509 certificate
      *
-     * @param array $cert
-     * @param int $format optional
-     * @access public
-     * @return string
+     * @return string|false
      */
-    function saveX509($cert, $format = self::FORMAT_PEM)
+    public function saveX509(array $cert, int $format = self::FORMAT_PEM)
     {
         if (!is_array($cert) || !isset($cert['tbsCertificate'])) {
             return false;
@@ -1491,32 +503,17 @@ function saveX509($cert, $format = self::FORMAT_PEM)
 
         switch (true) {
             // "case !$a: case !$b: break; default: whatever();" is the same thing as "if ($a && $b) whatever()"
-            case !($algorithm = $this->_subArray($cert, 'tbsCertificate/subjectPublicKeyInfo/algorithm/algorithm')):
+            case !($algorithm = $this->subArray($cert, 'tbsCertificate/subjectPublicKeyInfo/algorithm/algorithm')):
             case is_object($cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey']):
                 break;
             default:
-                switch ($algorithm) {
-                    case 'rsaEncryption':
-                        $cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey']
-                            = base64_encode("\0" . base64_decode(preg_replace('#-.+-|[\r\n]#', '', $cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'])));
-                        /* "[For RSA keys] the parameters field MUST have ASN.1 type NULL for this algorithm identifier."
-                           -- https://tools.ietf.org/html/rfc3279#section-2.3.1
-
-                           given that and the fact that RSA keys appear ot be the only key type for which the parameters field can be blank,
-                           it seems like perhaps the ASN.1 description ought not say the parameters field is OPTIONAL, but whatever.
-                         */
-                        $cert['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['parameters'] = null;
-                        // https://tools.ietf.org/html/rfc3279#section-2.2.1
-                        $cert['signatureAlgorithm']['parameters'] = null;
-                        $cert['tbsCertificate']['signature']['parameters'] = null;
-                }
+                $cert['tbsCertificate']['subjectPublicKeyInfo'] = new Element(
+                    base64_decode(preg_replace('#-.+-|[\r\n]#', '', $cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey']))
+                );
         }
 
-        $asn1 = new ASN1();
-        $asn1->loadOIDs($this->oids);
-
-        $filters = array();
-        $type_utf8_string = array('type' => ASN1::TYPE_UTF8_STRING);
+        $filters = [];
+        $type_utf8_string = ['type' => ASN1::TYPE_UTF8_STRING];
         $filters['tbsCertificate']['signature']['parameters'] = $type_utf8_string;
         $filters['tbsCertificate']['signature']['issuer']['rdnSequence']['value'] = $type_utf8_string;
         $filters['tbsCertificate']['issuer']['rdnSequence']['value'] = $type_utf8_string;
@@ -1528,52 +525,58 @@ function saveX509($cert, $format = self::FORMAT_PEM)
         $filters['distributionPoint']['fullName']['directoryName']['rdnSequence']['value'] = $type_utf8_string;
         $filters['directoryName']['rdnSequence']['value'] = $type_utf8_string;
 
-        /* in the case of policyQualifiers/qualifier, the type has to be \phpseclib\File\ASN1::TYPE_IA5_STRING.
-           \phpseclib\File\ASN1::TYPE_PRINTABLE_STRING will cause OpenSSL's X.509 parser to spit out random
+        foreach (self::$extensions as $extension) {
+            $filters['tbsCertificate']['extensions'][] = $extension;
+        }
+
+        /* in the case of policyQualifiers/qualifier, the type has to be \phpseclib3\File\ASN1::TYPE_IA5_STRING.
+           \phpseclib3\File\ASN1::TYPE_PRINTABLE_STRING will cause OpenSSL's X.509 parser to spit out random
            characters.
          */
         $filters['policyQualifiers']['qualifier']
-            = array('type' => ASN1::TYPE_IA5_STRING);
+            = ['type' => ASN1::TYPE_IA5_STRING];
 
-        $asn1->loadFilters($filters);
+        ASN1::setFilters($filters);
 
-        $this->_mapOutExtensions($cert, 'tbsCertificate/extensions', $asn1);
+        $this->mapOutExtensions($cert, 'tbsCertificate/extensions');
+        $this->mapOutDNs($cert, 'tbsCertificate/issuer/rdnSequence');
+        $this->mapOutDNs($cert, 'tbsCertificate/subject/rdnSequence');
 
-        $cert = $asn1->encodeDER($cert, $this->Certificate);
+        $cert = ASN1::encodeDER($cert, Maps\Certificate::MAP);
 
         switch ($format) {
             case self::FORMAT_DER:
                 return $cert;
             // case self::FORMAT_PEM:
             default:
-                return "-----BEGIN CERTIFICATE-----\r\n" . chunk_split(base64_encode($cert), 64) . '-----END CERTIFICATE-----';
+                return "-----BEGIN CERTIFICATE-----\r\n" . chunk_split(Strings::base64_encode($cert), 64) . '-----END CERTIFICATE-----';
         }
     }
 
     /**
      * Map extension values from octet string to extension-specific internal
      *   format.
-     *
-     * @param array ref $root
-     * @param string $path
-     * @param object $asn1
-     * @access private
      */
-    function _mapInExtensions(&$root, $path, $asn1)
+    private function mapInExtensions(array &$root, string $path): void
     {
-        $extensions = &$this->_subArray($root, $path);
+        $extensions = &$this->subArrayUnchecked($root, $path);
 
-        if (is_array($extensions)) {
+        if ($extensions) {
             for ($i = 0; $i < count($extensions); $i++) {
                 $id = $extensions[$i]['extnId'];
                 $value = &$extensions[$i]['extnValue'];
-                $value = base64_decode($value);
-                $decoded = $asn1->decodeBER($value);
                 /* [extnValue] contains the DER encoding of an ASN.1 value
                    corresponding to the extension type identified by extnID */
-                $map = $this->_getMapping($id);
+                $map = $this->getMapping($id);
                 if (!is_bool($map)) {
-                    $mapped = $asn1->asn1map($decoded[0], $map, array('iPAddress' => array($this, '_decodeIP')));
+                    $decoder = $id == 'id-ce-nameConstraints' ?
+                        [static::class, 'decodeNameConstraintIP'] :
+                        [static::class, 'decodeIP'];
+                    $decoded = ASN1::decodeBER($value);
+                    if (!$decoded) {
+                        continue;
+                    }
+                    $mapped = ASN1::asn1map($decoded[0], $map, ['iPAddress' => $decoder]);
                     $value = $mapped === false ? $decoded[0] : $mapped;
 
                     if ($id == 'id-ce-certificatePolicies') {
@@ -1583,18 +586,19 @@ function _mapInExtensions(&$root, $path, $asn1)
                             }
                             for ($k = 0; $k < count($value[$j]['policyQualifiers']); $k++) {
                                 $subid = $value[$j]['policyQualifiers'][$k]['policyQualifierId'];
-                                $map = $this->_getMapping($subid);
+                                $map = $this->getMapping($subid);
                                 $subvalue = &$value[$j]['policyQualifiers'][$k]['qualifier'];
                                 if ($map !== false) {
-                                    $decoded = $asn1->decodeBER($subvalue);
-                                    $mapped = $asn1->asn1map($decoded[0], $map);
+                                    $decoded = ASN1::decodeBER($subvalue);
+                                    if (!$decoded) {
+                                        continue;
+                                    }
+                                    $mapped = ASN1::asn1map($decoded[0], $map);
                                     $subvalue = $mapped === false ? $decoded[0] : $mapped;
                                 }
                             }
                         }
                     }
-                } else {
-                    $value = base64_encode($value);
                 }
             }
         }
@@ -1603,15 +607,32 @@ function _mapInExtensions(&$root, $path, $asn1)
     /**
      * Map extension values from extension-specific internal format to
      *   octet string.
-     *
-     * @param array ref $root
-     * @param string $path
-     * @param object $asn1
-     * @access private
      */
-    function _mapOutExtensions(&$root, $path, $asn1)
-    {
-        $extensions = &$this->_subArray($root, $path);
+    private function mapOutExtensions(array &$root, string $path): void
+    {
+        $extensions = &$this->subArray($root, $path, !empty($this->extensionValues));
+
+        foreach ($this->extensionValues as $id => $data) {
+            [
+                'critical' => $critical,
+                'replace' => $replace,
+                'value' => $value
+            ] = $data;
+            $newext = [
+                'extnId' => $id,
+                'extnValue' => $value,
+                'critical' => $critical,
+            ];
+            if ($replace) {
+                foreach ($extensions as $key => $value) {
+                    if ($value['extnId'] == $id) {
+                        $extensions[$key] = $newext;
+                        continue 2;
+                    }
+                }
+            }
+            $extensions[] = $newext;
+        }
 
         if (is_array($extensions)) {
             $size = count($extensions);
@@ -1631,12 +652,12 @@ function _mapOutExtensions(&$root, $path, $asn1)
                             }
                             for ($k = 0; $k < count($value[$j]['policyQualifiers']); $k++) {
                                 $subid = $value[$j]['policyQualifiers'][$k]['policyQualifierId'];
-                                $map = $this->_getMapping($subid);
+                                $map = $this->getMapping($subid);
                                 $subvalue = &$value[$j]['policyQualifiers'][$k]['qualifier'];
                                 if ($map !== false) {
-                                    // by default \phpseclib\File\ASN1 will try to render qualifier as a \phpseclib\File\ASN1::TYPE_IA5_STRING since it's
-                                    // actual type is \phpseclib\File\ASN1::TYPE_ANY
-                                    $subvalue = new Element($asn1->encodeDER($subvalue, $map));
+                                    // by default \phpseclib3\File\ASN1 will try to render qualifier as a \phpseclib3\File\ASN1::TYPE_IA5_STRING since it's
+                                    // actual type is \phpseclib3\File\ASN1::TYPE_ANY
+                                    $subvalue = new Element(ASN1::encodeDER($subvalue, $map));
                                 }
                             }
                         }
@@ -1652,15 +673,14 @@ function _mapOutExtensions(&$root, $path, $asn1)
 
                 /* [extnValue] contains the DER encoding of an ASN.1 value
                    corresponding to the extension type identified by extnID */
-                $map = $this->_getMapping($id);
+                $map = $this->getMapping($id);
                 if (is_bool($map)) {
                     if (!$map) {
                         //user_error($id . ' is not a currently supported extension');
                         unset($extensions[$i]);
                     }
                 } else {
-                    $temp = $asn1->encodeDER($value, $map, array('iPAddress' => array($this, '_encodeIP')));
-                    $value = base64_encode($temp);
+                    $value = ASN1::encodeDER($value, $map, ['iPAddress' => [static::class, 'encodeIP']]);
                 }
             }
         }
@@ -1670,36 +690,36 @@ function _mapOutExtensions(&$root, $path, $asn1)
      * Map attribute values from ANY type to attribute-specific internal
      *   format.
      *
-     * @param array ref $root
-     * @param string $path
-     * @param object $asn1
-     * @access private
+     * @param array $root (by reference)
      */
-    function _mapInAttributes(&$root, $path, $asn1)
+    private function mapInAttributes(array &$root, string $path): void
     {
-        $attributes = &$this->_subArray($root, $path);
+        $attributes = &$this->subArray($root, $path);
 
         if (is_array($attributes)) {
             for ($i = 0; $i < count($attributes); $i++) {
                 $id = $attributes[$i]['type'];
                 /* $value contains the DER encoding of an ASN.1 value
                    corresponding to the attribute type identified by type */
-                $map = $this->_getMapping($id);
+                $map = $this->getMapping($id);
                 if (is_array($attributes[$i]['value'])) {
                     $values = &$attributes[$i]['value'];
                     for ($j = 0; $j < count($values); $j++) {
-                        $value = $asn1->encodeDER($values[$j], $this->AttributeValue);
-                        $decoded = $asn1->decodeBER($value);
+                        $value = ASN1::encodeDER($values[$j], Maps\AttributeValue::MAP);
+                        $decoded = ASN1::decodeBER($value);
                         if (!is_bool($map)) {
-                            $mapped = $asn1->asn1map($decoded[0], $map);
+                            if (!$decoded) {
+                                continue;
+                            }
+                            $mapped = ASN1::asn1map($decoded[0], $map);
                             if ($mapped !== false) {
                                 $values[$j] = $mapped;
                             }
-                            if ($id == 'pkcs-9-at-extensionRequest') {
-                                $this->_mapInExtensions($values, $j, $asn1);
+                            if ($id == 'pkcs-9-at-extensionRequest' && $this->isSubArrayValid($values, (string) $j)) {
+                                $this->mapInExtensions($values, (string) $j);
                             }
                         } elseif ($map) {
-                            $values[$j] = base64_encode($value);
+                            $values[$j] = $value;
                         }
                     }
                 }
@@ -1711,14 +731,11 @@ function _mapInAttributes(&$root, $path, $asn1)
      * Map attribute values from attribute-specific internal format to
      *   ANY type.
      *
-     * @param array ref $root
-     * @param string $path
-     * @param object $asn1
-     * @access private
+     * @param array $root (by reference)
      */
-    function _mapOutAttributes(&$root, $path, $asn1)
+    private function mapOutAttributes(array &$root, string $path): void
     {
-        $attributes = &$this->_subArray($root, $path);
+        $attributes = &$this->subArray($root, $path);
 
         if (is_array($attributes)) {
             $size = count($attributes);
@@ -1726,7 +743,7 @@ function _mapOutAttributes(&$root, $path, $asn1)
                 /* [value] contains the DER encoding of an ASN.1 value
                    corresponding to the attribute type identified by type */
                 $id = $attributes[$i]['type'];
-                $map = $this->_getMapping($id);
+                $map = $this->getMapping($id);
                 if ($map === false) {
                     //user_error($id . ' is not a currently supported attribute', E_USER_NOTICE);
                     unset($attributes[$i]);
@@ -1735,14 +752,17 @@ function _mapOutAttributes(&$root, $path, $asn1)
                     for ($j = 0; $j < count($values); $j++) {
                         switch ($id) {
                             case 'pkcs-9-at-extensionRequest':
-                                $this->_mapOutExtensions($values, $j, $asn1);
+                                $this->mapOutExtensions($values, $j);
                                 break;
                         }
 
                         if (!is_bool($map)) {
-                            $temp = $asn1->encodeDER($values[$j], $map);
-                            $decoded = $asn1->decodeBER($temp);
-                            $values[$j] = $asn1->asn1map($decoded[0], $this->AttributeValue);
+                            $temp = ASN1::encodeDER($values[$j], $map);
+                            $decoded = ASN1::decodeBER($temp);
+                            if (!$decoded) {
+                                continue;
+                            }
+                            $values[$j] = ASN1::asn1map($decoded[0], Maps\AttributeValue::MAP);
                         }
                     }
                 }
@@ -1751,59 +771,118 @@ function _mapOutAttributes(&$root, $path, $asn1)
     }
 
     /**
-     * Associate an extension ID to an extension mapping
+     * Map DN values from ANY type to DN-specific internal
+     *   format.
+     */
+    private function mapInDNs(array &$root, string $path): void
+    {
+        $dns = &$this->subArray($root, $path);
+
+        if (is_array($dns)) {
+            for ($i = 0; $i < count($dns); $i++) {
+                for ($j = 0; $j < count($dns[$i]); $j++) {
+                    $type = $dns[$i][$j]['type'];
+                    $value = &$dns[$i][$j]['value'];
+                    if (is_object($value) && $value instanceof Element) {
+                        $map = $this->getMapping($type);
+                        if (!is_bool($map)) {
+                            $decoded = ASN1::decodeBER($value);
+                            if (!$decoded) {
+                                continue;
+                            }
+                            $value = ASN1::asn1map($decoded[0], $map);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Map DN values from DN-specific internal format to
+     *   ANY type.
      *
-     * @param string $extnId
-     * @access private
-     * @return mixed
+     * @param array $root (by reference)
      */
-    function _getMapping($extnId)
+    private function mapOutDNs(array &$root, string $path): void
     {
-        if (!is_string($extnId)) { // eg. if it's a \phpseclib\File\ASN1\Element object
+        $dns = &$this->subArray($root, $path);
+
+        if (is_array($dns)) {
+            $size = count($dns);
+            for ($i = 0; $i < $size; $i++) {
+                for ($j = 0; $j < count($dns[$i]); $j++) {
+                    $type = $dns[$i][$j]['type'];
+                    $value = &$dns[$i][$j]['value'];
+                    if (is_object($value) && $value instanceof Element) {
+                        continue;
+                    }
+
+                    $map = $this->getMapping($type);
+                    if (!is_bool($map)) {
+                        $value = new Element(ASN1::encodeDER($value, $map));
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Associate an extension ID to an extension mapping
+     */
+    private function getMapping(string $extnId)
+    {
+        if (!is_string($extnId)) { // eg. if it's a \phpseclib3\File\ASN1\Element object
             return true;
         }
 
+        if (isset(self::$extensions[$extnId])) {
+            return self::$extensions[$extnId];
+        }
+
         switch ($extnId) {
             case 'id-ce-keyUsage':
-                return $this->KeyUsage;
+                return Maps\KeyUsage::MAP;
             case 'id-ce-basicConstraints':
-                return $this->BasicConstraints;
+                return Maps\BasicConstraints::MAP;
             case 'id-ce-subjectKeyIdentifier':
-                return $this->KeyIdentifier;
+                return Maps\KeyIdentifier::MAP;
             case 'id-ce-cRLDistributionPoints':
-                return $this->CRLDistributionPoints;
+                return Maps\CRLDistributionPoints::MAP;
             case 'id-ce-authorityKeyIdentifier':
-                return $this->AuthorityKeyIdentifier;
+                return Maps\AuthorityKeyIdentifier::MAP;
             case 'id-ce-certificatePolicies':
-                return $this->CertificatePolicies;
+                return Maps\CertificatePolicies::MAP;
             case 'id-ce-extKeyUsage':
-                return $this->ExtKeyUsageSyntax;
+                return Maps\ExtKeyUsageSyntax::MAP;
             case 'id-pe-authorityInfoAccess':
-                return $this->AuthorityInfoAccessSyntax;
+                return Maps\AuthorityInfoAccessSyntax::MAP;
             case 'id-ce-subjectAltName':
-                return $this->SubjectAltName;
+                return Maps\SubjectAltName::MAP;
+            case 'id-ce-subjectDirectoryAttributes':
+                return Maps\SubjectDirectoryAttributes::MAP;
             case 'id-ce-privateKeyUsagePeriod':
-                return $this->PrivateKeyUsagePeriod;
+                return Maps\PrivateKeyUsagePeriod::MAP;
             case 'id-ce-issuerAltName':
-                return $this->IssuerAltName;
+                return Maps\IssuerAltName::MAP;
             case 'id-ce-policyMappings':
-                return $this->PolicyMappings;
+                return Maps\PolicyMappings::MAP;
             case 'id-ce-nameConstraints':
-                return $this->NameConstraints;
+                return Maps\NameConstraints::MAP;
 
             case 'netscape-cert-type':
-                return $this->netscape_cert_type;
+                return Maps\netscape_cert_type::MAP;
             case 'netscape-comment':
-                return $this->netscape_comment;
+                return Maps\netscape_comment::MAP;
             case 'netscape-ca-policy-url':
-                return $this->netscape_ca_policy_url;
+                return Maps\netscape_ca_policy_url::MAP;
 
             // since id-qt-cps isn't a constructed type it will have already been decoded as a string by the time it gets
             // back around to asn1map() and we don't want it decoded again.
             //case 'id-qt-cps':
-            //    return $this->CPSuri;
+            //    return Maps\CPSuri::MAP;
             case 'id-qt-unotice':
-                return $this->UserNotice;
+                return Maps\UserNotice::MAP;
 
             // the following OIDs are unsupported but we don't want them to give notices when calling saveX509().
             case 'id-pe-logotype': // http://www.ietf.org/rfc/rfc3709.txt
@@ -1814,33 +893,41 @@ function _getMapping($extnId)
             // "SET Secure Electronic Transaction Specification"
             // http://www.maithean.com/docs/set_bk3.pdf
             case '2.23.42.7.0': // id-set-hashedRootKey
+            // "Certificate Transparency"
+            // https://tools.ietf.org/html/rfc6962
+            case '1.3.6.1.4.1.11129.2.4.2':
+            // "Qualified Certificate statements"
+            // https://tools.ietf.org/html/rfc3739#section-3.2.6
+            case '1.3.6.1.5.5.7.1.3':
                 return true;
 
             // CSR attributes
             case 'pkcs-9-at-unstructuredName':
-                return $this->PKCS9String;
+                return Maps\PKCS9String::MAP;
             case 'pkcs-9-at-challengePassword':
-                return $this->DirectoryString;
+                return Maps\DirectoryString::MAP;
             case 'pkcs-9-at-extensionRequest':
-                return $this->Extensions;
+                return Maps\Extensions::MAP;
 
             // CRL extensions.
             case 'id-ce-cRLNumber':
-                return $this->CRLNumber;
+                return Maps\CRLNumber::MAP;
             case 'id-ce-deltaCRLIndicator':
-                return $this->CRLNumber;
+                return Maps\CRLNumber::MAP;
             case 'id-ce-issuingDistributionPoint':
-                return $this->IssuingDistributionPoint;
+                return Maps\IssuingDistributionPoint::MAP;
             case 'id-ce-freshestCRL':
-                return $this->CRLDistributionPoints;
+                return Maps\CRLDistributionPoints::MAP;
             case 'id-ce-cRLReasons':
-                return $this->CRLReason;
+                return Maps\CRLReason::MAP;
             case 'id-ce-invalidityDate':
-                return $this->InvalidityDate;
+                return Maps\InvalidityDate::MAP;
             case 'id-ce-certificateIssuer':
-                return $this->CertificateIssuer;
+                return Maps\CertificateIssuer::MAP;
             case 'id-ce-holdInstructionCode':
-                return $this->HoldInstructionCode;
+                return Maps\HoldInstructionCode::MAP;
+            case 'id-at-postalAddress':
+                return Maps\PostalAddress::MAP;
         }
 
         return false;
@@ -1848,12 +935,8 @@ function _getMapping($extnId)
 
     /**
      * Load an X.509 certificate as a certificate authority
-     *
-     * @param string $cert
-     * @access public
-     * @return bool
      */
-    function loadCA($cert)
+    public function loadCA(string $cert): bool
     {
         $olddn = $this->dn;
         $oldcert = $this->currentCert;
@@ -1915,12 +998,8 @@ function loadCA($cert)
      * character * which is considered to match any single domain name
      * component or component fragment. E.g., *.a.com matches foo.a.com but
      * not bar.foo.a.com. f*.com matches foo.com but not bar.com.
-     *
-     * @param string $url
-     * @access public
-     * @return bool
      */
-    function validateURL($url)
+    public function validateURL(string $url): bool
     {
         if (!is_array($this->currentCert) || !isset($this->currentCert['tbsCertificate'])) {
             return false;
@@ -1932,38 +1011,41 @@ function validateURL($url)
         }
 
         if ($names = $this->getExtension('id-ce-subjectAltName')) {
-            foreach ($names as $key => $value) {
-                $value = str_replace(array('.', '*'), array('\.', '[^.]*'), $value);
-                switch ($key) {
-                    case 'dNSName':
-                        /* From RFC2818 "HTTP over TLS":
-
-                           If a subjectAltName extension of type dNSName is present, that MUST
-                           be used as the identity. Otherwise, the (most specific) Common Name
-                           field in the Subject field of the certificate MUST be used. Although
-                           the use of the Common Name is existing practice, it is deprecated and
-                           Certification Authorities are encouraged to use the dNSName instead. */
-                        if (preg_match('#^' . $value . '$#', $components['host'])) {
-                            return true;
-                        }
-                        break;
-                    case 'iPAddress':
-                        /* From RFC2818 "HTTP over TLS":
-
-                           In some cases, the URI is specified as an IP address rather than a
-                           hostname. In this case, the iPAddress subjectAltName must be present
-                           in the certificate and must exactly match the IP in the URI. */
-                        if (preg_match('#(?:\d{1-3}\.){4}#', $components['host'] . '.') && preg_match('#^' . $value . '$#', $components['host'])) {
-                            return true;
-                        }
+            foreach ($names as $name) {
+                foreach ($name as $key => $value) {
+                    $value = preg_quote($value);
+                    $value = str_replace('\*', '[^.]*', $value);
+                    switch ($key) {
+                        case 'dNSName':
+                            /* From RFC2818 "HTTP over TLS":
+
+                               If a subjectAltName extension of type dNSName is present, that MUST
+                               be used as the identity. Otherwise, the (most specific) Common Name
+                               field in the Subject field of the certificate MUST be used. Although
+                               the use of the Common Name is existing practice, it is deprecated and
+                               Certification Authorities are encouraged to use the dNSName instead. */
+                            if (preg_match('#^' . $value . '$#', $components['host'])) {
+                                return true;
+                            }
+                            break;
+                        case 'iPAddress':
+                            /* From RFC2818 "HTTP over TLS":
+
+                               In some cases, the URI is specified as an IP address rather than a
+                               hostname. In this case, the iPAddress subjectAltName must be present
+                               in the certificate and must exactly match the IP in the URI. */
+                            if (preg_match('#(?:\d{1-3}\.){4}#', $components['host'] . '.') && preg_match('#^' . $value . '$#', $components['host'])) {
+                                return true;
+                            }
+                    }
                 }
             }
             return false;
         }
 
         if ($value = $this->getDNProp('id-at-commonName')) {
-            $value = str_replace(array('.', '*'), array('\.', '[^.]*'), $value[0]);
-            return preg_match('#^' . $value . '$#', $components['host']);
+            $value = str_replace(['.', '*'], ['\.', '[^.]*'], $value[0]);
+            return preg_match('#^' . $value . '$#', $components['host']) === 1;
         }
 
         return false;
@@ -1974,31 +1056,143 @@ function validateURL($url)
      *
      * If $date isn't defined it is assumed to be the current date.
      *
-     * @param int $date optional
-     * @access public
+     * @param \DateTimeInterface|string $date optional
      */
-    function validateDate($date = null)
+    public function validateDate($date = null): bool
     {
         if (!is_array($this->currentCert) || !isset($this->currentCert['tbsCertificate'])) {
             return false;
         }
 
         if (!isset($date)) {
-            $date = time();
+            $date = new \DateTimeImmutable('now', new \DateTimeZone(@date_default_timezone_get()));
         }
 
         $notBefore = $this->currentCert['tbsCertificate']['validity']['notBefore'];
-        $notBefore = isset($notBefore['generalTime']) ? $notBefore['generalTime'] : $notBefore['utcTime'];
+        $notBefore = $notBefore['generalTime'] ?? $notBefore['utcTime'];
 
         $notAfter = $this->currentCert['tbsCertificate']['validity']['notAfter'];
-        $notAfter = isset($notAfter['generalTime']) ? $notAfter['generalTime'] : $notAfter['utcTime'];
+        $notAfter = $notAfter['generalTime'] ?? $notAfter['utcTime'];
 
-        switch (true) {
-            case $date < @strtotime($notBefore):
-            case $date > @strtotime($notAfter):
-                return false;
+        if (is_string($date)) {
+            $date = new \DateTimeImmutable($date, new \DateTimeZone(@date_default_timezone_get()));
+        }
+
+        $notBefore = new \DateTimeImmutable($notBefore, new \DateTimeZone(@date_default_timezone_get()));
+        $notAfter = new \DateTimeImmutable($notAfter, new \DateTimeZone(@date_default_timezone_get()));
+
+        return $date >= $notBefore && $date <= $notAfter;
+    }
+
+    /**
+     * Fetches a URL
+     *
+     * @return bool|string
+     */
+    private static function fetchURL(string $url)
+    {
+        if (self::$disable_url_fetch) {
+            return false;
+        }
+
+        $parts = parse_url($url);
+        $data = '';
+        switch ($parts['scheme']) {
+            case 'http':
+                $fsock = @fsockopen($parts['host'], $parts['port'] ?? 80);
+                if (!$fsock) {
+                    return false;
+                }
+                $path = $parts['path'];
+                if (isset($parts['query'])) {
+                    $path .= '?' . $parts['query'];
+                }
+                fwrite($fsock, "GET $path HTTP/1.0\r\n");
+                fwrite($fsock, "Host: $parts[host]\r\n\r\n");
+                $line = fgets($fsock, 1024);
+                if (strlen($line) < 3) {
+                    return false;
+                }
+                preg_match('#HTTP/1.\d (\d{3})#', $line, $temp);
+                if ($temp[1] != '200') {
+                    return false;
+                }
+
+                // skip the rest of the headers in the http response
+                while (!feof($fsock) && fgets($fsock, 1024) != "\r\n") {
+                }
+
+                while (!feof($fsock)) {
+                    $temp = fread($fsock, 1024);
+                    if ($temp === false) {
+                        return false;
+                    }
+                    $data .= $temp;
+                }
+
+                break;
+            //case 'ftp':
+            //case 'ldap':
+            //default:
+        }
+
+        return $data;
+    }
+
+    /**
+     * Validates an intermediate cert as identified via authority info access extension
+     *
+     * See https://tools.ietf.org/html/rfc4325 for more info
+     */
+    private function testForIntermediate(bool $caonly, int $count): bool
+    {
+        $opts = $this->getExtension('id-pe-authorityInfoAccess');
+        if (!is_array($opts)) {
+            return false;
+        }
+        foreach ($opts as $opt) {
+            if ($opt['accessMethod'] == 'id-ad-caIssuers') {
+                // accessLocation is a GeneralName. GeneralName fields support stuff like email addresses, IP addresses, LDAP,
+                // etc, but we're only supporting URI's. URI's and LDAP are the only thing https://tools.ietf.org/html/rfc4325
+                // discusses
+                if (isset($opt['accessLocation']['uniformResourceIdentifier'])) {
+                    $url = $opt['accessLocation']['uniformResourceIdentifier'];
+                    break;
+                }
+            }
         }
 
+        if (!isset($url)) {
+            return false;
+        }
+
+        $cert = static::fetchURL($url);
+        if (!is_string($cert)) {
+            return false;
+        }
+
+        $parent = new static();
+        $parent->CAs = $this->CAs;
+        /*
+         "Conforming applications that support HTTP or FTP for accessing
+          certificates MUST be able to accept .cer files and SHOULD be able
+          to accept .p7c files." -- https://tools.ietf.org/html/rfc4325
+
+         A .p7c file is 'a "certs-only" CMS message as specified in RFC 2797"
+
+         These are currently unsupported
+        */
+        if (!is_array($parent->loadX509($cert))) {
+            return false;
+        }
+
+        if (!$parent->validateSignatureCountable($caonly, ++$count)) {
+            return false;
+        }
+
+        $this->CAs[] = $parent->currentCert;
+        //$this->loadCA($cert);
+
         return true;
     }
 
@@ -2014,15 +1208,27 @@ function validateDate($date = null)
      * The behavior of this function is inspired by {@link http://php.net/openssl-verify openssl_verify}.
      *
      * @param bool $caonly optional
-     * @access public
-     * @return mixed
      */
-    function validateSignature($caonly = true)
+    public function validateSignature(bool $caonly = true): ?bool
+    {
+        return $this->validateSignatureCountable($caonly, 0);
+    }
+
+    /**
+     * Validate a signature
+     *
+     * Performs said validation whilst keeping track of how many times validation method is called
+     */
+    private function validateSignatureCountable(bool $caonly, int $count): ?bool
     {
         if (!is_array($this->currentCert) || !isset($this->signatureSubject)) {
             return null;
         }
 
+        if ($count == self::$recur_limit) {
+            return false;
+        }
+
         /* TODO:
            "emailAddress attribute values are not case-sensitive (e.g., "subscriber@example.com" is the same as "SUBSCRIBER@EXAMPLE.COM")."
             -- http://tools.ietf.org/html/rfc5280#section-4.1.2.6
@@ -2032,14 +1238,17 @@ function validateSignature($caonly = true)
         switch (true) {
             case isset($this->currentCert['tbsCertificate']):
                 // self-signed cert
-                if ($this->currentCert['tbsCertificate']['issuer'] === $this->currentCert['tbsCertificate']['subject']) {
-                    $authorityKey = $this->getExtension('id-ce-authorityKeyIdentifier');
-                    $subjectKeyID = $this->getExtension('id-ce-subjectKeyIdentifier');
-                    switch (true) {
-                        case !is_array($authorityKey):
-                        case is_array($authorityKey) && isset($authorityKey['keyIdentifier']) && $authorityKey['keyIdentifier'] === $subjectKeyID:
-                            $signingCert = $this->currentCert; // working cert
-                    }
+                switch (true) {
+                    case !defined('FILE_X509_IGNORE_TYPE') && $this->currentCert['tbsCertificate']['issuer'] === $this->currentCert['tbsCertificate']['subject']:
+                    case defined('FILE_X509_IGNORE_TYPE') && $this->getIssuerDN(self::DN_STRING) === $this->getDN(self::DN_STRING):
+                        $authorityKey = $this->getExtension('id-ce-authorityKeyIdentifier');
+                        $subjectKeyID = $this->getExtension('id-ce-subjectKeyIdentifier');
+                        switch (true) {
+                            case !is_array($authorityKey):
+                            case !$subjectKeyID:
+                            case isset($authorityKey['keyIdentifier']) && $authorityKey['keyIdentifier'] === $subjectKeyID:
+                                $signingCert = $this->currentCert; // working cert
+                        }
                 }
 
                 if (!empty($this->CAs)) {
@@ -2047,70 +1256,82 @@ function validateSignature($caonly = true)
                         // even if the cert is a self-signed one we still want to see if it's a CA;
                         // if not, we'll conditionally return an error
                         $ca = $this->CAs[$i];
-                        if ($this->currentCert['tbsCertificate']['issuer'] === $ca['tbsCertificate']['subject']) {
-                            $authorityKey = $this->getExtension('id-ce-authorityKeyIdentifier');
-                            $subjectKeyID = $this->getExtension('id-ce-subjectKeyIdentifier', $ca);
-                            switch (true) {
-                                case !is_array($authorityKey):
-                                case is_array($authorityKey) && isset($authorityKey['keyIdentifier']) && $authorityKey['keyIdentifier'] === $subjectKeyID:
-                                    $signingCert = $ca; // working cert
-                                    break 2;
-                            }
+                        switch (true) {
+                            case !defined('FILE_X509_IGNORE_TYPE') && $this->currentCert['tbsCertificate']['issuer'] === $ca['tbsCertificate']['subject']:
+                            case defined('FILE_X509_IGNORE_TYPE') && $this->getDN(self::DN_STRING, $this->currentCert['tbsCertificate']['issuer']) === $this->getDN(self::DN_STRING, $ca['tbsCertificate']['subject']):
+                                $authorityKey = $this->getExtension('id-ce-authorityKeyIdentifier');
+                                $subjectKeyID = $this->getExtension('id-ce-subjectKeyIdentifier', $ca);
+                                switch (true) {
+                                    case !is_array($authorityKey):
+                                    case !$subjectKeyID:
+                                    case isset($authorityKey['keyIdentifier']) && $authorityKey['keyIdentifier'] === $subjectKeyID:
+                                        if (is_array($authorityKey) && isset($authorityKey['authorityCertSerialNumber']) && !$authorityKey['authorityCertSerialNumber']->equals($ca['tbsCertificate']['serialNumber'])) {
+                                            break 2; // serial mismatch - check other ca
+                                        }
+                                        $signingCert = $ca; // working cert
+                                        break 3;
+                                }
                         }
                     }
                     if (count($this->CAs) == $i && $caonly) {
-                        return false;
+                        return $this->testForIntermediate($caonly, $count) && $this->validateSignature($caonly);
                     }
                 } elseif (!isset($signingCert) || $caonly) {
-                    return false;
+                    return $this->testForIntermediate($caonly, $count) && $this->validateSignature($caonly);
                 }
-                return $this->_validateSignature(
+                return $this->validateSignatureHelper(
                     $signingCert['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['algorithm'],
                     $signingCert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'],
                     $this->currentCert['signatureAlgorithm']['algorithm'],
-                    substr(base64_decode($this->currentCert['signature']), 1),
+                    substr($this->currentCert['signature'], 1),
                     $this->signatureSubject
                 );
             case isset($this->currentCert['certificationRequestInfo']):
-                return $this->_validateSignature(
+                return $this->validateSignatureHelper(
                     $this->currentCert['certificationRequestInfo']['subjectPKInfo']['algorithm']['algorithm'],
                     $this->currentCert['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey'],
                     $this->currentCert['signatureAlgorithm']['algorithm'],
-                    substr(base64_decode($this->currentCert['signature']), 1),
+                    substr($this->currentCert['signature'], 1),
                     $this->signatureSubject
                 );
             case isset($this->currentCert['publicKeyAndChallenge']):
-                return $this->_validateSignature(
+                return $this->validateSignatureHelper(
                     $this->currentCert['publicKeyAndChallenge']['spki']['algorithm']['algorithm'],
                     $this->currentCert['publicKeyAndChallenge']['spki']['subjectPublicKey'],
                     $this->currentCert['signatureAlgorithm']['algorithm'],
-                    substr(base64_decode($this->currentCert['signature']), 1),
+                    substr($this->currentCert['signature'], 1),
                     $this->signatureSubject
                 );
             case isset($this->currentCert['tbsCertList']):
                 if (!empty($this->CAs)) {
                     for ($i = 0; $i < count($this->CAs); $i++) {
                         $ca = $this->CAs[$i];
-                        if ($this->currentCert['tbsCertList']['issuer'] === $ca['tbsCertificate']['subject']) {
-                            $authorityKey = $this->getExtension('id-ce-authorityKeyIdentifier');
-                            $subjectKeyID = $this->getExtension('id-ce-subjectKeyIdentifier', $ca);
-                            switch (true) {
-                                case !is_array($authorityKey):
-                                case is_array($authorityKey) && isset($authorityKey['keyIdentifier']) && $authorityKey['keyIdentifier'] === $subjectKeyID:
-                                    $signingCert = $ca; // working cert
-                                    break 2;
-                            }
+                        switch (true) {
+                            case !defined('FILE_X509_IGNORE_TYPE') && $this->currentCert['tbsCertList']['issuer'] === $ca['tbsCertificate']['subject']:
+                            case defined('FILE_X509_IGNORE_TYPE') && $this->getDN(self::DN_STRING, $this->currentCert['tbsCertList']['issuer']) === $this->getDN(self::DN_STRING, $ca['tbsCertificate']['subject']):
+                                $authorityKey = $this->getExtension('id-ce-authorityKeyIdentifier');
+                                $subjectKeyID = $this->getExtension('id-ce-subjectKeyIdentifier', $ca);
+                                switch (true) {
+                                    case !is_array($authorityKey):
+                                    case !$subjectKeyID:
+                                    case isset($authorityKey['keyIdentifier']) && $authorityKey['keyIdentifier'] === $subjectKeyID:
+                                        if (is_array($authorityKey) && isset($authorityKey['authorityCertSerialNumber']) && !$authorityKey['authorityCertSerialNumber']->equals($ca['tbsCertificate']['serialNumber'])) {
+                                            break 2; // serial mismatch - check other ca
+                                        }
+                                        $signingCert = $ca; // working cert
+                                        break 3;
+                                }
                         }
                     }
                 }
                 if (!isset($signingCert)) {
                     return false;
                 }
-                return $this->_validateSignature(
+                return $this->validateSignatureHelper(
                     $signingCert['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['algorithm'],
                     $signingCert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'],
                     $this->currentCert['signatureAlgorithm']['algorithm'],
-                    substr(base64_decode($this->currentCert['signature']), 1),
+                    substr($this->currentCert['signature'], 1),
                     $this->signatureSubject
                 );
             default:
@@ -2124,23 +1345,19 @@ function validateSignature($caonly = true)
      * Returns true if the signature is verified and false if it is not correct.
      * If the algorithms are unsupposed an exception is thrown.
      *
-     * @param string $publicKeyAlgorithm
-     * @param string $publicKey
-     * @param string $signatureAlgorithm
-     * @param string $signature
-     * @param string $signatureSubject
-     * @access private
-     * @throws \phpseclib\Exception\UnsupportedAlgorithmException if the algorithm is unsupported
-     * @return bool
+     * @throws UnsupportedAlgorithmException if the algorithm is unsupported
      */
-    function _validateSignature($publicKeyAlgorithm, $publicKey, $signatureAlgorithm, $signature, $signatureSubject)
+    private function validateSignatureHelper(string $publicKeyAlgorithm, string $publicKey, string $signatureAlgorithm, string $signature, string $signatureSubject): bool
     {
         switch ($publicKeyAlgorithm) {
+            case 'id-RSASSA-PSS':
+                $key = RSA::loadFormat('PSS', $publicKey);
+                break;
             case 'rsaEncryption':
-                $rsa = new RSA();
-                $rsa->load($publicKey);
-
+                $key = RSA::loadFormat('PKCS8', $publicKey);
                 switch ($signatureAlgorithm) {
+                    case 'id-RSASSA-PSS':
+                        break;
                     case 'md2WithRSAEncryption':
                     case 'md5WithRSAEncryption':
                     case 'sha1WithRSAEncryption':
@@ -2148,11 +1365,41 @@ function _validateSignature($publicKeyAlgorithm, $publicKey, $signatureAlgorithm
                     case 'sha256WithRSAEncryption':
                     case 'sha384WithRSAEncryption':
                     case 'sha512WithRSAEncryption':
-                        $rsa->setHash(preg_replace('#WithRSAEncryption$#', '', $signatureAlgorithm));
-                        $rsa->setSignatureMode(RSA::SIGNATURE_PKCS1);
-                        if (!@$rsa->verify($signatureSubject, $signature)) {
-                            return false;
-                        }
+                        $key = $key
+                            ->withHash(preg_replace('#WithRSAEncryption$#', '', $signatureAlgorithm))
+                            ->withPadding(RSA::SIGNATURE_PKCS1);
+                        break;
+                    default:
+                        throw new UnsupportedAlgorithmException('Signature algorithm unsupported');
+                }
+                break;
+            case 'id-Ed25519':
+            case 'id-Ed448':
+                $key = EC::loadFormat('PKCS8', $publicKey);
+                break;
+            case 'id-ecPublicKey':
+                $key = EC::loadFormat('PKCS8', $publicKey);
+                switch ($signatureAlgorithm) {
+                    case 'ecdsa-with-SHA1':
+                    case 'ecdsa-with-SHA224':
+                    case 'ecdsa-with-SHA256':
+                    case 'ecdsa-with-SHA384':
+                    case 'ecdsa-with-SHA512':
+                        $key = $key
+                            ->withHash(preg_replace('#^ecdsa-with-#', '', strtolower($signatureAlgorithm)));
+                        break;
+                    default:
+                        throw new UnsupportedAlgorithmException('Signature algorithm unsupported');
+                }
+                break;
+            case 'id-dsa':
+                $key = DSA::loadFormat('PKCS8', $publicKey);
+                switch ($signatureAlgorithm) {
+                    case 'id-dsa-with-sha1':
+                    case 'id-dsa-with-sha224':
+                    case 'id-dsa-with-sha256':
+                        $key = $key
+                            ->withHash(preg_replace('#^id-dsa-with-#', '', strtolower($signatureAlgorithm)));
                         break;
                     default:
                         throw new UnsupportedAlgorithmException('Signature algorithm unsupported');
@@ -2162,49 +1409,58 @@ function _validateSignature($publicKeyAlgorithm, $publicKey, $signatureAlgorithm
                 throw new UnsupportedAlgorithmException('Public key algorithm unsupported');
         }
 
-        return true;
+        return $key->verify($signatureSubject, $signature);
     }
 
     /**
-     * Reformat public keys
-     *
-     * Reformats a public key to a format supported by phpseclib (if applicable)
+     * Sets the recursion limit
      *
-     * @param string $algorithm
-     * @param string $key
-     * @access private
-     * @return string
+     * When validating a signature it may be necessary to download intermediate certs from URI's.
+     * An intermediate cert that linked to itself would result in an infinite loop so to prevent
+     * that we set a recursion limit. A negative number means that there is no recursion limit.
      */
-    function _reformatKey($algorithm, $key)
+    public static function setRecurLimit(int $count): void
     {
-        switch ($algorithm) {
-            case 'rsaEncryption':
-                return
-                    "-----BEGIN RSA PUBLIC KEY-----\r\n" .
-                    // subjectPublicKey is stored as a bit string in X.509 certs.  the first byte of a bit string represents how many bits
-                    // in the last byte should be ignored.  the following only supports non-zero stuff but as none of the X.509 certs Firefox
-                    // uses as a cert authority actually use a non-zero bit I think it's safe to assume that none do.
-                    chunk_split(base64_encode(substr(base64_decode($key), 1)), 64) .
-                    '-----END RSA PUBLIC KEY-----';
-            default:
-                return $key;
-        }
+        self::$recur_limit = $count;
+    }
+
+    /**
+     * Prevents URIs from being automatically retrieved
+     */
+    public static function disableURLFetch(): void
+    {
+        self::$disable_url_fetch = true;
+    }
+
+    /**
+     * Allows URIs to be automatically retrieved
+     */
+    public static function enableURLFetch(): void
+    {
+        self::$disable_url_fetch = false;
     }
 
     /**
      * Decodes an IP address
      *
      * Takes in a base64 encoded "blob" and returns a human readable IP address
+     */
+    public static function decodeIP(string $ip): string
+    {
+        return inet_ntop($ip);
+    }
+
+    /**
+     * Decodes an IP address in a name constraints extension
      *
-     * @param string $ip
-     * @access private
-     * @return string
+     * Takes in a base64 encoded "blob" and returns a human readable IP address / mask
      */
-    function _decodeIP($ip)
+    public static function decodeNameConstraintIP(string $ip): array
     {
-        $ip = base64_decode($ip);
-        list(, $ip) = unpack('N', $ip);
-        return long2ip($ip);
+        $size = strlen($ip) >> 1;
+        $mask = substr($ip, $size);
+        $ip = substr($ip, 0, $size);
+        return [inet_ntop($ip), inet_ntop($mask)];
     }
 
     /**
@@ -2212,25 +1468,35 @@ function _decodeIP($ip)
      *
      * Takes a human readable IP address into a base64-encoded "blob"
      *
-     * @param string $ip
-     * @access private
-     * @return string
+     * @param string|array $ip
      */
-    function _encodeIP($ip)
+    public static function encodeIP($ip): string
     {
-        return base64_encode(pack('N', ip2long($ip)));
+        return is_string($ip) ?
+            inet_pton($ip) :
+            inet_pton($ip[0]) . inet_pton($ip[1]);
     }
 
     /**
      * "Normalizes" a Distinguished Name property
-     *
-     * @param string $propName
-     * @access private
-     * @return mixed
      */
-    function _translateDNProp($propName)
+    private function translateDNProp(string $propName)
     {
         switch (strtolower($propName)) {
+            case 'jurisdictionofincorporationcountryname':
+            case 'jurisdictioncountryname':
+            case 'jurisdictionc':
+                return 'jurisdictionOfIncorporationCountryName';
+            case 'jurisdictionofincorporationstateorprovincename':
+            case 'jurisdictionstateorprovincename':
+            case 'jurisdictionst':
+                return 'jurisdictionOfIncorporationStateOrProvinceName';
+            case 'jurisdictionlocalityname':
+            case 'jurisdictionl':
+                return 'jurisdictionLocalityName';
+            case 'id-at-businesscategory':
+            case 'businesscategory':
+                return 'id-at-businessCategory';
             case 'id-at-countryname':
             case 'countryname':
             case 'c':
@@ -2305,6 +1571,9 @@ function _translateDNProp($propName)
             case 'uniqueidentifier':
             case 'x500uniqueidentifier':
                 return 'id-at-uniqueIdentifier';
+            case 'postaladdress':
+            case 'id-at-postaladdress':
+                return 'id-at-postalAddress';
             default:
                 return false;
         }
@@ -2313,32 +1582,28 @@ function _translateDNProp($propName)
     /**
      * Set a Distinguished Name property
      *
-     * @param string $propName
-     * @param mixed $propValue
      * @param string $type optional
-     * @access public
-     * @return bool
      */
-    function setDNProp($propName, $propValue, $type = 'utf8String')
+    public function setDNProp(string $propName, $propValue, string $type = 'utf8String'): bool
     {
         if (empty($this->dn)) {
-            $this->dn = array('rdnSequence' => array());
+            $this->dn = ['rdnSequence' => []];
         }
 
-        if (($propName = $this->_translateDNProp($propName)) === false) {
+        if (($propName = $this->translateDNProp($propName)) === false) {
             return false;
         }
 
         foreach ((array) $propValue as $v) {
             if (!is_array($v) && isset($type)) {
-                $v = array($type => $v);
+                $v = [$type => $v];
             }
-            $this->dn['rdnSequence'][] = array(
-                array(
+            $this->dn['rdnSequence'][] = [
+                [
                     'type' => $propName,
-                    'value'=> $v
-                )
-            );
+                    'value' => $v,
+                ],
+            ];
         }
 
         return true;
@@ -2346,17 +1611,14 @@ function setDNProp($propName, $propValue, $type = 'utf8String')
 
     /**
      * Remove Distinguished Name properties
-     *
-     * @param string $propName
-     * @access public
      */
-    function removeDNProp($propName)
+    public function removeDNProp(string $propName): void
     {
         if (empty($this->dn)) {
             return;
         }
 
-        if (($propName = $this->_translateDNProp($propName)) === false) {
+        if (($propName = $this->translateDNProp($propName)) === false) {
             return;
         }
 
@@ -2369,18 +1631,16 @@ function removeDNProp($propName)
         }
 
         $dn = array_values($dn);
+        // fix for https://bugs.php.net/75433 affecting PHP 7.2
+        if (!isset($dn[0])) {
+            $dn = array_splice($dn, 0, 0);
+        }
     }
 
     /**
      * Get Distinguished Name properties
-     *
-     * @param string $propName
-     * @param array $dn optional
-     * @param bool $withType optional
-     * @return mixed
-     * @access public
      */
-    function getDNProp($propName, $dn = null, $withType = false)
+    public function getDNProp(string $propName, ?array $dn = null, bool $withType = false)
     {
         if (!isset($dn)) {
             $dn = $this->dn;
@@ -2390,29 +1650,43 @@ function getDNProp($propName, $dn = null, $withType = false)
             return false;
         }
 
-        if (($propName = $this->_translateDNProp($propName)) === false) {
+        if (($propName = $this->translateDNProp($propName)) === false) {
             return false;
         }
 
+        $filters = [];
+        $filters['value'] = ['type' => ASN1::TYPE_UTF8_STRING];
+        ASN1::setFilters($filters);
+        $this->mapOutDNs($dn, 'rdnSequence');
         $dn = $dn['rdnSequence'];
-        $result = array();
-        $asn1 = new ASN1();
+        $result = [];
         for ($i = 0; $i < count($dn); $i++) {
             if ($dn[$i][0]['type'] == $propName) {
                 $v = $dn[$i][0]['value'];
-                if (!$withType && is_array($v)) {
-                    foreach ($v as $type => $s) {
-                        $type = array_search($type, $asn1->ANYmap, true);
-                        if ($type !== false && isset($asn1->stringTypeSize[$type])) {
-                            $s = $asn1->convert($s, $type);
-                            if ($s !== false) {
-                                $v = $s;
-                                break;
+                if (!$withType) {
+                    if (is_array($v)) {
+                        foreach ($v as $type => $s) {
+                            $type = array_search($type, ASN1::ANY_MAP);
+                            if ($type !== false && array_key_exists($type, ASN1::STRING_TYPE_SIZE)) {
+                                $s = ASN1::convert($s, $type);
+                                if ($s !== false) {
+                                    $v = $s;
+                                    break;
+                                }
                             }
                         }
-                    }
-                    if (is_array($v)) {
-                        $v = array_pop($v); // Always strip data type.
+                        if (is_array($v)) {
+                            $v = array_pop($v); // Always strip data type.
+                        }
+                    } elseif (is_object($v) && $v instanceof Element) {
+                        $map = $this->getMapping($propName);
+                        if (!is_bool($map)) {
+                            $decoded = ASN1::decodeBER($v);
+                            if (!$decoded) {
+                                return false;
+                            }
+                            $v = ASN1::asn1map($decoded[0], $map);
+                        }
                     }
                 }
                 $result[] = $v;
@@ -2425,13 +1699,10 @@ function getDNProp($propName, $dn = null, $withType = false)
     /**
      * Set a Distinguished Name
      *
-     * @param mixed $dn
      * @param bool $merge optional
      * @param string $type optional
-     * @access public
-     * @return bool
      */
-    function setDN($dn, $merge = false, $type = 'utf8String')
+    public function setDN($dn, bool $merge = false, string $type = 'utf8String'): bool
     {
         if (!$merge) {
             $this->dn = null;
@@ -2453,8 +1724,8 @@ function setDN($dn, $merge = false, $type = 'utf8String')
         }
 
         // handles everything else
-        $results = preg_split('#((?:^|, *|/)(?:C=|O=|OU=|CN=|L=|ST=|SN=|postalCode=|streetAddress=|emailAddress=|serialNumber=|organizationalUnitName=|title=|description=|role=|x500UniqueIdentifier=))#', $dn, -1, PREG_SPLIT_DELIM_CAPTURE);
-        for ($i = 1; $i < count($results); $i+=2) {
+        $results = preg_split('#((?:^|, *|/)(?:C=|O=|OU=|CN=|L=|ST=|SN=|postalCode=|streetAddress=|emailAddress=|serialNumber=|organizationalUnitName=|title=|description=|role=|x500UniqueIdentifier=|postalAddress=))#', $dn, -1, PREG_SPLIT_DELIM_CAPTURE);
+        for ($i = 1; $i < count($results); $i += 2) {
             $prop = trim($results[$i], ', =/');
             $value = $results[$i + 1];
             if (!$this->setDNProp($prop, $value, $type)) {
@@ -2469,11 +1740,10 @@ function setDN($dn, $merge = false, $type = 'utf8String')
      * Get the Distinguished Name for a certificates subject
      *
      * @param mixed $format optional
-     * @param array $dn optional
-     * @access public
-     * @return bool
+     * @param array|null $dn optional
+     * @return array|bool|string
      */
-    function getDN($format = self::DN_ARRAY, $dn = null)
+    public function getDN($format = self::DN_ARRAY, ?array $dn = null)
     {
         if (!isset($dn)) {
             $dn = isset($this->currentCert['tbsCertList']) ? $this->currentCert['tbsCertList']['issuer'] : $this->dn;
@@ -2483,46 +1753,28 @@ function getDN($format = self::DN_ARRAY, $dn = null)
             case self::DN_ARRAY:
                 return $dn;
             case self::DN_ASN1:
-                $asn1 = new ASN1();
-                $asn1->loadOIDs($this->oids);
-                $filters = array();
-                $filters['rdnSequence']['value'] = array('type' => ASN1::TYPE_UTF8_STRING);
-                $asn1->loadFilters($filters);
-                return $asn1->encodeDER($dn, $this->Name);
-            case self::DN_OPENSSL:
-                $dn = $this->getDN(self::DN_STRING, $dn);
-                if ($dn === false) {
-                    return false;
-                }
-                $attrs = preg_split('#((?:^|, *|/)[a-z][a-z0-9]*=)#i', $dn, -1, PREG_SPLIT_DELIM_CAPTURE);
-                $dn = array();
-                for ($i = 1; $i < count($attrs); $i += 2) {
-                    $prop = trim($attrs[$i], ', =/');
-                    $value = $attrs[$i + 1];
-                    if (!isset($dn[$prop])) {
-                        $dn[$prop] = $value;
-                    } else {
-                        $dn[$prop] = array_merge((array) $dn[$prop], array($value));
-                    }
-                }
-                return $dn;
+                $filters = [];
+                $filters['rdnSequence']['value'] = ['type' => ASN1::TYPE_UTF8_STRING];
+                ASN1::setFilters($filters);
+                $this->mapOutDNs($dn, 'rdnSequence');
+                return ASN1::encodeDER($dn, Maps\Name::MAP);
             case self::DN_CANON:
                 //  No SEQUENCE around RDNs and all string values normalized as
-                // trimmed lowercase UTF-8 with all spacing  as one blank.
-                $asn1 = new ASN1();
-                $asn1->loadOIDs($this->oids);
-                $filters = array();
-                $filters['value'] = array('type' => ASN1::TYPE_UTF8_STRING);
-                $asn1->loadFilters($filters);
+                // trimmed lowercase UTF-8 with all spacing as one blank.
+                // constructed RDNs will not be canonicalized
+                $filters = [];
+                $filters['value'] = ['type' => ASN1::TYPE_UTF8_STRING];
+                ASN1::setFilters($filters);
                 $result = '';
+                $this->mapOutDNs($dn, 'rdnSequence');
                 foreach ($dn['rdnSequence'] as $rdn) {
                     foreach ($rdn as $i => $attr) {
                         $attr = &$rdn[$i];
                         if (is_array($attr['value'])) {
                             foreach ($attr['value'] as $type => $v) {
-                                $type = array_search($type, $asn1->ANYmap, true);
-                                if ($type !== false && isset($asn1->stringTypeSize[$type])) {
-                                    $v = $asn1->convert($v, $type);
+                                $type = array_search($type, ASN1::ANY_MAP, true);
+                                if ($type !== false && array_key_exists($type, ASN1::STRING_TYPE_SIZE)) {
+                                    $v = ASN1::convert($v, $type);
                                     if ($v !== false) {
                                         $v = preg_replace('/\s+/', ' ', $v);
                                         $attr['value'] = strtolower(trim($v));
@@ -2532,21 +1784,27 @@ function getDN($format = self::DN_ARRAY, $dn = null)
                             }
                         }
                     }
-                    $result .= $asn1->encodeDER($rdn, $this->RelativeDistinguishedName);
+                    $result .= ASN1::encodeDER($rdn, Maps\RelativeDistinguishedName::MAP);
                 }
                 return $result;
             case self::DN_HASH:
                 $dn = $this->getDN(self::DN_CANON, $dn);
                 $hash = new Hash('sha1');
                 $hash = $hash->hash($dn);
-                extract(unpack('Vhash', $hash));
-                return strtolower(bin2hex(pack('N', $hash)));
+                ['hash' => $hash] = unpack('Vhash', $hash);
+                return strtolower(Strings::bin2hex(pack('N', $hash)));
         }
 
         // Default is to return a string.
         $start = true;
         $output = '';
-        $asn1 = new ASN1();
+
+        $result = [];
+        $filters = [];
+        $filters['rdnSequence']['value'] = ['type' => ASN1::TYPE_UTF8_STRING];
+        ASN1::setFilters($filters);
+        $this->mapOutDNs($dn, 'rdnSequence');
+
         foreach ($dn['rdnSequence'] as $field) {
             $prop = $field[0]['type'];
             $value = $field[0]['value'];
@@ -2554,43 +1812,47 @@ function getDN($format = self::DN_ARRAY, $dn = null)
             $delim = ', ';
             switch ($prop) {
                 case 'id-at-countryName':
-                    $desc = 'C=';
+                    $desc = 'C';
                     break;
                 case 'id-at-stateOrProvinceName':
-                    $desc = 'ST=';
+                    $desc = 'ST';
                     break;
                 case 'id-at-organizationName':
-                    $desc = 'O=';
+                    $desc = 'O';
                     break;
                 case 'id-at-organizationalUnitName':
-                    $desc = 'OU=';
+                    $desc = 'OU';
                     break;
                 case 'id-at-commonName':
-                    $desc = 'CN=';
+                    $desc = 'CN';
                     break;
                 case 'id-at-localityName':
-                    $desc = 'L=';
+                    $desc = 'L';
                     break;
                 case 'id-at-surname':
-                    $desc = 'SN=';
+                    $desc = 'SN';
                     break;
                 case 'id-at-uniqueIdentifier':
                     $delim = '/';
-                    $desc = 'x500UniqueIdentifier=';
+                    $desc = 'x500UniqueIdentifier';
+                    break;
+                case 'id-at-postalAddress':
+                    $delim = '/';
+                    $desc = 'postalAddress';
                     break;
                 default:
                     $delim = '/';
-                    $desc = preg_replace('#.+-([^-]+)$#', '$1',  $prop) . '=';
+                    $desc = preg_replace('#.+-([^-]+)$#', '$1', $prop);
             }
 
             if (!$start) {
-                $output.= $delim;
+                $output .= $delim;
             }
             if (is_array($value)) {
                 foreach ($value as $type => $v) {
-                    $type = array_search($type, $asn1->ANYmap, true);
-                    if ($type !== false && isset($asn1->stringTypeSize[$type])) {
-                        $v = $asn1->convert($v, $type);
+                    $type = array_search($type, ASN1::ANY_MAP, true);
+                    if ($type !== false && array_key_exists($type, ASN1::STRING_TYPE_SIZE)) {
+                        $v = ASN1::convert($v, $type);
                         if ($v !== false) {
                             $value = $v;
                             break;
@@ -2600,22 +1862,26 @@ function getDN($format = self::DN_ARRAY, $dn = null)
                 if (is_array($value)) {
                     $value = array_pop($value); // Always strip data type.
                 }
-            }
-            $output.= $desc . $value;
+            } elseif (is_object($value) && $value instanceof Element) {
+                $callback = fn ($x) => '\x' . bin2hex($x[0]);
+                $value = strtoupper(preg_replace_callback('#[^\x20-\x7E]#', $callback, $value->element));
+            }
+            $output .= $desc . '=' . $value;
+            $result[$desc] = isset($result[$desc]) ?
+                array_merge((array) $result[$desc], [$value]) :
+                $value;
             $start = false;
         }
 
-        return $output;
+        return $format == self::DN_OPENSSL ? $result : $output;
     }
 
     /**
      * Get the Distinguished Name for a certificate/crl issuer
      *
      * @param int $format optional
-     * @access public
-     * @return mixed
      */
-    function getIssuerDN($format = self::DN_ARRAY)
+    public function getIssuerDN(int $format = self::DN_ARRAY)
     {
         switch (true) {
             case !isset($this->currentCert) || !is_array($this->currentCert):
@@ -2634,10 +1900,8 @@ function getIssuerDN($format = self::DN_ARRAY)
      * Alias of getDN()
      *
      * @param int $format optional
-     * @access public
-     * @return mixed
      */
-    function getSubjectDN($format = self::DN_ARRAY)
+    public function getSubjectDN(int $format = self::DN_ARRAY)
     {
         switch (true) {
             case !empty($this->dn):
@@ -2656,12 +1920,9 @@ function getSubjectDN($format = self::DN_ARRAY)
     /**
      * Get an individual Distinguished Name property for a certificate/crl issuer
      *
-     * @param string $propName
      * @param bool $withType optional
-     * @access public
-     * @return mixed
      */
-    function getIssuerDNProp($propName, $withType = false)
+    public function getIssuerDNProp(string $propName, bool $withType = false)
     {
         switch (true) {
             case !isset($this->currentCert) || !is_array($this->currentCert):
@@ -2678,12 +1939,9 @@ function getIssuerDNProp($propName, $withType = false)
     /**
      * Get an individual Distinguished Name property for a certificate/csr subject
      *
-     * @param string $propName
      * @param bool $withType optional
-     * @access public
-     * @return mixed
      */
-    function getSubjectDNProp($propName, $withType = false)
+    public function getSubjectDNProp(string $propName, bool $withType = false)
     {
         switch (true) {
             case !empty($this->dn):
@@ -2701,20 +1959,14 @@ function getSubjectDNProp($propName, $withType = false)
 
     /**
      * Get the certificate chain for the current cert
-     *
-     * @access public
-     * @return mixed
      */
-    function getChain()
+    public function getChain()
     {
-        $chain = array($this->currentCert);
+        $chain = [$this->currentCert];
 
         if (!is_array($this->currentCert) || !isset($this->currentCert['tbsCertificate'])) {
             return false;
         }
-        if (empty($this->CAs)) {
-            return $chain;
-        }
         while (true) {
             $currentCert = $chain[count($chain) - 1];
             for ($i = 0; $i < count($this->CAs); $i++) {
@@ -2745,29 +1997,31 @@ function getChain()
     }
 
     /**
-     * Set public key
+     * Returns the current cert
      *
-     * Key needs to be a \phpseclib\Crypt\RSA object
+     * @return array|bool
+     */
+    public function &getCurrentCert()
+    {
+        return $this->currentCert;
+    }
+
+    /**
+     * Set public key
      *
-     * @param object $key
-     * @access public
-     * @return bool
+     * Key needs to be a \phpseclib3\Crypt\RSA object
      */
-    function setPublicKey($key)
+    public function setPublicKey(PublicKey $key): void
     {
-        $key->setPublicKey();
         $this->publicKey = $key;
     }
 
     /**
      * Set private key
      *
-     * Key needs to be a \phpseclib\Crypt\RSA object
-     *
-     * @param object $key
-     * @access public
+     * Key needs to be a \phpseclib3\Crypt\RSA object
      */
-    function setPrivateKey($key)
+    public function setPrivateKey(PrivateKey $key): void
     {
         $this->privateKey = $key;
     }
@@ -2776,11 +2030,8 @@ function setPrivateKey($key)
      * Set challenge
      *
      * Used for SPKAC CSR's
-     *
-     * @param string $challenge
-     * @access public
      */
-    function setChallenge($challenge)
+    public function setChallenge(string $challenge): void
     {
         $this->challenge = $challenge;
     }
@@ -2788,20 +2039,22 @@ function setChallenge($challenge)
     /**
      * Gets the public key
      *
-     * Returns a \phpseclib\Crypt\RSA object or a false.
-     *
-     * @access public
-     * @return mixed
+     * Returns a \phpseclib3\Crypt\RSA object or a false.
      */
-    function getPublicKey()
+    public function getPublicKey()
     {
         if (isset($this->publicKey)) {
             return $this->publicKey;
         }
 
         if (isset($this->currentCert) && is_array($this->currentCert)) {
-            foreach (array('tbsCertificate/subjectPublicKeyInfo', 'certificationRequestInfo/subjectPKInfo') as $path) {
-                $keyinfo = $this->_subArray($this->currentCert, $path);
+            $paths = [
+                'tbsCertificate/subjectPublicKeyInfo',
+                'certificationRequestInfo/subjectPKInfo',
+                'publicKeyAndChallenge/spki',
+            ];
+            foreach ($paths as $path) {
+                $keyinfo = $this->subArray($this->currentCert, $path);
                 if (!empty($keyinfo)) {
                     break;
                 }
@@ -2814,26 +2067,25 @@ function getPublicKey()
         $key = $keyinfo['subjectPublicKey'];
 
         switch ($keyinfo['algorithm']['algorithm']) {
+            case 'id-RSASSA-PSS':
+                return RSA::loadFormat('PSS', $key);
             case 'rsaEncryption':
-                $publicKey = new RSA();
-                $publicKey->load($key);
-                $publicKey->setPublicKey();
-                break;
-            default:
-                return false;
+                return RSA::loadFormat('PKCS8', $key)->withPadding(RSA::SIGNATURE_PKCS1);
+            case 'id-ecPublicKey':
+            case 'id-Ed25519':
+            case 'id-Ed448':
+                return EC::loadFormat('PKCS8', $key);
+            case 'id-dsa':
+                return DSA::loadFormat('PKCS8', $key);
         }
 
-        return $publicKey;
+        return false;
     }
 
     /**
      * Load a Certificate Signing Request
-     *
-     * @param string $csr
-     * @access public
-     * @return mixed
      */
-    function loadCSR($csr, $mode = self::FORMAT_AUTO_DETECT)
+    public function loadCSR(string $csr, int $mode = self::FORMAT_AUTO_DETECT)
     {
         if (is_array($csr) && isset($csr['certificationRequestInfo'])) {
             unset($this->currentCert);
@@ -2850,10 +2102,8 @@ function loadCSR($csr, $mode = self::FORMAT_AUTO_DETECT)
 
         // see http://tools.ietf.org/html/rfc2986
 
-        $asn1 = new ASN1();
-
         if ($mode != self::FORMAT_DER) {
-            $newcsr = $this->_extractBER($csr);
+            $newcsr = ASN1::extractBER($csr);
             if ($mode == self::FORMAT_PEM && $csr == $newcsr) {
                 return false;
             }
@@ -2866,90 +2116,79 @@ function loadCSR($csr, $mode = self::FORMAT_AUTO_DETECT)
             return false;
         }
 
-        $asn1->loadOIDs($this->oids);
-        $decoded = $asn1->decodeBER($csr);
+        $decoded = ASN1::decodeBER($csr);
 
-        if (empty($decoded)) {
+        if (!$decoded) {
             $this->currentCert = false;
             return false;
         }
 
-        $csr = $asn1->asn1map($decoded[0], $this->CertificationRequest);
+        $csr = ASN1::asn1map($decoded[0], Maps\CertificationRequest::MAP);
         if (!isset($csr) || $csr === false) {
             $this->currentCert = false;
             return false;
         }
 
+        $this->mapInAttributes($csr, 'certificationRequestInfo/attributes');
+        $this->mapInDNs($csr, 'certificationRequestInfo/subject/rdnSequence');
+
         $this->dn = $csr['certificationRequestInfo']['subject'];
-        $this->_mapInAttributes($csr, 'certificationRequestInfo/attributes', $asn1);
 
         $this->signatureSubject = substr($orig, $decoded[0]['content'][0]['start'], $decoded[0]['content'][0]['length']);
 
-        $algorithm = &$csr['certificationRequestInfo']['subjectPKInfo']['algorithm']['algorithm'];
-        $key = &$csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey'];
-        $key = $this->_reformatKey($algorithm, $key);
-
-        switch ($algorithm) {
-            case 'rsaEncryption':
-                $this->publicKey = new RSA();
-                $this->publicKey->load($key);
-                $this->publicKey->setPublicKey();
-                break;
-            default:
-                $this->publicKey = null;
-        }
+        $key = $csr['certificationRequestInfo']['subjectPKInfo'];
+        $key = ASN1::encodeDER($key, Maps\SubjectPublicKeyInfo::MAP);
+        $csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey'] =
+            "-----BEGIN PUBLIC KEY-----\r\n" .
+            chunk_split(base64_encode($key), 64) .
+            "-----END PUBLIC KEY-----";
 
         $this->currentKeyIdentifier = null;
         $this->currentCert = $csr;
 
+        $this->publicKey = null;
+        $this->publicKey = $this->getPublicKey();
+
         return $csr;
     }
 
     /**
      * Save CSR request
      *
-     * @param array $csr
-     * @param int $format optional
-     * @access public
-     * @return string
+     * @return string|false
      */
-    function saveCSR($csr, $format = self::FORMAT_PEM)
+    public function saveCSR(array $csr, int $format = self::FORMAT_PEM)
     {
         if (!is_array($csr) || !isset($csr['certificationRequestInfo'])) {
             return false;
         }
 
         switch (true) {
-            case !($algorithm = $this->_subArray($csr, 'certificationRequestInfo/subjectPKInfo/algorithm/algorithm')):
+            case !($algorithm = $this->subArray($csr, 'certificationRequestInfo/subjectPKInfo/algorithm/algorithm')):
             case is_object($csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey']):
                 break;
             default:
-                switch ($algorithm) {
-                    case 'rsaEncryption':
-                        $csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey']
-                            = base64_encode("\0" . base64_decode(preg_replace('#-.+-|[\r\n]#', '', $csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey'])));
-                }
+                $csr['certificationRequestInfo']['subjectPKInfo'] = new Element(
+                    base64_decode(preg_replace('#-.+-|[\r\n]#', '', $csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey']))
+                );
         }
 
-        $asn1 = new ASN1();
-
-        $asn1->loadOIDs($this->oids);
-
-        $filters = array();
+        $filters = [];
         $filters['certificationRequestInfo']['subject']['rdnSequence']['value']
-            = array('type' => ASN1::TYPE_UTF8_STRING);
+            = ['type' => ASN1::TYPE_UTF8_STRING];
 
-        $asn1->loadFilters($filters);
+        ASN1::setFilters($filters);
 
-        $this->_mapOutAttributes($csr, 'certificationRequestInfo/attributes', $asn1);
-        $csr = $asn1->encodeDER($csr, $this->CertificationRequest);
+        $this->mapOutDNs($csr, 'certificationRequestInfo/subject/rdnSequence');
+        $this->mapOutAttributes($csr, 'certificationRequestInfo/attributes');
+        $csr = ASN1::encodeDER($csr, Maps\CertificationRequest::MAP);
 
         switch ($format) {
             case self::FORMAT_DER:
                 return $csr;
             // case self::FORMAT_PEM:
             default:
-                return "-----BEGIN CERTIFICATE REQUEST-----\r\n" . chunk_split(base64_encode($csr), 64) . '-----END CERTIFICATE REQUEST-----';
+                return "-----BEGIN CERTIFICATE REQUEST-----\r\n" . chunk_split(Strings::base64_encode($csr), 64) . '-----END CERTIFICATE REQUEST-----';
         }
     }
 
@@ -2959,12 +2198,8 @@ function saveCSR($csr, $format = self::FORMAT_PEM)
      * SPKAC's are produced by the HTML5 keygen element:
      *
      * https://developer.mozilla.org/en-US/docs/HTML/Element/keygen
-     *
-     * @param string $csr
-     * @access public
-     * @return mixed
      */
-    function loadSPKAC($spkac)
+    public function loadSPKAC(string $spkac)
     {
         if (is_array($spkac) && isset($spkac['publicKeyAndChallenge'])) {
             unset($this->currentCert);
@@ -2976,11 +2211,9 @@ function loadSPKAC($spkac)
 
         // see http://www.w3.org/html/wg/drafts/html/master/forms.html#signedpublickeyandchallenge
 
-        $asn1 = new ASN1();
-
-        // OpenSSL produces SPKAC's that are preceeded by the string SPKAC=
+        // OpenSSL produces SPKAC's that are preceded by the string SPKAC=
         $temp = preg_replace('#(?:SPKAC=)|[ \r\n\\\]#', '', $spkac);
-        $temp = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $temp) ? base64_decode($temp) : false;
+        $temp = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $temp) ? Strings::base64_decode($temp) : false;
         if ($temp != false) {
             $spkac = $temp;
         }
@@ -2991,94 +2224,78 @@ function loadSPKAC($spkac)
             return false;
         }
 
-        $asn1->loadOIDs($this->oids);
-        $decoded = $asn1->decodeBER($spkac);
+        $decoded = ASN1::decodeBER($spkac);
 
-        if (empty($decoded)) {
+        if (!$decoded) {
             $this->currentCert = false;
             return false;
         }
 
-        $spkac = $asn1->asn1map($decoded[0], $this->SignedPublicKeyAndChallenge);
+        $spkac = ASN1::asn1map($decoded[0], Maps\SignedPublicKeyAndChallenge::MAP);
 
-        if (!isset($spkac) || $spkac === false) {
+        if (!isset($spkac) || !is_array($spkac)) {
             $this->currentCert = false;
             return false;
         }
 
         $this->signatureSubject = substr($orig, $decoded[0]['content'][0]['start'], $decoded[0]['content'][0]['length']);
 
-        $algorithm = &$spkac['publicKeyAndChallenge']['spki']['algorithm']['algorithm'];
-        $key = &$spkac['publicKeyAndChallenge']['spki']['subjectPublicKey'];
-        $key = $this->_reformatKey($algorithm, $key);
-
-        switch ($algorithm) {
-            case 'rsaEncryption':
-                $this->publicKey = new RSA();
-                $this->publicKey->load($key);
-                $this->publicKey->setPublicKey();
-                break;
-            default:
-                $this->publicKey = null;
-        }
+        $key = $spkac['publicKeyAndChallenge']['spki'];
+        $key = ASN1::encodeDER($key, Maps\SubjectPublicKeyInfo::MAP);
+        $spkac['publicKeyAndChallenge']['spki']['subjectPublicKey'] =
+            "-----BEGIN PUBLIC KEY-----\r\n" .
+            chunk_split(base64_encode($key), 64) .
+            "-----END PUBLIC KEY-----";
 
         $this->currentKeyIdentifier = null;
         $this->currentCert = $spkac;
 
+        $this->publicKey = null;
+        $this->publicKey = $this->getPublicKey();
+
         return $spkac;
     }
 
     /**
      * Save a SPKAC CSR request
      *
-     * @param array $csr
      * @param int $format optional
-     * @access public
-     * @return string
+     * @return string|false
      */
-    function saveSPKAC($spkac, $format = self::FORMAT_PEM)
+    public function saveSPKAC(array $spkac, int $format = self::FORMAT_PEM)
     {
         if (!is_array($spkac) || !isset($spkac['publicKeyAndChallenge'])) {
             return false;
         }
 
-        $algorithm = $this->_subArray($spkac, 'publicKeyAndChallenge/spki/algorithm/algorithm');
+        $algorithm = $this->subArray($spkac, 'publicKeyAndChallenge/spki/algorithm/algorithm');
         switch (true) {
             case !$algorithm:
             case is_object($spkac['publicKeyAndChallenge']['spki']['subjectPublicKey']):
                 break;
             default:
-                switch ($algorithm) {
-                    case 'rsaEncryption':
-                        $spkac['publicKeyAndChallenge']['spki']['subjectPublicKey']
-                            = base64_encode("\0" . base64_decode(preg_replace('#-.+-|[\r\n]#', '', $spkac['publicKeyAndChallenge']['spki']['subjectPublicKey'])));
-                }
+                $spkac['publicKeyAndChallenge']['spki'] = new Element(
+                    base64_decode(preg_replace('#-.+-|[\r\n]#', '', $spkac['publicKeyAndChallenge']['spki']['subjectPublicKey']))
+                );
         }
 
-        $asn1 = new ASN1();
-
-        $asn1->loadOIDs($this->oids);
-        $spkac = $asn1->encodeDER($spkac, $this->SignedPublicKeyAndChallenge);
+        $spkac = ASN1::encodeDER($spkac, Maps\SignedPublicKeyAndChallenge::MAP);
 
         switch ($format) {
             case self::FORMAT_DER:
                 return $spkac;
             // case self::FORMAT_PEM:
             default:
-                // OpenSSL's implementation of SPKAC requires the SPKAC be preceeded by SPKAC= and since there are pretty much
+                // OpenSSL's implementation of SPKAC requires the SPKAC be preceded by SPKAC= and since there are pretty much
                 // no other SPKAC decoders phpseclib will use that same format
-                return 'SPKAC=' . base64_encode($spkac);
+                return 'SPKAC=' . Strings::base64_encode($spkac);
         }
     }
 
     /**
      * Load a Certificate Revocation List
-     *
-     * @param string $crl
-     * @access public
-     * @return mixed
      */
-    function loadCRL($crl, $mode = self::FORMAT_AUTO_DETECT)
+    public function loadCRL(string $crl, int $mode = self::FORMAT_AUTO_DETECT)
     {
         if (is_array($crl) && isset($crl['tbsCertList'])) {
             $this->currentCert = $crl;
@@ -3086,10 +2303,8 @@ function loadCRL($crl, $mode = self::FORMAT_AUTO_DETECT)
             return $crl;
         }
 
-        $asn1 = new ASN1();
-
         if ($mode != self::FORMAT_DER) {
-            $newcrl = $this->_extractBER($crl);
+            $newcrl = ASN1::extractBER($crl);
             if ($mode == self::FORMAT_PEM && $crl == $newcrl) {
                 return false;
             }
@@ -3102,15 +2317,14 @@ function loadCRL($crl, $mode = self::FORMAT_AUTO_DETECT)
             return false;
         }
 
-        $asn1->loadOIDs($this->oids);
-        $decoded = $asn1->decodeBER($crl);
+        $decoded = ASN1::decodeBER($crl);
 
-        if (empty($decoded)) {
+        if (!$decoded) {
             $this->currentCert = false;
             return false;
         }
 
-        $crl = $asn1->asn1map($decoded[0], $this->CertificateList);
+        $crl = ASN1::asn1map($decoded[0], Maps\CertificateList::MAP);
         if (!isset($crl) || $crl === false) {
             $this->currentCert = false;
             return false;
@@ -3118,11 +2332,19 @@ function loadCRL($crl, $mode = self::FORMAT_AUTO_DETECT)
 
         $this->signatureSubject = substr($orig, $decoded[0]['content'][0]['start'], $decoded[0]['content'][0]['length']);
 
-        $this->_mapInExtensions($crl, 'tbsCertList/crlExtensions', $asn1);
-        $rclist = &$this->_subArray($crl, 'tbsCertList/revokedCertificates');
-        if (is_array($rclist)) {
-            foreach ($rclist as $i => $extension) {
-                $this->_mapInExtensions($rclist, "$i/crlEntryExtensions", $asn1);
+        $this->mapInDNs($crl, 'tbsCertList/issuer/rdnSequence');
+        if ($this->isSubArrayValid($crl, 'tbsCertList/crlExtensions')) {
+            $this->mapInExtensions($crl, 'tbsCertList/crlExtensions');
+        }
+        if ($this->isSubArrayValid($crl, 'tbsCertList/revokedCertificates')) {
+            $rclist_ref = &$this->subArrayUnchecked($crl, 'tbsCertList/revokedCertificates');
+            if ($rclist_ref) {
+                $rclist = $crl['tbsCertList']['revokedCertificates'];
+                foreach ($rclist as $i => $extension) {
+                    if ($this->isSubArrayValid($rclist, "$i/crlEntryExtensions")) {
+                        $this->mapInExtensions($rclist_ref, "$i/crlEntryExtensions");
+                    }
+                }
             }
         }
 
@@ -3135,57 +2357,52 @@ function loadCRL($crl, $mode = self::FORMAT_AUTO_DETECT)
     /**
      * Save Certificate Revocation List.
      *
-     * @param array $crl
      * @param int $format optional
-     * @access public
      * @return string
      */
-    function saveCRL($crl, $format = self::FORMAT_PEM)
+    public function saveCRL(array $crl, int $format = self::FORMAT_PEM)
     {
         if (!is_array($crl) || !isset($crl['tbsCertList'])) {
             return false;
         }
 
-        $asn1 = new ASN1();
-
-        $asn1->loadOIDs($this->oids);
-
-        $filters = array();
+        $filters = [];
         $filters['tbsCertList']['issuer']['rdnSequence']['value']
-            = array('type' => ASN1::TYPE_UTF8_STRING);
+            = ['type' => ASN1::TYPE_UTF8_STRING];
         $filters['tbsCertList']['signature']['parameters']
-            = array('type' => ASN1::TYPE_UTF8_STRING);
+            = ['type' => ASN1::TYPE_UTF8_STRING];
         $filters['signatureAlgorithm']['parameters']
-            = array('type' => ASN1::TYPE_UTF8_STRING);
+            = ['type' => ASN1::TYPE_UTF8_STRING];
 
         if (empty($crl['tbsCertList']['signature']['parameters'])) {
             $filters['tbsCertList']['signature']['parameters']
-                = array('type' => ASN1::TYPE_NULL);
+                = ['type' => ASN1::TYPE_NULL];
         }
 
         if (empty($crl['signatureAlgorithm']['parameters'])) {
             $filters['signatureAlgorithm']['parameters']
-                = array('type' => ASN1::TYPE_NULL);
+                = ['type' => ASN1::TYPE_NULL];
         }
 
-        $asn1->loadFilters($filters);
+        ASN1::setFilters($filters);
 
-        $this->_mapOutExtensions($crl, 'tbsCertList/crlExtensions', $asn1);
-        $rclist = &$this->_subArray($crl, 'tbsCertList/revokedCertificates');
+        $this->mapOutDNs($crl, 'tbsCertList/issuer/rdnSequence');
+        $this->mapOutExtensions($crl, 'tbsCertList/crlExtensions');
+        $rclist = &$this->subArray($crl, 'tbsCertList/revokedCertificates');
         if (is_array($rclist)) {
             foreach ($rclist as $i => $extension) {
-                $this->_mapOutExtensions($rclist, "$i/crlEntryExtensions", $asn1);
+                $this->mapOutExtensions($rclist, "$i/crlEntryExtensions");
             }
         }
 
-        $crl = $asn1->encodeDER($crl, $this->CertificateList);
+        $crl = ASN1::encodeDER($crl, Maps\CertificateList::MAP);
 
         switch ($format) {
             case self::FORMAT_DER:
                 return $crl;
             // case self::FORMAT_PEM:
             default:
-                return "-----BEGIN X509 CRL-----\r\n" . chunk_split(base64_encode($crl), 64) . '-----END X509 CRL-----';
+                return "-----BEGIN X509 CRL-----\r\n" . chunk_split(Strings::base64_encode($crl), 64) . '-----END X509 CRL-----';
         }
     }
 
@@ -3197,17 +2414,20 @@ function saveCRL($crl, $format = self::FORMAT_PEM)
      *  - 5.1.2.6 Revoked Certificates
      * by choosing utcTime iff year of date given is before 2050 and generalTime else.
      *
-     * @param string $date in format date('D, d M Y H:i:s O')
-     * @access private
-     * @return array
+     * @param Element|string $date in format date('D, d M Y H:i:s O')
+     * @return array|Element
      */
-    function _timeField($date)
+    private function timeField($date)
     {
-        $year = @gmdate("Y", @strtotime($date)); // the same way ASN1.php parses this
+        if ($date instanceof Element) {
+            return $date;
+        }
+        $dateObj = new \DateTimeImmutable($date, new \DateTimeZone('GMT'));
+        $year = $dateObj->format('Y'); // the same way ASN1.php parses this
         if ($year < 2050) {
-            return array('utcTime' => $date);
+            return ['utcTime' => $date];
         } else {
-            return array('generalTime' => $date);
+            return ['generalTime' => $date];
         }
     }
 
@@ -3217,36 +2437,31 @@ function _timeField($date)
      * $issuer's private key needs to be loaded.
      * $subject can be either an existing X.509 cert (if you want to resign it),
      * a CSR or something with the DN and public key explicitly set.
-     *
-     * @param \phpseclib\File\X509 $issuer
-     * @param \phpseclib\File\X509 $subject
-     * @param string $signatureAlgorithm optional
-     * @access public
-     * @return mixed
      */
-    function sign($issuer, $subject, $signatureAlgorithm = 'sha1WithRSAEncryption')
+    public function sign(X509 $issuer, X509 $subject)
     {
         if (!is_object($issuer->privateKey) || empty($issuer->dn)) {
             return false;
         }
 
-        if (isset($subject->publicKey) && !($subjectPublicKey = $subject->_formatSubjectPublicKey())) {
+        if (isset($subject->publicKey) && !($subjectPublicKey = $subject->formatSubjectPublicKey())) {
             return false;
         }
 
-        $currentCert = isset($this->currentCert) ? $this->currentCert : null;
-        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject: null;
+        $currentCert = $this->currentCert ?? null;
+        $signatureSubject = $this->signatureSubject ?? null;
+        $signatureAlgorithm = self::identifySignatureAlgorithm($issuer->privateKey);
 
         if (isset($subject->currentCert) && is_array($subject->currentCert) && isset($subject->currentCert['tbsCertificate'])) {
             $this->currentCert = $subject->currentCert;
-            $this->currentCert['tbsCertificate']['signature']['algorithm'] = $signatureAlgorithm;
-            $this->currentCert['signatureAlgorithm']['algorithm'] = $signatureAlgorithm;
+            $this->currentCert['tbsCertificate']['signature'] = $signatureAlgorithm;
+            $this->currentCert['signatureAlgorithm'] = $signatureAlgorithm;
 
             if (!empty($this->startDate)) {
-                $this->currentCert['tbsCertificate']['validity']['notBefore'] = $this->_timeField($this->startDate);
+                $this->currentCert['tbsCertificate']['validity']['notBefore'] = $this->timeField($this->startDate);
             }
             if (!empty($this->endDate)) {
-                $this->currentCert['tbsCertificate']['validity']['notAfter'] = $this->_timeField($this->endDate);
+                $this->currentCert['tbsCertificate']['validity']['notAfter'] = $this->timeField($this->endDate);
             }
             if (!empty($this->serialNumber)) {
                 $this->currentCert['tbsCertificate']['serialNumber'] = $this->serialNumber;
@@ -3268,8 +2483,12 @@ function sign($issuer, $subject, $signatureAlgorithm = 'sha1WithRSAEncryption')
                 return false;
             }
 
-            $startDate = !empty($this->startDate) ? $this->startDate : @date('D, d M Y H:i:s O');
-            $endDate = !empty($this->endDate) ? $this->endDate : @date('D, d M Y H:i:s O', strtotime('+1 year'));
+            $startDate = new \DateTimeImmutable('now', new \DateTimeZone(@date_default_timezone_get()));
+            $startDate = !empty($this->startDate) ? $this->startDate : $startDate->format('D, d M Y H:i:s O');
+
+            $endDate = new \DateTimeImmutable('+1 year', new \DateTimeZone(@date_default_timezone_get()));
+            $endDate = !empty($this->endDate) ? $this->endDate : $endDate->format('D, d M Y H:i:s O');
+
             /* "The serial number MUST be a positive integer"
                "Conforming CAs MUST NOT use serialNumber values longer than 20 octets."
                 -- https://tools.ietf.org/html/rfc5280#section-4.1.2.2
@@ -3281,23 +2500,23 @@ function sign($issuer, $subject, $signatureAlgorithm = 'sha1WithRSAEncryption')
                 $this->serialNumber :
                 new BigInteger(Random::string(20) & ("\x7F" . str_repeat("\xFF", 19)), 256);
 
-            $this->currentCert = array(
+            $this->currentCert = [
                 'tbsCertificate' =>
-                    array(
+                    [
                         'version' => 'v3',
-                        'serialNumber' => $serialNumber, // $this->setserialNumber()
-                        'signature' => array('algorithm' => $signatureAlgorithm),
+                        'serialNumber' => $serialNumber, // $this->setSerialNumber()
+                        'signature' => $signatureAlgorithm,
                         'issuer' => false, // this is going to be overwritten later
-                        'validity' => array(
-                            'notBefore' => $this->_timeField($startDate), // $this->setStartDate()
-                            'notAfter' => $this->_timeField($endDate)   // $this->setEndDate()
-                        ),
+                        'validity' => [
+                            'notBefore' => $this->timeField($startDate), // $this->setStartDate()
+                            'notAfter' => $this->timeField($endDate),   // $this->setEndDate()
+                        ],
                         'subject' => $subject->dn,
-                        'subjectPublicKeyInfo' => $subjectPublicKey
-                    ),
-                    'signatureAlgorithm' => array('algorithm' => $signatureAlgorithm),
-                    'signature'          => false // this is going to be overwritten later
-            );
+                        'subjectPublicKeyInfo' => $subjectPublicKey,
+                    ],
+                    'signatureAlgorithm' => $signatureAlgorithm,
+                    'signature'          => false, // this is going to be overwritten later
+            ];
 
             // Copy extensions from CSR.
             $csrexts = $subject->getAttribute('pkcs-9-at-extensionRequest', 0);
@@ -3310,14 +2529,14 @@ function sign($issuer, $subject, $signatureAlgorithm = 'sha1WithRSAEncryption')
         $this->currentCert['tbsCertificate']['issuer'] = $issuer->dn;
 
         if (isset($issuer->currentKeyIdentifier)) {
-            $this->setExtension('id-ce-authorityKeyIdentifier', array(
+            $this->setExtension('id-ce-authorityKeyIdentifier', [
                     //'authorityCertIssuer' => array(
                     //    array(
                     //        'directoryName' => $issuer->dn
                     //    )
                     //),
-                    'keyIdentifier' => $issuer->currentKeyIdentifier
-                ));
+                    'keyIdentifier' => $issuer->currentKeyIdentifier,
+                ]);
             //$extensions = &$this->currentCert['tbsCertificate']['extensions'];
             //if (isset($issuer->serialNumber)) {
             //    $extensions[count($extensions) - 1]['authorityCertSerialNumber'] = $issuer->serialNumber;
@@ -3329,18 +2548,18 @@ function sign($issuer, $subject, $signatureAlgorithm = 'sha1WithRSAEncryption')
             $this->setExtension('id-ce-subjectKeyIdentifier', $subject->currentKeyIdentifier);
         }
 
-        $altName = array();
+        $altName = [];
 
-        if (isset($subject->domains) && count($subject->domains) > 1) {
-            $altName = array_map(array('X509', '_dnsName'), $subject->domains);
+        if (isset($subject->domains) && count($subject->domains)) {
+            $altName = array_map(['\phpseclib3\File\X509', 'dnsName'], $subject->domains);
         }
 
         if (isset($subject->ipAddresses) && count($subject->ipAddresses)) {
             // should an IP address appear as the CN if no domain name is specified? idk
             //$ips = count($subject->domains) ? $subject->ipAddresses : array_slice($subject->ipAddresses, 1);
-            $ipAddresses = array();
+            $ipAddresses = [];
             foreach ($subject->ipAddresses as $ipAddress) {
-                $encoded = $subject->_ipAddress($ipAddress);
+                $encoded = $subject->ipAddress($ipAddress);
                 if ($encoded !== false) {
                     $ipAddresses[] = $encoded;
                 }
@@ -3357,36 +2576,37 @@ function sign($issuer, $subject, $signatureAlgorithm = 'sha1WithRSAEncryption')
         if ($this->caFlag) {
             $keyUsage = $this->getExtension('id-ce-keyUsage');
             if (!$keyUsage) {
-                $keyUsage = array();
+                $keyUsage = [];
             }
 
             $this->setExtension(
                 'id-ce-keyUsage',
-                array_values(array_unique(array_merge($keyUsage, array('cRLSign', 'keyCertSign'))))
+                array_values(array_unique(array_merge($keyUsage, ['cRLSign', 'keyCertSign'])))
             );
 
             $basicConstraints = $this->getExtension('id-ce-basicConstraints');
             if (!$basicConstraints) {
-                $basicConstraints = array();
+                $basicConstraints = [];
             }
 
             $this->setExtension(
                 'id-ce-basicConstraints',
-                array_unique(array_merge(array('cA' => true), $basicConstraints)),
+                array_merge(['cA' => true], $basicConstraints),
                 true
             );
 
             if (!isset($subject->currentKeyIdentifier)) {
-                $this->setExtension('id-ce-subjectKeyIdentifier', base64_encode($this->computeKeyIdentifier($this->currentCert)), false, false);
+                $this->setExtension('id-ce-subjectKeyIdentifier', $this->computeKeyIdentifier($this->currentCert), false, false);
             }
         }
 
         // resync $this->signatureSubject
-        // save $tbsCertificate in case there are any \phpseclib\File\ASN1\Element objects in it
+        // save $tbsCertificate in case there are any \phpseclib3\File\ASN1\Element objects in it
         $tbsCertificate = $this->currentCert['tbsCertificate'];
         $this->loadX509($this->saveX509($this->currentCert));
 
-        $result = $this->_sign($issuer->privateKey, $signatureAlgorithm);
+        $result = $this->currentCert;
+        $this->currentCert['signature'] = $result['signature'] = "\0" . $issuer->privateKey->sign($this->signatureSubject);
         $result['tbsCertificate'] = $tbsCertificate;
 
         $this->currentCert = $currentCert;
@@ -3397,54 +2617,49 @@ function sign($issuer, $subject, $signatureAlgorithm = 'sha1WithRSAEncryption')
 
     /**
      * Sign a CSR
-     *
-     * @access public
-     * @return mixed
      */
-    function signCSR($signatureAlgorithm = 'sha1WithRSAEncryption')
+    public function signCSR()
     {
         if (!is_object($this->privateKey) || empty($this->dn)) {
             return false;
         }
 
         $origPublicKey = $this->publicKey;
-        $class = get_class($this->privateKey);
-        $this->publicKey = new $class();
-        $this->publicKey->load($this->privateKey->getPublicKey());
-        $this->publicKey->setPublicKey();
-        if (!($publicKey = $this->_formatSubjectPublicKey())) {
-            return false;
-        }
+        $this->publicKey = $this->privateKey->getPublicKey();
+        $publicKey = $this->formatSubjectPublicKey();
         $this->publicKey = $origPublicKey;
 
-        $currentCert = isset($this->currentCert) ? $this->currentCert : null;
-        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject: null;
+        $currentCert = $this->currentCert ?? null;
+        $signatureSubject = $this->signatureSubject ?? null;
+        $signatureAlgorithm = self::identifySignatureAlgorithm($this->privateKey);
 
         if (isset($this->currentCert) && is_array($this->currentCert) && isset($this->currentCert['certificationRequestInfo'])) {
-            $this->currentCert['signatureAlgorithm']['algorithm'] = $signatureAlgorithm;
+            $this->currentCert['signatureAlgorithm'] = $signatureAlgorithm;
             if (!empty($this->dn)) {
                 $this->currentCert['certificationRequestInfo']['subject'] = $this->dn;
             }
             $this->currentCert['certificationRequestInfo']['subjectPKInfo'] = $publicKey;
         } else {
-            $this->currentCert = array(
+            $this->currentCert = [
                 'certificationRequestInfo' =>
-                    array(
+                    [
                         'version' => 'v1',
                         'subject' => $this->dn,
-                        'subjectPKInfo' => $publicKey
-                    ),
-                    'signatureAlgorithm' => array('algorithm' => $signatureAlgorithm),
-                    'signature'          => false // this is going to be overwritten later
-            );
+                        'subjectPKInfo' => $publicKey,
+                        'attributes' => [],
+                    ],
+                    'signatureAlgorithm' => $signatureAlgorithm,
+                    'signature'          => false, // this is going to be overwritten later
+            ];
         }
 
         // resync $this->signatureSubject
-        // save $certificationRequestInfo in case there are any \phpseclib\File\ASN1\Element objects in it
+        // save $certificationRequestInfo in case there are any \phpseclib3\File\ASN1\Element objects in it
         $certificationRequestInfo = $this->currentCert['certificationRequestInfo'];
         $this->loadCSR($this->saveCSR($this->currentCert));
 
-        $result = $this->_sign($this->privateKey, $signatureAlgorithm);
+        $result = $this->currentCert;
+        $this->currentCert['signature'] = $result['signature'] = "\0" . $this->privateKey->sign($this->signatureSubject);
         $result['certificationRequestInfo'] = $certificationRequestInfo;
 
         $this->currentCert = $currentCert;
@@ -3455,61 +2670,54 @@ function signCSR($signatureAlgorithm = 'sha1WithRSAEncryption')
 
     /**
      * Sign a SPKAC
-     *
-     * @access public
-     * @return mixed
      */
-    function signSPKAC($signatureAlgorithm = 'sha1WithRSAEncryption')
+    public function signSPKAC()
     {
         if (!is_object($this->privateKey)) {
             return false;
         }
 
         $origPublicKey = $this->publicKey;
-        $class = get_class($this->privateKey);
-        $this->publicKey = new $class();
-        $this->publicKey->load($this->privateKey->getPublicKey());
-        $this->publicKey->setPublicKey();
-        $publicKey = $this->_formatSubjectPublicKey();
-        if (!$publicKey) {
-            return false;
-        }
+        $this->publicKey = $this->privateKey->getPublicKey();
+        $publicKey = $this->formatSubjectPublicKey();
         $this->publicKey = $origPublicKey;
 
-        $currentCert = isset($this->currentCert) ? $this->currentCert : null;
-        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject: null;
+        $currentCert = $this->currentCert ?? null;
+        $signatureSubject = $this->signatureSubject ?? null;
+        $signatureAlgorithm = self::identifySignatureAlgorithm($this->privateKey);
 
         // re-signing a SPKAC seems silly but since everything else supports re-signing why not?
         if (isset($this->currentCert) && is_array($this->currentCert) && isset($this->currentCert['publicKeyAndChallenge'])) {
-            $this->currentCert['signatureAlgorithm']['algorithm'] = $signatureAlgorithm;
+            $this->currentCert['signatureAlgorithm'] = $signatureAlgorithm;
             $this->currentCert['publicKeyAndChallenge']['spki'] = $publicKey;
             if (!empty($this->challenge)) {
                 // the bitwise AND ensures that the output is a valid IA5String
                 $this->currentCert['publicKeyAndChallenge']['challenge'] = $this->challenge & str_repeat("\x7F", strlen($this->challenge));
             }
         } else {
-            $this->currentCert = array(
+            $this->currentCert = [
                 'publicKeyAndChallenge' =>
-                    array(
+                    [
                         'spki' => $publicKey,
                         // quoting <https://developer.mozilla.org/en-US/docs/Web/HTML/Element/keygen>,
                         // "A challenge string that is submitted along with the public key. Defaults to an empty string if not specified."
                         // both Firefox and OpenSSL ("openssl spkac -key private.key") behave this way
                         // we could alternatively do this instead if we ignored the specs:
                         // Random::string(8) & str_repeat("\x7F", 8)
-                        'challenge' => !empty($this->challenge) ? $this->challenge : ''
-                    ),
-                    'signatureAlgorithm' => array('algorithm' => $signatureAlgorithm),
-                    'signature'          => false // this is going to be overwritten later
-            );
+                        'challenge' => !empty($this->challenge) ? $this->challenge : '',
+                    ],
+                    'signatureAlgorithm' => $signatureAlgorithm,
+                    'signature'          => false, // this is going to be overwritten later
+            ];
         }
 
         // resync $this->signatureSubject
-        // save $publicKeyAndChallenge in case there are any \phpseclib\File\ASN1\Element objects in it
+        // save $publicKeyAndChallenge in case there are any \phpseclib3\File\ASN1\Element objects in it
         $publicKeyAndChallenge = $this->currentCert['publicKeyAndChallenge'];
         $this->loadSPKAC($this->saveSPKAC($this->currentCert));
 
-        $result = $this->_sign($this->privateKey, $signatureAlgorithm);
+        $result = $this->currentCert;
+        $this->currentCert['signature'] = $result['signature'] = "\0" . $this->privateKey->sign($this->signatureSubject);
         $result['publicKeyAndChallenge'] = $publicKeyAndChallenge;
 
         $this->currentCert = $currentCert;
@@ -3522,47 +2730,44 @@ function signSPKAC($signatureAlgorithm = 'sha1WithRSAEncryption')
      * Sign a CRL
      *
      * $issuer's private key needs to be loaded.
-     *
-     * @param \phpseclib\File\X509 $issuer
-     * @param \phpseclib\File\X509 $crl
-     * @param string $signatureAlgorithm optional
-     * @access public
-     * @return mixed
      */
-    function signCRL($issuer, $crl, $signatureAlgorithm = 'sha1WithRSAEncryption')
+    public function signCRL(X509 $issuer, X509 $crl)
     {
         if (!is_object($issuer->privateKey) || empty($issuer->dn)) {
             return false;
         }
 
-        $currentCert = isset($this->currentCert) ? $this->currentCert : null;
-        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject : null;
-        $thisUpdate = !empty($this->startDate) ? $this->startDate : @date('D, d M Y H:i:s O');
+        $currentCert = $this->currentCert ?? null;
+        $signatureSubject = $this->signatureSubject ?? null;
+        $signatureAlgorithm = self::identifySignatureAlgorithm($issuer->privateKey);
+
+        $thisUpdate = new \DateTimeImmutable('now', new \DateTimeZone(@date_default_timezone_get()));
+        $thisUpdate = !empty($this->startDate) ? $this->startDate : $thisUpdate->format('D, d M Y H:i:s O');
 
         if (isset($crl->currentCert) && is_array($crl->currentCert) && isset($crl->currentCert['tbsCertList'])) {
             $this->currentCert = $crl->currentCert;
-            $this->currentCert['tbsCertList']['signature']['algorithm'] = $signatureAlgorithm;
-            $this->currentCert['signatureAlgorithm']['algorithm'] = $signatureAlgorithm;
+            $this->currentCert['tbsCertList']['signature'] = $signatureAlgorithm;
+            $this->currentCert['signatureAlgorithm'] = $signatureAlgorithm;
         } else {
-            $this->currentCert = array(
+            $this->currentCert = [
                 'tbsCertList' =>
-                    array(
+                    [
                         'version' => 'v2',
-                        'signature' => array('algorithm' => $signatureAlgorithm),
+                        'signature' => $signatureAlgorithm,
                         'issuer' => false, // this is going to be overwritten later
-                        'thisUpdate' => $this->_timeField($thisUpdate) // $this->setStartDate()
-                    ),
-                    'signatureAlgorithm' => array('algorithm' => $signatureAlgorithm),
-                    'signature'          => false // this is going to be overwritten later
-            );
+                        'thisUpdate' => $this->timeField($thisUpdate), // $this->setStartDate()
+                    ],
+                    'signatureAlgorithm' => $signatureAlgorithm,
+                    'signature'          => false, // this is going to be overwritten later
+            ];
         }
 
         $tbsCertList = &$this->currentCert['tbsCertList'];
         $tbsCertList['issuer'] = $issuer->dn;
-        $tbsCertList['thisUpdate'] = $this->_timeField($thisUpdate);
+        $tbsCertList['thisUpdate'] = $this->timeField($thisUpdate);
 
         if (!empty($this->endDate)) {
-            $tbsCertList['nextUpdate'] = $this->_timeField($this->endDate); // $this->setEndDate()
+            $tbsCertList['nextUpdate'] = $this->timeField($this->endDate); // $this->setEndDate()
         } else {
             unset($tbsCertList['nextUpdate']);
         }
@@ -3583,14 +2788,14 @@ function signCRL($issuer, $crl, $signatureAlgorithm = 'sha1WithRSAEncryption')
         $this->removeExtension('id-ce-issuerAltName');
 
         // Be sure version >= v2 if some extension found.
-        $version = isset($tbsCertList['version']) ? $tbsCertList['version'] : 0;
+        $version = $tbsCertList['version'] ?? 0;
         if (!$version) {
             if (!empty($tbsCertList['crlExtensions'])) {
-                $version = 1; // v2.
+                $version = 'v2'; // v2.
             } elseif (!empty($tbsCertList['revokedCertificates'])) {
                 foreach ($tbsCertList['revokedCertificates'] as $cert) {
                     if (!empty($cert['crlEntryExtensions'])) {
-                        $version = 1; // v2.
+                        $version = 'v2'; // v2.
                     }
                 }
             }
@@ -3607,14 +2812,14 @@ function signCRL($issuer, $crl, $signatureAlgorithm = 'sha1WithRSAEncryption')
             }
 
             if (isset($issuer->currentKeyIdentifier)) {
-                $this->setExtension('id-ce-authorityKeyIdentifier', array(
+                $this->setExtension('id-ce-authorityKeyIdentifier', [
                         //'authorityCertIssuer' => array(
-                        //    array(
+                        //    ]
                         //        'directoryName' => $issuer->dn
-                        //    )
+                        //    ]
                         //),
-                        'keyIdentifier' => $issuer->currentKeyIdentifier
-                    ));
+                        'keyIdentifier' => $issuer->currentKeyIdentifier,
+                    ]);
                 //$extensions = &$tbsCertList['crlExtensions'];
                 //if (isset($issuer->serialNumber)) {
                 //    $extensions[count($extensions) - 1]['authorityCertSerialNumber'] = $issuer->serialNumber;
@@ -3636,11 +2841,12 @@ function signCRL($issuer, $crl, $signatureAlgorithm = 'sha1WithRSAEncryption')
         unset($tbsCertList);
 
         // resync $this->signatureSubject
-        // save $tbsCertList in case there are any \phpseclib\File\ASN1\Element objects in it
+        // save $tbsCertList in case there are any \phpseclib3\File\ASN1\Element objects in it
         $tbsCertList = $this->currentCert['tbsCertList'];
         $this->loadCRL($this->saveCRL($this->currentCert));
 
-        $result = $this->_sign($issuer->privateKey, $signatureAlgorithm);
+        $result = $this->currentCert;
+        $this->currentCert['signature'] = $result['signature'] = "\0" . $issuer->privateKey->sign($this->signatureSubject);
         $result['tbsCertList'] = $tbsCertList;
 
         $this->currentCert = $currentCert;
@@ -3650,57 +2856,86 @@ function signCRL($issuer, $crl, $signatureAlgorithm = 'sha1WithRSAEncryption')
     }
 
     /**
-     * X.509 certificate signing helper function.
+     * Identify signature algorithm from key settings
      *
-     * @param object $key
-     * @param \phpseclib\File\X509 $subject
-     * @param string $signatureAlgorithm
-     * @access public
-     * @throws \phpseclib\Exception\UnsupportedAlgorithmException if the algorithm is unsupported
-     * @return mixed
+     * @throws UnsupportedAlgorithmException if the algorithm is unsupported
      */
-    function _sign($key, $signatureAlgorithm)
+    private static function identifySignatureAlgorithm(PrivateKey $key): array
     {
         if ($key instanceof RSA) {
-            switch ($signatureAlgorithm) {
-                case 'md2WithRSAEncryption':
-                case 'md5WithRSAEncryption':
-                case 'sha1WithRSAEncryption':
-                case 'sha224WithRSAEncryption':
-                case 'sha256WithRSAEncryption':
-                case 'sha384WithRSAEncryption':
-                case 'sha512WithRSAEncryption':
-                    $key->setHash(preg_replace('#WithRSAEncryption$#', '', $signatureAlgorithm));
-                    $key->setSignatureMode(RSA::SIGNATURE_PKCS1);
-
-                    $this->currentCert['signature'] = base64_encode("\0" . $key->sign($this->signatureSubject));
-                    return $this->currentCert;
-                default:
-                    throw new UnsupportedAlgorithmException('Signature algorithm unsupported');
+            if ($key->getPadding() & RSA::SIGNATURE_PSS) {
+                $r = PSS::load($key->withPassword()->toString('PSS'));
+                return [
+                    'algorithm' => 'id-RSASSA-PSS',
+                    'parameters' => PSS::savePSSParams($r),
+                ];
+            }
+            switch ($key->getHash()) {
+                case 'md2':
+                case 'md5':
+                case 'sha1':
+                case 'sha224':
+                case 'sha256':
+                case 'sha384':
+                case 'sha512':
+                    return [
+                        'algorithm' => $key->getHash()->__toString() . 'WithRSAEncryption',
+                        'parameters' => null
+                    ];
+            }
+            throw new UnsupportedAlgorithmException('The only supported hash algorithms for RSA are: md2, md5, sha1, sha224, sha256, sha384, sha512');
+        }
+
+        if ($key instanceof DSA) {
+            switch ($key->getHash()) {
+                case 'sha1':
+                case 'sha224':
+                case 'sha256':
+                    return ['algorithm' => 'id-dsa-with-' . $key->getHash()->__toString()];
             }
+            throw new UnsupportedAlgorithmException('The only supported hash algorithms for DSA are: sha1, sha224, sha256');
         }
 
-        throw new UnsupportedAlgorithmException('Unsupported public key algorithm');
+        if ($key instanceof EC) {
+            switch ($key->getCurve()) {
+                case 'Ed25519':
+                case 'Ed448':
+                    return ['algorithm' => 'id-' . $key->getCurve()];
+            }
+            switch ($key->getHash()) {
+                case 'sha1':
+                case 'sha224':
+                case 'sha256':
+                case 'sha384':
+                case 'sha512':
+                    return ['algorithm' => 'ecdsa-with-' . strtoupper($key->getHash()->__toString())];
+            }
+            throw new UnsupportedAlgorithmException('The only supported hash algorithms for EC are: sha1, sha224, sha256, sha384, sha512');
+        }
+
+        throw new UnsupportedAlgorithmException('The only supported public key classes are: RSA, DSA, EC');
     }
 
     /**
      * Set certificate start date
      *
-     * @param string $date
-     * @access public
+     * @param \DateTimeInterface|string $date
      */
-    function setStartDate($date)
+    public function setStartDate($date): void
     {
-        $this->startDate = @date('D, d M Y H:i:s O', @strtotime($date));
+        if (!is_object($date) || !($date instanceof \DateTimeInterface)) {
+            $date = new \DateTimeImmutable($date, new \DateTimeZone(@date_default_timezone_get()));
+        }
+
+        $this->startDate = $date->format('D, d M Y H:i:s O');
     }
 
     /**
      * Set certificate end date
      *
-     * @param string $date
-     * @access public
+     * @param \DateTimeInterface|string $date
      */
-    function setEndDate($date)
+    public function setEndDate($date): void
     {
         /*
           To indicate that a certificate has no well-defined expiration date,
@@ -3709,48 +2944,106 @@ function setEndDate($date)
 
           -- http://tools.ietf.org/html/rfc5280#section-4.1.2.5
         */
-        if (strtolower($date) == 'lifetime') {
+        if (is_string($date) && strtolower($date) === 'lifetime') {
             $temp = '99991231235959Z';
-            $asn1 = new ASN1();
-            $temp = chr(ASN1::TYPE_GENERALIZED_TIME) . $asn1->_encodeLength(strlen($temp)) . $temp;
+            $temp = chr(ASN1::TYPE_GENERALIZED_TIME) . ASN1::encodeLength(strlen($temp)) . $temp;
             $this->endDate = new Element($temp);
         } else {
-            $this->endDate = @date('D, d M Y H:i:s O', @strtotime($date));
+            if (!is_object($date) || !($date instanceof \DateTimeInterface)) {
+                $date = new \DateTimeImmutable($date, new \DateTimeZone(@date_default_timezone_get()));
+            }
+
+            $this->endDate = $date->format('D, d M Y H:i:s O');
         }
     }
 
     /**
      * Set Serial Number
      *
-     * @param string $serial
-     * @param $base optional
-     * @access public
+     * @param int $base optional
      */
-    function setSerialNumber($serial, $base = -256)
+    public function setSerialNumber(string $serial, int $base = -256): void
     {
         $this->serialNumber = new BigInteger($serial, $base);
     }
 
     /**
      * Turns the certificate into a certificate authority
-     *
-     * @access public
      */
-    function makeCA()
+    public function makeCA(): void
     {
         $this->caFlag = true;
     }
 
+    /**
+     * Check for validity of subarray
+     *
+     * This is intended for use in conjunction with _subArrayUnchecked(),
+     * implementing the checks included in _subArray() but without copying
+     * a potentially large array by passing its reference by-value to is_array().
+     */
+    private function isSubArrayValid(array $root, string $path): bool
+    {
+        if (!is_array($root)) {
+            return false;
+        }
+
+        foreach (explode('/', $path) as $i) {
+            if (!is_array($root)) {
+                return false;
+            }
+
+            if (!isset($root[$i])) {
+                return true;
+            }
+
+            $root = $root[$i];
+        }
+
+        return true;
+    }
+
+    /**
+     * Get a reference to a subarray
+     *
+     * This variant of _subArray() does no is_array() checking,
+     * so $root should be checked with _isSubArrayValid() first.
+     *
+     * This is here for performance reasons:
+     * Passing a reference (i.e. $root) by-value (i.e. to is_array())
+     * creates a copy. If $root is an especially large array, this is expensive.
+     *
+     * @param string $path  absolute path with / as component separator
+     * @param bool $create optional
+     * @return array|false
+     */
+    private function &subArrayUnchecked(array &$root, string $path, bool $create = false)
+    {
+        $false = false;
+
+        foreach (explode('/', $path) as $i) {
+            if (!isset($root[$i])) {
+                if (!$create) {
+                    return $false;
+                }
+
+                $root[$i] = [];
+            }
+
+            $root = &$root[$i];
+        }
+
+        return $root;
+    }
+
     /**
      * Get a reference to a subarray
      *
-     * @param array $root
      * @param string $path  absolute path with / as component separator
      * @param bool $create optional
-     * @access private
      * @return array|false
      */
-    function &_subArray(&$root, $path, $create = false)
+    private function &subArray(?array &$root, string $path, bool $create = false)
     {
         $false = false;
 
@@ -3768,7 +3061,7 @@ function &_subArray(&$root, $path, $create = false)
                     return $false;
                 }
 
-                $root[$i] = array();
+                $root[$i] = [];
             }
 
             $root = &$root[$i];
@@ -3780,13 +3073,11 @@ function &_subArray(&$root, $path, $create = false)
     /**
      * Get a reference to an extension subarray
      *
-     * @param array $root
-     * @param string $path optional absolute path with / as component separator
+     * @param string|null $path optional absolute path with / as component separator
      * @param bool $create optional
-     * @access private
      * @return array|false
      */
-    function &_extensions(&$root, $path = null, $create = false)
+    private function &extensions(?array &$root, ?string $path = null, bool $create = false)
     {
         if (!isset($root)) {
             $root = $this->currentCert;
@@ -3804,7 +3095,7 @@ function &_extensions(&$root, $path = null, $create = false)
                 break;
             case isset($root['certificationRequestInfo']):
                 $pth = 'certificationRequestInfo/attributes';
-                $attributes = &$this->_subArray($root, $pth, $create);
+                $attributes = &$this->subArray($root, $pth, $create);
 
                 if (is_array($attributes)) {
                     foreach ($attributes as $key => $value) {
@@ -3815,14 +3106,14 @@ function &_extensions(&$root, $path = null, $create = false)
                     }
                     if ($create) {
                         $key = count($attributes);
-                        $attributes[] = array('type' => 'pkcs-9-at-extensionRequest', 'value' => array());
+                        $attributes[] = ['type' => 'pkcs-9-at-extensionRequest', 'value' => []];
                         $path = "$pth/$key/value/0";
                     }
                 }
                 break;
         }
 
-        $extensions = &$this->_subArray($root, $path, $create);
+        $extensions = &$this->subArray($root, $path, $create);
 
         if (!is_array($extensions)) {
             $false = false;
@@ -3835,14 +3126,11 @@ function &_extensions(&$root, $path = null, $create = false)
     /**
      * Remove an Extension
      *
-     * @param string $id
-     * @param string $path optional
-     * @access private
-     * @return bool
+     * @param string|null $path optional
      */
-    function _removeExtension($id, $path = null)
+    private function removeExtensionHelper(string $id, ?string $path = null): bool
     {
-        $extensions = &$this->_extensions($this->currentCert, $path);
+        $extensions = &$this->extensions($this->currentCert, $path);
 
         if (!is_array($extensions)) {
             return false;
@@ -3857,6 +3145,10 @@ function _removeExtension($id, $path = null)
         }
 
         $extensions = array_values($extensions);
+        // fix for https://bugs.php.net/75433 affecting PHP 7.2
+        if (!isset($extensions[0])) {
+            $extensions = array_splice($extensions, 0, 0);
+        }
         return $result;
     }
 
@@ -3865,15 +3157,12 @@ function _removeExtension($id, $path = null)
      *
      * Returns the extension if it exists and false if not
      *
-     * @param string $id
-     * @param array $cert optional
-     * @param string $path optional
-     * @access private
-     * @return mixed
+     * @param array|null $cert optional
+     * @param string|null $path optional
      */
-    function _getExtension($id, $cert = null, $path = null)
+    private function getExtensionHelper(string $id, ?array $cert = null, ?string $path = null)
     {
-        $extensions = $this->_extensions($cert, $path);
+        $extensions = $this->extensions($cert, $path);
 
         if (!is_array($extensions)) {
             return false;
@@ -3891,15 +3180,13 @@ function _getExtension($id, $cert = null, $path = null)
     /**
      * Returns a list of all extensions in use
      *
-     * @param array $cert optional
-     * @param string $path optional
-     * @access private
-     * @return array
+     * @param array|null $cert optional
+     * @param string|null $path optional
      */
-    function _getExtensions($cert = null, $path = null)
+    private function getExtensionsHelper(?array $cert = null, ?string $path = null): array
     {
-        $exts = $this->_extensions($cert, $path);
-        $extensions = array();
+        $exts = $this->extensions($cert, $path);
+        $extensions = [];
 
         if (is_array($exts)) {
             foreach ($exts as $extension) {
@@ -3913,23 +3200,19 @@ function _getExtensions($cert = null, $path = null)
     /**
      * Set an Extension
      *
-     * @param string $id
-     * @param mixed $value
      * @param bool $critical optional
      * @param bool $replace optional
-     * @param string $path optional
-     * @access private
-     * @return bool
+     * @param string|null $path optional
      */
-    function _setExtension($id, $value, $critical = false, $replace = true, $path = null)
+    private function setExtensionHelper(string $id, $value, bool $critical = false, bool $replace = true, ?string $path = null): bool
     {
-        $extensions = &$this->_extensions($this->currentCert, $path, true);
+        $extensions = &$this->extensions($this->currentCert, $path, true);
 
         if (!is_array($extensions)) {
             return false;
         }
 
-        $newext = array('extnId'  => $id, 'critical' => $critical, 'extnValue' => $value);
+        $newext = ['extnId'  => $id, 'critical' => $critical, 'extnValue' => $value];
 
         foreach ($extensions as $key => $value) {
             if ($value['extnId'] == $id) {
@@ -3948,14 +3231,10 @@ function _setExtension($id, $value, $critical = false, $replace = true, $path =
 
     /**
      * Remove a certificate, CSR or CRL Extension
-     *
-     * @param string $id
-     * @access public
-     * @return bool
      */
-    function removeExtension($id)
+    public function removeExtension(string $id): bool
     {
-        return $this->_removeExtension($id);
+        return $this->removeExtensionHelper($id);
     }
 
     /**
@@ -3963,54 +3242,43 @@ function removeExtension($id)
      *
      * Returns the extension if it exists and false if not
      *
-     * @param string $id
-     * @param array $cert optional
-     * @access public
-     * @return mixed
+     * @param array|null $cert optional
      */
-    function getExtension($id, $cert = null)
+    public function getExtension(string $id, ?array $cert = null, ?string $path = null)
     {
-        return $this->_getExtension($id, $cert);
+        return $this->getExtensionHelper($id, $cert, $path);
     }
 
     /**
      * Returns a list of all extensions in use in certificate, CSR or CRL
      *
-     * @param array $cert optional
-     * @access public
-     * @return array
+     * @param array|null $cert optional
+     * @param string|null $path optional
      */
-    function getExtensions($cert = null)
+    public function getExtensions(?array $cert = null, ?string $path = null): array
     {
-        return $this->_getExtensions($cert);
+        return $this->getExtensionsHelper($cert, $path);
     }
 
     /**
      * Set a certificate, CSR or CRL Extension
      *
-     * @param string $id
-     * @param mixed $value
      * @param bool $critical optional
      * @param bool $replace optional
-     * @access public
-     * @return bool
      */
-    function setExtension($id, $value, $critical = false, $replace = true)
+    public function setExtension(string $id, $value, bool $critical = false, bool $replace = true): bool
     {
-        return $this->_setExtension($id, $value, $critical, $replace);
+        return $this->setExtensionHelper($id, $value, $critical, $replace);
     }
 
     /**
      * Remove a CSR attribute.
      *
-     * @param string $id
      * @param int $disposition optional
-     * @access public
-     * @return bool
      */
-    function removeAttribute($id, $disposition = self::ATTR_ALL)
+    public function removeAttribute(string $id, int $disposition = self::ATTR_ALL): bool
     {
-        $attributes = &$this->_subArray($this->currentCert, 'certificationRequestInfo/attributes');
+        $attributes = &$this->subArray($this->currentCert, 'certificationRequestInfo/attributes');
 
         if (!is_array($attributes)) {
             return false;
@@ -4053,19 +3321,16 @@ function removeAttribute($id, $disposition = self::ATTR_ALL)
      *
      * Returns the attribute if it exists and false if not
      *
-     * @param string $id
      * @param int $disposition optional
-     * @param array $csr optional
-     * @access public
-     * @return mixed
+     * @param array|null $csr optional
      */
-    function getAttribute($id, $disposition = self::ATTR_ALL, $csr = null)
+    public function getAttribute(string $id, int $disposition = self::ATTR_ALL, ?array $csr = null)
     {
         if (empty($csr)) {
             $csr = $this->currentCert;
         }
 
-        $attributes = $this->_subArray($csr, 'certificationRequestInfo/attributes');
+        $attributes = $this->subArray($csr, 'certificationRequestInfo/attributes');
 
         if (!is_array($attributes)) {
             return false;
@@ -4093,20 +3358,39 @@ function getAttribute($id, $disposition = self::ATTR_ALL, $csr = null)
     }
 
     /**
-     * Returns a list of all CSR attributes in use
+     * Get all requested CSR extensions
+     *
+     * Returns the list of extensions if there are any and false if not
      *
      * @param array $csr optional
-     * @access public
-     * @return array
      */
-    function getAttributes($csr = null)
+    public function getRequestedCertificateExtensions(?array $csr = null)
     {
         if (empty($csr)) {
             $csr = $this->currentCert;
         }
 
-        $attributes = $this->_subArray($csr, 'certificationRequestInfo/attributes');
-        $attrs = array();
+        $requestedExtensions = $this->getAttribute('pkcs-9-at-extensionRequest');
+        if ($requestedExtensions === false) {
+            return false;
+        }
+
+        return $this->getAttribute('pkcs-9-at-extensionRequest')[0];
+    }
+
+    /**
+     * Returns a list of all CSR attributes in use
+     *
+     * @param array|null $csr optional
+     */
+    public function getAttributes(?array $csr = null): array
+    {
+        if (empty($csr)) {
+            $csr = $this->currentCert;
+        }
+
+        $attributes = $this->subArray($csr, 'certificationRequestInfo/attributes');
+        $attrs = [];
 
         if (is_array($attributes)) {
             foreach ($attributes as $attribute) {
@@ -4120,15 +3404,11 @@ function getAttributes($csr = null)
     /**
      * Set a CSR attribute
      *
-     * @param string $id
-     * @param mixed $value
-     * @param bool $disposition optional
-     * @access public
-     * @return bool
+     * @param int $disposition optional
      */
-    function setAttribute($id, $value, $disposition = self::ATTR_ALL)
+    public function setAttribute(string $id, $value, int $disposition = self::ATTR_ALL): bool
     {
-        $attributes = &$this->_subArray($this->currentCert, 'certificationRequestInfo/attributes', true);
+        $attributes = &$this->subArray($this->currentCert, 'certificationRequestInfo/attributes', true);
 
         if (!is_array($attributes)) {
             return false;
@@ -4137,6 +3417,7 @@ function setAttribute($id, $value, $disposition = self::ATTR_ALL)
         switch ($disposition) {
             case self::ATTR_REPLACE:
                 $disposition = self::ATTR_APPEND;
+                // fall-through
             case self::ATTR_ALL:
                 $this->removeAttribute($id);
                 break;
@@ -4166,7 +3447,7 @@ function setAttribute($id, $value, $disposition = self::ATTR_ALL)
                 $attributes[$last]['value'][] = $value;
                 break;
             default:
-                $attributes[] = array('type' => $id, 'value' => $disposition == self::ATTR_ALL ? $value: array($value));
+                $attributes[] = ['type' => $id, 'value' => $disposition == self::ATTR_ALL ? $value : [$value]];
                 break;
         }
 
@@ -4177,16 +3458,13 @@ function setAttribute($id, $value, $disposition = self::ATTR_ALL)
      * Sets the subject key identifier
      *
      * This is used by the id-ce-authorityKeyIdentifier and the id-ce-subjectKeyIdentifier extensions.
-     *
-     * @param string $value
-     * @access public
      */
-    function setKeyIdentifier($value)
+    public function setKeyIdentifier(string $value): void
     {
         if (empty($value)) {
             unset($this->currentKeyIdentifier);
         } else {
-            $this->currentKeyIdentifier = base64_encode($value);
+            $this->currentKeyIdentifier = $value;
         }
     }
 
@@ -4198,17 +3476,16 @@ function setKeyIdentifier($value)
      * recommended methods (4.2.1.2 RFC 3280).
      * Highly polymorphic: try to accept all possible forms of key:
      * - Key object
-     * - \phpseclib\File\X509 object with public or private key defined
+     * - \phpseclib3\File\X509 object with public or private key defined
      * - Certificate or CSR array
-     * - \phpseclib\File\ASN1\Element object
+     * - \phpseclib3\File\ASN1\Element object
      * - PEM or DER string
      *
      * @param mixed $key optional
      * @param int $method optional
-     * @access public
      * @return string binary key identifier
      */
-    function computeKeyIdentifier($key = null, $method = 1)
+    public function computeKeyIdentifier($key = null, int $method = 1)
     {
         if (is_null($key)) {
             $key = $this;
@@ -4225,25 +3502,20 @@ function computeKeyIdentifier($key = null, $method = 1)
                 return false;
             case $key instanceof Element:
                 // Assume the element is a bitstring-packed key.
-                $asn1 = new ASN1();
-                $decoded = $asn1->decodeBER($key->element);
-                if (empty($decoded)) {
+                $decoded = ASN1::decodeBER($key->element);
+                if (!$decoded) {
                     return false;
                 }
-                $raw = $asn1->asn1map($decoded[0], array('type' => ASN1::TYPE_BIT_STRING));
+                $raw = ASN1::asn1map($decoded[0], ['type' => ASN1::TYPE_BIT_STRING]);
                 if (empty($raw)) {
                     return false;
                 }
-                $raw = base64_decode($raw);
                 // If the key is private, compute identifier from its corresponding public key.
-                $key = new RSA();
-                if (!$key->load($raw)) {
-                    return false;   // Not an unencrypted RSA key.
-                }
-                if ($key->getPrivateKey() !== false) {  // If private.
+                $key = PublicKeyLoader::load($raw);
+                if ($key instanceof PrivateKey) {  // If private.
                     return $this->computeKeyIdentifier($key, $method);
                 }
-                $key = $raw;    // Is a public key.
+                $key = $raw; // Is a public key.
                 break;
             case $key instanceof X509:
                 if (isset($key->publicKey)) {
@@ -4256,13 +3528,13 @@ function computeKeyIdentifier($key = null, $method = 1)
                     return $this->computeKeyIdentifier($key->currentCert, $method);
                 }
                 return false;
-            default: // Should be a key object (i.e.: \phpseclib\Crypt\RSA).
-                $key = $key->getPublicKey('PKCS1');
+            default: // Should be a key object (i.e.: \phpseclib3\Crypt\RSA).
+                $key = $key->getPublicKey();
                 break;
         }
 
         // If in PEM format, convert to binary.
-        $key = $this->_extractBER($key);
+        $key = ASN1::extractBER(is_string($key) ? $key : $key->__toString());
 
         // Now we have the key string: compute its sha-1 sum.
         $hash = new Hash('sha1');
@@ -4279,33 +3551,36 @@ function computeKeyIdentifier($key = null, $method = 1)
     /**
      * Format a public key as appropriate
      *
-     * @access private
-     * @return array
+     * @return array|false
      */
-    function _formatSubjectPublicKey()
+    private function formatSubjectPublicKey()
     {
-        if ($this->publicKey instanceof RSA) {
-            // the following two return statements do the same thing. i dunno.. i just prefer the later for some reason.
-            // the former is a good example of how to do fuzzing on the public key
-            //return new Element(base64_decode(preg_replace('#-.+-|[\r\n]#', '', $this->publicKey->getPublicKey())));
-            return array(
-                'algorithm' => array('algorithm' => 'rsaEncryption'),
-                'subjectPublicKey' => $this->publicKey->getPublicKey('PKCS1')
-            );
+        $format = $this->publicKey instanceof RSA && ($this->publicKey->getPadding() & RSA::SIGNATURE_PSS) ?
+            'PSS' :
+            'PKCS8';
+
+        $publicKey = base64_decode(preg_replace('#-.+-|[\r\n]#', '', $this->publicKey->toString($format)));
+
+        $decoded = ASN1::decodeBER($publicKey);
+        if (!$decoded) {
+            return false;
+        }
+        $mapped = ASN1::asn1map($decoded[0], Maps\SubjectPublicKeyInfo::MAP);
+        if (!is_array($mapped)) {
+            return false;
         }
 
-        return false;
+        $mapped['subjectPublicKey'] = $this->publicKey->toString($format);
+
+        return $mapped;
     }
 
     /**
      * Set the domain name's which the cert is to be valid for
-     *
-     * @access public
-     * @return array
      */
-    function setDomain()
+    public function setDomain(...$domains): void
     {
-        $this->domains = func_get_args();
+        $this->domains = $domains;
         $this->removeDNProp('id-at-commonName');
         $this->setDNProp('id-at-commonName', $this->domains[0]);
     }
@@ -4313,12 +3588,11 @@ function setDomain()
     /**
      * Set the IP Addresses's which the cert is to be valid for
      *
-     * @access public
-     * @param string $ipAddress optional
+     * @param mixed[] ...$ipAddresses
      */
-    function setIPAddress()
+    public function setIPAddress(...$ipAddresses): void
     {
-        $this->ipAddresses = func_get_args();
+        $this->ipAddresses = $ipAddresses;
         /*
         if (!isset($this->domains)) {
             $this->removeDNProp('id-at-commonName');
@@ -4329,40 +3603,29 @@ function setIPAddress()
 
     /**
      * Helper function to build domain array
-     *
-     * @access private
-     * @param string $domain
-     * @return array
      */
-    function _dnsName($domain)
+    private static function dnsName(string $domain): array
     {
-        return array('dNSName' => $domain);
+        return ['dNSName' => $domain];
     }
 
     /**
      * Helper function to build IP Address array
      *
      * (IPv6 is not currently supported)
-     *
-     * @access private
-     * @param string $address
-     * @return array
      */
-    function _iPAddress($address)
+    private function iPAddress(string $address): array
     {
-        return array('iPAddress' => $address);
+        return ['iPAddress' => $address];
     }
 
     /**
      * Get the index of a revoked certificate.
      *
-     * @param array $rclist
-     * @param string $serial
      * @param bool $create optional
-     * @access private
      * @return int|false
      */
-    function _revokedCertificate(&$rclist, $serial, $create = false)
+    private function revokedCertificate(array &$rclist, string $serial, bool $create = false)
     {
         $serial = new BigInteger($serial);
 
@@ -4377,27 +3640,25 @@ function _revokedCertificate(&$rclist, $serial, $create = false)
         }
 
         $i = count($rclist);
-        $rclist[] = array('userCertificate' => $serial,
-                          'revocationDate'  => $this->_timeField(@date('D, d M Y H:i:s O')));
+        $revocationDate = new \DateTimeImmutable('now', new \DateTimeZone(@date_default_timezone_get()));
+        $rclist[] = ['userCertificate' => $serial,
+                          'revocationDate'  => $this->timeField($revocationDate->format('D, d M Y H:i:s O')), ];
         return $i;
     }
 
     /**
      * Revoke a certificate.
      *
-     * @param string $serial
-     * @param string $date optional
-     * @access public
-     * @return bool
+     * @param string|null $date optional
      */
-    function revoke($serial, $date = null)
+    public function revoke(string $serial, ?string $date = null): bool
     {
         if (isset($this->currentCert['tbsCertList'])) {
-            if (is_array($rclist = &$this->_subArray($this->currentCert, 'tbsCertList/revokedCertificates', true))) {
-                if ($this->_revokedCertificate($rclist, $serial) === false) { // If not yet revoked
-                    if (($i = $this->_revokedCertificate($rclist, $serial, true)) !== false) {
+            if (is_array($rclist = &$this->subArray($this->currentCert, 'tbsCertList/revokedCertificates', true))) {
+                if ($this->revokedCertificate($rclist, $serial) === false) { // If not yet revoked
+                    if (($i = $this->revokedCertificate($rclist, $serial, true)) !== false) {
                         if (!empty($date)) {
-                            $rclist[$i]['revocationDate'] = $this->_timeField($date);
+                            $rclist[$i]['revocationDate'] = $this->timeField($date);
                         }
 
                         return true;
@@ -4411,15 +3672,11 @@ function revoke($serial, $date = null)
 
     /**
      * Unrevoke a certificate.
-     *
-     * @param string $serial
-     * @access public
-     * @return bool
      */
-    function unrevoke($serial)
+    public function unrevoke(string $serial): bool
     {
-        if (is_array($rclist = &$this->_subArray($this->currentCert, 'tbsCertList/revokedCertificates'))) {
-            if (($i = $this->_revokedCertificate($rclist, $serial)) !== false) {
+        if (is_array($rclist = &$this->subArray($this->currentCert, 'tbsCertList/revokedCertificates'))) {
+            if (($i = $this->revokedCertificate($rclist, $serial)) !== false) {
                 unset($rclist[$i]);
                 $rclist = array_values($rclist);
                 return true;
@@ -4431,15 +3688,11 @@ function unrevoke($serial)
 
     /**
      * Get a revoked certificate.
-     *
-     * @param string $serial
-     * @access public
-     * @return mixed
      */
-    function getRevoked($serial)
+    public function getRevoked(string $serial)
     {
-        if (is_array($rclist = $this->_subArray($this->currentCert, 'tbsCertList/revokedCertificates'))) {
-            if (($i = $this->_revokedCertificate($rclist, $serial)) !== false) {
+        if (is_array($rclist = $this->subArray($this->currentCert, 'tbsCertList/revokedCertificates'))) {
+            if (($i = $this->revokedCertificate($rclist, $serial)) !== false) {
                 return $rclist[$i];
             }
         }
@@ -4450,11 +3703,10 @@ function getRevoked($serial)
     /**
      * List revoked certificates
      *
-     * @param array $crl optional
-     * @access public
-     * @return array
+     * @param array|null $crl optional
+     * @return array|bool
      */
-    function listRevoked($crl = null)
+    public function listRevoked(?array $crl = null)
     {
         if (!isset($crl)) {
             $crl = $this->currentCert;
@@ -4464,9 +3716,9 @@ function listRevoked($crl = null)
             return false;
         }
 
-        $result = array();
+        $result = [];
 
-        if (is_array($rclist = $this->_subArray($crl, 'tbsCertList/revokedCertificates'))) {
+        if (is_array($rclist = $this->subArray($crl, 'tbsCertList/revokedCertificates'))) {
             foreach ($rclist as $rc) {
                 $result[] = $rc['userCertificate']->toString();
             }
@@ -4477,17 +3729,12 @@ function listRevoked($crl = null)
 
     /**
      * Remove a Revoked Certificate Extension
-     *
-     * @param string $serial
-     * @param string $id
-     * @access public
-     * @return bool
      */
-    function removeRevokedCertificateExtension($serial, $id)
+    public function removeRevokedCertificateExtension(string $serial, string $id): bool
     {
-        if (is_array($rclist = &$this->_subArray($this->currentCert, 'tbsCertList/revokedCertificates'))) {
-            if (($i = $this->_revokedCertificate($rclist, $serial)) !== false) {
-                return $this->_removeExtension($id, "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
+        if (is_array($rclist = &$this->subArray($this->currentCert, 'tbsCertList/revokedCertificates'))) {
+            if (($i = $this->revokedCertificate($rclist, $serial)) !== false) {
+                return $this->removeExtensionHelper($id, "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
             }
         }
 
@@ -4499,21 +3746,17 @@ function removeRevokedCertificateExtension($serial, $id)
      *
      * Returns the extension if it exists and false if not
      *
-     * @param string $serial
-     * @param string $id
-     * @param array $crl optional
-     * @access public
-     * @return mixed
+     * @param array|null $crl optional
      */
-    function getRevokedCertificateExtension($serial, $id, $crl = null)
+    public function getRevokedCertificateExtension(string $serial, string $id, ?array $crl = null)
     {
         if (!isset($crl)) {
             $crl = $this->currentCert;
         }
 
-        if (is_array($rclist = $this->_subArray($crl, 'tbsCertList/revokedCertificates'))) {
-            if (($i = $this->_revokedCertificate($rclist, $serial)) !== false) {
-                return $this->_getExtension($id, $crl,  "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
+        if (is_array($rclist = $this->subArray($crl, 'tbsCertList/revokedCertificates'))) {
+            if (($i = $this->revokedCertificate($rclist, $serial)) !== false) {
+                return $this->getExtension($id, $crl, "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
             }
         }
 
@@ -4523,20 +3766,18 @@ function getRevokedCertificateExtension($serial, $id, $crl = null)
     /**
      * Returns a list of all extensions in use for a given revoked certificate
      *
-     * @param string $serial
-     * @param array $crl optional
-     * @access public
-     * @return array
+     * @param array|null $crl optional
+     * @return array|bool
      */
-    function getRevokedCertificateExtensions($serial, $crl = null)
+    public function getRevokedCertificateExtensions(string $serial, ?array $crl = null)
     {
         if (!isset($crl)) {
             $crl = $this->currentCert;
         }
 
-        if (is_array($rclist = $this->_subArray($crl, 'tbsCertList/revokedCertificates'))) {
-            if (($i = $this->_revokedCertificate($rclist, $serial)) !== false) {
-                return $this->_getExtensions($crl, "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
+        if (is_array($rclist = $this->subArray($crl, 'tbsCertList/revokedCertificates'))) {
+            if (($i = $this->revokedCertificate($rclist, $serial)) !== false) {
+                return $this->getExtensions($crl, "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
             }
         }
 
@@ -4546,20 +3787,15 @@ function getRevokedCertificateExtensions($serial, $crl = null)
     /**
      * Set a Revoked Certificate Extension
      *
-     * @param string $serial
-     * @param string $id
-     * @param mixed $value
      * @param bool $critical optional
      * @param bool $replace optional
-     * @access public
-     * @return bool
      */
-    function setRevokedCertificateExtension($serial, $id, $value, $critical = false, $replace = true)
+    public function setRevokedCertificateExtension(string $serial, string $id, $value, bool $critical = false, bool $replace = true): bool
     {
         if (isset($this->currentCert['tbsCertList'])) {
-            if (is_array($rclist = &$this->_subArray($this->currentCert, 'tbsCertList/revokedCertificates', true))) {
-                if (($i = $this->_revokedCertificate($rclist, $serial, true)) !== false) {
-                    return $this->_setExtension($id, $value, $critical, $replace, "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
+            if (is_array($rclist = &$this->subArray($this->currentCert, 'tbsCertList/revokedCertificates', true))) {
+                if (($i = $this->revokedCertificate($rclist, $serial, true)) !== false) {
+                    return $this->setExtensionHelper($id, $value, $critical, $replace, "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
                 }
             }
         }
@@ -4568,56 +3804,32 @@ function setRevokedCertificateExtension($serial, $id, $value, $critical = false,
     }
 
     /**
-     * Extract raw BER from Base64 encoding
-     *
-     * @access private
-     * @param string $str
-     * @return string
+     * Register the mapping for a custom/unsupported extension.
      */
-    function _extractBER($str)
+    public static function registerExtension(string $id, array $mapping): void
     {
-        /* X.509 certs are assumed to be base64 encoded but sometimes they'll have additional things in them
-         * above and beyond the ceritificate.
-         * ie. some may have the following preceding the -----BEGIN CERTIFICATE----- line:
-         *
-         * Bag Attributes
-         *     localKeyID: 01 00 00 00
-         * subject=/O=organization/OU=org unit/CN=common name
-         * issuer=/O=organization/CN=common name
-         */
-        $temp = preg_replace('#.*?^-+[^-]+-+[\r\n ]*$#ms', '', $str, 1);
-        // remove the -----BEGIN CERTIFICATE----- and -----END CERTIFICATE----- stuff
-        $temp = preg_replace('#-+[^-]+-+#', '', $temp);
-        // remove new lines
-        $temp = str_replace(array("\r", "\n", ' '), '', $temp);
-        $temp = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $temp) ? base64_decode($temp) : false;
-        return $temp != false ? $temp : $str;
+        if (isset(self::$extensions[$id]) && self::$extensions[$id] !== $mapping) {
+            throw new RuntimeException(
+                'Extension ' . $id . ' has already been defined with a different mapping.'
+            );
+        }
+
+        self::$extensions[$id] = $mapping;
     }
 
     /**
-     * Returns the OID corresponding to a name
-     *
-     * What's returned in the associative array returned by loadX509() (or load*()) is either a name or an OID if
-     * no OID to name mapping is available. The problem with this is that what may be an unmapped OID in one version
-     * of phpseclib may not be unmapped in the next version, so apps that are looking at this OID may not be able
-     * to work from version to version.
-     *
-     * This method will return the OID if a name is passed to it and if no mapping is avialable it'll assume that
-     * what's being passed to it already is an OID and return that instead. A few examples.
-     *
-     * getOID('2.16.840.1.101.3.4.2.1') == '2.16.840.1.101.3.4.2.1'
-     * getOID('id-sha256') == '2.16.840.1.101.3.4.2.1'
-     * getOID('zzz') == 'zzz'
-     *
-     * @access public
-     * @return string
+     * Register the mapping for a custom/unsupported extension.
      */
-    function getOID($name)
+    public static function getRegisteredExtension(string $id): ?array
     {
-        static $reverseMap;
-        if (!isset($reverseMap)) {
-            $reverseMap = array_flip($this->oids);
-        }
-        return isset($reverseMap[$name]) ? $reverseMap[$name] : $name;
+        return self::$extensions[$id] ?? null;
+    }
+
+    /**
+     * Register the mapping for a custom/unsupported extension.
+     */
+    public function setExtensionValue(string $id, $value, bool $critical = false, bool $replace = false): void
+    {
+        $this->extensionValues[$id] = compact('critical', 'replace', 'value');
     }
 }
diff --git a/phpseclib/Math/BigInteger.php b/phpseclib/Math/BigInteger.php
index 6befb591b..a12b2c1b7 100644
--- a/phpseclib/Math/BigInteger.php
+++ b/phpseclib/Math/BigInteger.php
@@ -6,33 +6,13 @@
  * Supports base-2, base-10, base-16, and base-256 numbers.  Uses the GMP or BCMath extensions, if available,
  * and an internal implementation, otherwise.
  *
- * PHP version 5
- *
- * {@internal (all DocBlock comments regarding implementation - such as the one that follows - refer to the
- * {@link self::MODE_INTERNAL self::MODE_INTERNAL} mode)
- *
- * BigInteger uses base-2**26 to perform operations such as multiplication and division and
- * base-2**52 (ie. two base 2**26 digits) to perform addition and subtraction.  Because the largest possible
- * value when multiplying two base-2**26 numbers together is a base-2**52 number, double precision floating
- * point numbers - numbers that should be supported on most hardware and whose significand is 53 bits - are
- * used.  As a consequence, bitwise operators such as >> and << cannot be used, nor can the modulo operator %,
- * which only supports integers.  Although this fact will slow this library down, the fact that such a high
- * base is being used should more than compensate.
- *
- * Numbers are stored in {@link http://en.wikipedia.org/wiki/Endianness little endian} format.  ie.
- * (new \phpseclib\Math\BigInteger(pow(2, 26)))->value = array(0, 1)
- *
- * Useful resources are as follows:
- *
- *  - {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf Handbook of Applied Cryptography (HAC)}
- *  - {@link http://math.libtomcrypt.com/files/tommath.pdf Multi-Precision Math (MPM)}
- *  - Java's BigInteger classes.  See /j2se/src/share/classes/java/math in jdk-1_5_0-src-jrl.zip
+ * PHP version 5 and 7
  *
  * Here's an example of how to use this library:
  * <code>
  * <?php
- *    $a = new \phpseclib\Math\BigInteger(2);
- *    $b = new \phpseclib\Math\BigInteger(3);
+ *    $a = new \phpseclib3\Math\BigInteger(2);
+ *    $b = new \phpseclib3\Math\BigInteger(3);
  *
  *    $c = $a->add($b);
  *
@@ -40,3264 +20,606 @@
  * ?>
  * </code>
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2006 Jim Wigginton
+ * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
  */
 
-namespace phpseclib\Math;
+declare(strict_types=1);
+
+namespace phpseclib3\Math;
 
-use phpseclib\Crypt\Random;
+use phpseclib3\Exception\BadConfigurationException;
+use phpseclib3\Exception\InvalidArgumentException;
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\Math\BigInteger\Engines\Engine;
 
 /**
  * Pure-PHP arbitrary precision integer arithmetic library. Supports base-2, base-10, base-16, and base-256
  * numbers.
  *
- * @package BigInteger
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
-class BigInteger
+class BigInteger implements \JsonSerializable
 {
-    /**#@+
-     * Reduction constants
-     *
-     * @access private
-     * @see BigInteger::_reduce()
-     */
-    /**
-     * @see BigInteger::_montgomery()
-     * @see BigInteger::_prepMontgomery()
-     */
-    const MONTGOMERY = 0;
-    /**
-     * @see BigInteger::_barrett()
-     */
-    const BARRETT = 1;
-    /**
-     * @see BigInteger::_mod2()
-     */
-    const POWEROF2 = 2;
-    /**
-     * @see BigInteger::_remainder()
-     */
-    const CLASSIC = 3;
-    /**
-     * @see BigInteger::__clone()
-     */
-    const NONE = 4;
-    /**#@-*/
-
-    /**#@+
-     * Array constants
-     *
-     * Rather than create a thousands and thousands of new BigInteger objects in repeated function calls to add() and
-     * multiply() or whatever, we'll just work directly on arrays, taking them in as parameters and returning them.
-     *
-     * @access private
-    */
-    /**
-     * $result[self::VALUE] contains the value.
-     */
-    const VALUE = 0;
-    /**
-     * $result[self::SIGN] contains the sign.
-     */
-    const SIGN = 1;
-    /**#@-*/
-
-    /**#@+
-     * @access private
-     * @see BigInteger::_montgomery()
-     * @see BigInteger::_barrett()
-    */
-    /**
-     * Cache constants
-     *
-     * $cache[self::VARIABLE] tells us whether or not the cached data is still valid.
-     */
-    const VARIABLE = 0;
-    /**
-     * $cache[self::DATA] contains the cached data.
-     */
-    const DATA = 1;
-    /**#@-*/
-
-    /**#@+
-     * Mode constants.
-     *
-     * @access private
-     * @see BigInteger::__construct()
-    */
     /**
-     * To use the pure-PHP implementation
-     */
-    const MODE_INTERNAL = 1;
-    /**
-     * To use the BCMath library
-     *
-     * (if enabled; otherwise, the internal implementation will be used)
-     */
-    const MODE_BCMATH = 2;
-    /**
-     * To use the GMP library
-     *
-     * (if present; otherwise, either the BCMath or the internal implementation will be used)
-     */
-    const MODE_GMP = 3;
-    /**#@-*/
-
-    /**
-     * Karatsuba Cutoff
-     *
-     * At what point do we switch between Karatsuba multiplication and schoolbook long multiplication?
-     *
-     * @access private
-     */
-    const KARATSUBA_CUTOFF = 25;
-
-    /**#@+
-     * Static properties used by the pure-PHP implementation.
-     *
-     * @see __construct()
-     */
-    protected static $base;
-    protected static $baseFull;
-    protected static $maxDigit;
-    protected static $msb;
-
-    /**
-     * $max10 in greatest $max10Len satisfying
-     * $max10 = 10**$max10Len <= 2**$base.
-     */
-    protected static $max10;
-
-    /**
-     * $max10Len in greatest $max10Len satisfying
-     * $max10 = 10**$max10Len <= 2**$base.
-     */
-    protected static $max10Len;
-    protected static $maxDigit2;
-    /**#@-*/
-
-    /**
-     * Holds the BigInteger's value.
-     *
-     * @var array
-     * @access private
-     */
-    var $value;
-
-    /**
-     * Holds the BigInteger's magnitude.
+     * Main Engine
      *
-     * @var bool
-     * @access private
+     * @var class-string<Engine>
      */
-    var $is_negative = false;
+    private static $mainEngine;
 
     /**
-     * Precision
+     * Selected Engines
      *
-     * @see self::setPrecision()
-     * @access private
+     * @var list<string>
      */
-    var $precision = -1;
+    private static $engines;
 
     /**
-     * Precision Bitmask
+     * The actual BigInteger object
      *
-     * @see self::setPrecision()
-     * @access private
+     * @var object
      */
-    var $bitmask = false;
+    private $value;
 
     /**
      * Mode independent value used for serialization.
      *
-     * If the bcmath or gmp extensions are installed $this->value will be a non-serializable resource, hence the need for
-     * a variable that'll be serializable regardless of whether or not extensions are being used.  Unlike $this->value,
-     * however, $this->hex is only calculated when $this->__sleep() is called.
-     *
      * @see self::__sleep()
      * @see self::__wakeup()
      * @var string
-     * @access private
-     */
-    var $hex;
-
-    /**
-     * Converts base-2, base-10, base-16, and binary strings (base-256) to BigIntegers.
-     *
-     * If the second parameter - $base - is negative, then it will be assumed that the number's are encoded using
-     * two's compliment.  The sole exception to this is -10, which is treated the same as 10 is.
-     *
-     * Here's an example:
-     * <code>
-     * <?php
-     *    $a = new \phpseclib\Math\BigInteger('0x32', 16); // 50 in base-16
-     *
-     *    echo $a->toString(); // outputs 50
-     * ?>
-     * </code>
-     *
-     * @param $x base-10 number or base-$base number if $base set.
-     * @param int $base
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     */
-    function __construct($x = 0, $base = 10)
-    {
-        if (!defined('MATH_BIGINTEGER_MODE')) {
-            switch (true) {
-                case extension_loaded('gmp'):
-                    define('MATH_BIGINTEGER_MODE', self::MODE_GMP);
-                    break;
-                case extension_loaded('bcmath'):
-                    define('MATH_BIGINTEGER_MODE', self::MODE_BCMATH);
-                    break;
-                default:
-                    define('MATH_BIGINTEGER_MODE', self::MODE_INTERNAL);
-            }
-        }
-
-        if (extension_loaded('openssl') && !defined('MATH_BIGINTEGER_OPENSSL_DISABLE') && !defined('MATH_BIGINTEGER_OPENSSL_ENABLED')) {
-            // some versions of XAMPP have mismatched versions of OpenSSL which causes it not to work
-            ob_start();
-            @phpinfo();
-            $content = ob_get_contents();
-            ob_end_clean();
-
-            preg_match_all('#OpenSSL (Header|Library) Version(.*)#im', $content, $matches);
-
-            $versions = array();
-            if (!empty($matches[1])) {
-                for ($i = 0; $i < count($matches[1]); $i++) {
-                    $fullVersion = trim(str_replace('=>', '', strip_tags($matches[2][$i])));
-
-                    // Remove letter part in OpenSSL version
-                    if (!preg_match('/(\d+\.\d+\.\d+)/i', $fullVersion, $m)) {
-                        $versions[$matches[1][$i]] = $fullVersion;
-                    } else {
-                        $versions[$matches[1][$i]] = $m[0];
-                    }
-                }
-            }
-
-            // it doesn't appear that OpenSSL versions were reported upon until PHP 5.3+
-            switch (true) {
-                case !isset($versions['Header']):
-                case !isset($versions['Library']):
-                case $versions['Header'] == $versions['Library']:
-                    define('MATH_BIGINTEGER_OPENSSL_ENABLED', true);
-                    break;
-                default:
-                    define('MATH_BIGINTEGER_OPENSSL_DISABLE', true);
-            }
-        }
-
-        if (!defined('PHP_INT_SIZE')) {
-            define('PHP_INT_SIZE', 4);
-        }
-
-        if (empty(self::$base) && MATH_BIGINTEGER_MODE == self::MODE_INTERNAL) {
-            switch (PHP_INT_SIZE) {
-                case 8: // use 64-bit integers if int size is 8 bytes
-                    self::$base      = 31;
-                    self::$baseFull  = 0x80000000;
-                    self::$maxDigit  = 0x7FFFFFFF;
-                    self::$msb       = 0x40000000;
-                    self::$max10     = 1000000000;
-                    self::$max10Len  = 9;
-                    self::$maxDigit2 = pow(2, 62);
-                    break;
-                //case 4: // use 64-bit floats if int size is 4 bytes
-                default:
-                    self::$base      = 26;
-                    self::$baseFull  = 0x4000000;
-                    self::$maxDigit  = 0x3FFFFFF;
-                    self::$msb       = 0x2000000;
-                    self::$max10     = 10000000;
-                    self::$max10Len  = 7;
-                    self::$maxDigit2 = pow(2, 52); // pow() prevents truncation
-            }
-        }
-
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                switch (true) {
-                    case is_resource($x) && get_resource_type($x) == 'GMP integer':
-                    // PHP 5.6 switched GMP from using resources to objects
-                    case $x instanceof \GMP:
-                        $this->value = $x;
-                        return;
-                }
-                $this->value = gmp_init(0);
-                break;
-            case self::MODE_BCMATH:
-                $this->value = '0';
-                break;
-            default:
-                $this->value = array();
-        }
-
-        // '0' counts as empty() but when the base is 256 '0' is equal to ord('0') or 48
-        // '0' is the only value like this per http://php.net/empty
-        if (empty($x) && (abs($base) != 256 || $x !== '0')) {
-            return;
-        }
-
-        switch ($base) {
-            case -256:
-                if (ord($x[0]) & 0x80) {
-                    $x = ~$x;
-                    $this->is_negative = true;
-                }
-            case 256:
-                switch (MATH_BIGINTEGER_MODE) {
-                    case self::MODE_GMP:
-                        $sign = $this->is_negative ? '-' : '';
-                        $this->value = gmp_init($sign . '0x' . bin2hex($x));
-                        break;
-                    case self::MODE_BCMATH:
-                        // round $len to the nearest 4 (thanks, DavidMJ!)
-                        $len = (strlen($x) + 3) & 0xFFFFFFFC;
-
-                        $x = str_pad($x, $len, chr(0), STR_PAD_LEFT);
-
-                        for ($i = 0; $i < $len; $i+= 4) {
-                            $this->value = bcmul($this->value, '4294967296', 0); // 4294967296 == 2**32
-                            $this->value = bcadd($this->value, 0x1000000 * ord($x[$i]) + ((ord($x[$i + 1]) << 16) | (ord($x[$i + 2]) << 8) | ord($x[$i + 3])), 0);
-                        }
-
-                        if ($this->is_negative) {
-                            $this->value = '-' . $this->value;
-                        }
-
-                        break;
-                    // converts a base-2**8 (big endian / msb) number to base-2**26 (little endian / lsb)
-                    default:
-                        while (strlen($x)) {
-                            $this->value[] = $this->_bytes2int($this->_base256_rshift($x, self::$base));
-                        }
-                }
-
-                if ($this->is_negative) {
-                    if (MATH_BIGINTEGER_MODE != self::MODE_INTERNAL) {
-                        $this->is_negative = false;
-                    }
-                    $temp = $this->add(new static('-1'));
-                    $this->value = $temp->value;
-                }
-                break;
-            case 16:
-            case -16:
-                if ($base > 0 && $x[0] == '-') {
-                    $this->is_negative = true;
-                    $x = substr($x, 1);
-                }
-
-                $x = preg_replace('#^(?:0x)?([A-Fa-f0-9]*).*#', '$1', $x);
-
-                $is_negative = false;
-                if ($base < 0 && hexdec($x[0]) >= 8) {
-                    $this->is_negative = $is_negative = true;
-                    $x = bin2hex(~pack('H*', $x));
-                }
-
-                switch (MATH_BIGINTEGER_MODE) {
-                    case self::MODE_GMP:
-                        $temp = $this->is_negative ? '-0x' . $x : '0x' . $x;
-                        $this->value = gmp_init($temp);
-                        $this->is_negative = false;
-                        break;
-                    case self::MODE_BCMATH:
-                        $x = (strlen($x) & 1) ? '0' . $x : $x;
-                        $temp = new static(pack('H*', $x), 256);
-                        $this->value = $this->is_negative ? '-' . $temp->value : $temp->value;
-                        $this->is_negative = false;
-                        break;
-                    default:
-                        $x = (strlen($x) & 1) ? '0' . $x : $x;
-                        $temp = new static(pack('H*', $x), 256);
-                        $this->value = $temp->value;
-                }
-
-                if ($is_negative) {
-                    $temp = $this->add(new static('-1'));
-                    $this->value = $temp->value;
-                }
-                break;
-            case 10:
-            case -10:
-                // (?<!^)(?:-).*: find any -'s that aren't at the beginning and then any characters that follow that
-                // (?<=^|-)0*: find any 0's that are preceded by the start of the string or by a - (ie. octals)
-                // [^-0-9].*: find any non-numeric characters and then any characters that follow that
-                $x = preg_replace('#(?<!^)(?:-).*|(?<=^|-)0*|[^-0-9].*#', '', $x);
-
-                switch (MATH_BIGINTEGER_MODE) {
-                    case self::MODE_GMP:
-                        $this->value = gmp_init($x);
-                        break;
-                    case self::MODE_BCMATH:
-                        // explicitly casting $x to a string is necessary, here, since doing $x[0] on -1 yields different
-                        // results then doing it on '-1' does (modInverse does $x[0])
-                        $this->value = $x === '-' ? '0' : (string) $x;
-                        break;
-                    default:
-                        $temp = new static();
-
-                        $multiplier = new static();
-                        $multiplier->value = array(self::$max10);
-
-                        if ($x[0] == '-') {
-                            $this->is_negative = true;
-                            $x = substr($x, 1);
-                        }
-
-                        $x = str_pad($x, strlen($x) + ((self::$max10Len - 1) * strlen($x)) % self::$max10Len, 0, STR_PAD_LEFT);
-                        while (strlen($x)) {
-                            $temp = $temp->multiply($multiplier);
-                            $temp = $temp->add(new static($this->_int2bytes(substr($x, 0, self::$max10Len)), 256));
-                            $x = substr($x, self::$max10Len);
-                        }
-
-                        $this->value = $temp->value;
-                }
-                break;
-            case 2: // base-2 support originally implemented by Lluis Pamies - thanks!
-            case -2:
-                if ($base > 0 && $x[0] == '-') {
-                    $this->is_negative = true;
-                    $x = substr($x, 1);
-                }
-
-                $x = preg_replace('#^([01]*).*#', '$1', $x);
-                $x = str_pad($x, strlen($x) + (3 * strlen($x)) % 4, 0, STR_PAD_LEFT);
-
-                $str = '0x';
-                while (strlen($x)) {
-                    $part = substr($x, 0, 4);
-                    $str.= dechex(bindec($part));
-                    $x = substr($x, 4);
-                }
-
-                if ($this->is_negative) {
-                    $str = '-' . $str;
-                }
-
-                $temp = new static($str, 8 * $base); // ie. either -16 or +16
-                $this->value = $temp->value;
-                $this->is_negative = $temp->is_negative;
-
-                break;
-            default:
-                // base not supported, so we'll let $this == 0
-        }
-    }
-
-    /**
-     * Converts a BigInteger to a byte string (eg. base-256).
-     *
-     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
-     * saved as two's compliment.
-     *
-     * Here's an example:
-     * <code>
-     * <?php
-     *    $a = new \phpseclib\Math\BigInteger('65');
-     *
-     *    echo $a->toBytes(); // outputs chr(65)
-     * ?>
-     * </code>
-     *
-     * @param bool $twos_compliment
-     * @return string
-     * @access public
-     * @internal Converts a base-2**26 number to base-2**8
-     */
-    function toBytes($twos_compliment = false)
-    {
-        if ($twos_compliment) {
-            $comparison = $this->compare(new static());
-            if ($comparison == 0) {
-                return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
-            }
-
-            $temp = $comparison < 0 ? $this->add(new static(1)) : $this->copy();
-            $bytes = $temp->toBytes();
-
-            if (empty($bytes)) { // eg. if the number we're trying to convert is -1
-                $bytes = chr(0);
-            }
-
-            if (ord($bytes[0]) & 0x80) {
-                $bytes = chr(0) . $bytes;
-            }
-
-            return $comparison < 0 ? ~$bytes : $bytes;
-        }
-
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                if (gmp_cmp($this->value, gmp_init(0)) == 0) {
-                    return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
-                }
-
-                $temp = gmp_strval(gmp_abs($this->value), 16);
-                $temp = (strlen($temp) & 1) ? '0' . $temp : $temp;
-                $temp = pack('H*', $temp);
-
-                return $this->precision > 0 ?
-                    substr(str_pad($temp, $this->precision >> 3, chr(0), STR_PAD_LEFT), -($this->precision >> 3)) :
-                    ltrim($temp, chr(0));
-            case self::MODE_BCMATH:
-                if ($this->value === '0') {
-                    return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
-                }
-
-                $value = '';
-                $current = $this->value;
-
-                if ($current[0] == '-') {
-                    $current = substr($current, 1);
-                }
-
-                while (bccomp($current, '0', 0) > 0) {
-                    $temp = bcmod($current, '16777216');
-                    $value = chr($temp >> 16) . chr($temp >> 8) . chr($temp) . $value;
-                    $current = bcdiv($current, '16777216', 0);
-                }
-
-                return $this->precision > 0 ?
-                    substr(str_pad($value, $this->precision >> 3, chr(0), STR_PAD_LEFT), -($this->precision >> 3)) :
-                    ltrim($value, chr(0));
-        }
-
-        if (!count($this->value)) {
-            return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
-        }
-        $result = $this->_int2bytes($this->value[count($this->value) - 1]);
-
-        $temp = $this->copy();
-
-        for ($i = count($temp->value) - 2; $i >= 0; --$i) {
-            $temp->_base256_lshift($result, self::$base);
-            $result = $result | str_pad($temp->_int2bytes($temp->value[$i]), strlen($result), chr(0), STR_PAD_LEFT);
-        }
-
-        return $this->precision > 0 ?
-            str_pad(substr($result, -(($this->precision + 7) >> 3)), ($this->precision + 7) >> 3, chr(0), STR_PAD_LEFT) :
-            $result;
-    }
-
-    /**
-     * Converts a BigInteger to a hex string (eg. base-16)).
-     *
-     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
-     * saved as two's compliment.
-     *
-     * Here's an example:
-     * <code>
-     * <?php
-     *    $a = new \phpseclib\Math\BigInteger('65');
-     *
-     *    echo $a->toHex(); // outputs '41'
-     * ?>
-     * </code>
-     *
-     * @param bool $twos_compliment
-     * @return string
-     * @access public
-     * @internal Converts a base-2**26 number to base-2**8
-     */
-    function toHex($twos_compliment = false)
-    {
-        return bin2hex($this->toBytes($twos_compliment));
-    }
-
-    /**
-     * Converts a BigInteger to a bit string (eg. base-2).
-     *
-     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
-     * saved as two's compliment.
-     *
-     * Here's an example:
-     * <code>
-     * <?php
-     *    $a = new \phpseclib\Math\BigInteger('65');
-     *
-     *    echo $a->toBits(); // outputs '1000001'
-     * ?>
-     * </code>
-     *
-     * @param bool $twos_compliment
-     * @return string
-     * @access public
-     * @internal Converts a base-2**26 number to base-2**2
-     */
-    function toBits($twos_compliment = false)
-    {
-        $hex = $this->toHex($twos_compliment);
-        $bits = '';
-        for ($i = strlen($hex) - 8, $start = strlen($hex) & 7; $i >= $start; $i-=8) {
-            $bits = str_pad(decbin(hexdec(substr($hex, $i, 8))), 32, '0', STR_PAD_LEFT) . $bits;
-        }
-        if ($start) { // hexdec('') == 0
-            $bits = str_pad(decbin(hexdec(substr($hex, 0, $start))), 8, '0', STR_PAD_LEFT) . $bits;
-        }
-        $result = $this->precision > 0 ? substr($bits, -$this->precision) : ltrim($bits, '0');
-
-        if ($twos_compliment && $this->compare(new static()) > 0 && $this->precision <= 0) {
-            return '0' . $result;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Converts a BigInteger to a base-10 number.
-     *
-     * Here's an example:
-     * <code>
-     * <?php
-     *    $a = new \phpseclib\Math\BigInteger('50');
-     *
-     *    echo $a->toString(); // outputs 50
-     * ?>
-     * </code>
-     *
-     * @return string
-     * @access public
-     * @internal Converts a base-2**26 number to base-10**7 (which is pretty much base-10)
-     */
-    function toString()
-    {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                return gmp_strval($this->value);
-            case self::MODE_BCMATH:
-                if ($this->value === '0') {
-                    return '0';
-                }
-
-                return ltrim($this->value, '0');
-        }
-
-        if (!count($this->value)) {
-            return '0';
-        }
-
-        $temp = $this->copy();
-        $temp->is_negative = false;
-
-        $divisor = new static();
-        $divisor->value = array(self::$max10);
-        $result = '';
-        while (count($temp->value)) {
-            list($temp, $mod) = $temp->divide($divisor);
-            $result = str_pad(isset($mod->value[0]) ? $mod->value[0] : '', self::$max10Len, '0', STR_PAD_LEFT) . $result;
-        }
-        $result = ltrim($result, '0');
-        if (empty($result)) {
-            $result = '0';
-        }
-
-        if ($this->is_negative) {
-            $result = '-' . $result;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Copy an object
-     *
-     * PHP5 passes objects by reference while PHP4 passes by value.  As such, we need a function to guarantee
-     * that all objects are passed by value, when appropriate.  More information can be found here:
-     *
-     * {@link http://php.net/language.oop5.basic#51624}
-     *
-     * @access public
-     * @see self::__clone()
-     * @return \phpseclib\Math\BigInteger
-     */
-    function copy()
-    {
-        $temp = new static();
-        $temp->value = $this->value;
-        $temp->is_negative = $this->is_negative;
-        $temp->precision = $this->precision;
-        $temp->bitmask = $this->bitmask;
-        return $temp;
-    }
-
-    /**
-     *  __toString() magic method
-     *
-     * Will be called, automatically, if you're supporting just PHP5.  If you're supporting PHP4, you'll need to call
-     * toString().
-     *
-     * @access public
-     * @internal Implemented per a suggestion by Techie-Michael - thanks!
      */
-    function __toString()
-    {
-        return $this->toString();
-    }
+    private $hex;
 
     /**
-     * __clone() magic method
-     *
-     * Although you can call BigInteger::__toString() directly in PHP5, you cannot call BigInteger::__clone() directly
-     * in PHP5.  You can in PHP4 since it's not a magic method, but in PHP5, you have to call it by using the PHP5
-     * only syntax of $y = clone $x.  As such, if you're trying to write an application that works on both PHP4 and
-     * PHP5, call BigInteger::copy(), instead.
+     * Precision (used only for serialization)
      *
-     * @access public
-     * @see self::copy()
-     * @return \phpseclib\Math\BigInteger
+     * @see self::__sleep()
+     * @see self::__wakeup()
+     * @var int
      */
-    function __clone()
-    {
-        return $this->copy();
-    }
+    private $precision;
 
     /**
-     *  __sleep() magic method
-     *
-     * Will be called, automatically, when serialize() is called on a BigInteger object.
-     *
-     * @see self::__wakeup()
-     * @access public
-     */
-    function __sleep()
-    {
-        $this->hex = $this->toHex(true);
-        $vars = array('hex');
-        if ($this->precision > 0) {
-            $vars[] = 'precision';
-        }
-        return $vars;
-    }
-
-    /**
-     *  __wakeup() magic method
-     *
-     * Will be called, automatically, when unserialize() is called on a BigInteger object.
-     *
-     * @see self::__sleep()
-     * @access public
-     */
-    function __wakeup()
-    {
-        $temp = new static($this->hex, -16);
-        $this->value = $temp->value;
-        $this->is_negative = $temp->is_negative;
-        if ($this->precision > 0) {
-            // recalculate $this->bitmask
-            $this->setPrecision($this->precision);
-        }
-    }
-
-    /**
-     *  __debugInfo() magic method
-     *
-     * Will be called, automatically, when print_r() or var_dump() are called
-     *
-     * @access public
-     */
-    function __debugInfo()
-    {
-        $opts = array();
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                $engine = 'gmp';
-                break;
-            case self::MODE_BCMATH:
-                $engine = 'bcmath';
-                break;
-            case self::MODE_INTERNAL:
-                $engine = 'internal';
-                $opts[] = PHP_INT_SIZE == 8 ? '64-bit' : '32-bit';
-        }
-        if (MATH_BIGINTEGER_MODE != self::MODE_GMP && defined('MATH_BIGINTEGER_OPENSSL_ENABLED')) {
-            $opts[] = 'OpenSSL';
-        }
-        if (!empty($opts)) {
-            $engine.= ' (' . implode($opts, ', ') . ')';
-        }
-        return array(
-            'value' => '0x' . $this->toHex(true),
-            'engine' => $engine
-        );
-    }
-
-    /**
-     * Adds two BigIntegers.
-     *
-     * Here's an example:
-     * <code>
-     * <?php
-     *    $a = new \phpseclib\Math\BigInteger('10');
-     *    $b = new \phpseclib\Math\BigInteger('20');
-     *
-     *    $c = $a->add($b);
-     *
-     *    echo $c->toString(); // outputs 30
-     * ?>
-     * </code>
-     *
-     * @param \phpseclib\Math\BigInteger $y
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     * @internal Performs base-2**52 addition
-     */
-    function add($y)
-    {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                $temp = new static();
-                $temp->value = gmp_add($this->value, $y->value);
-
-                return $this->_normalize($temp);
-            case self::MODE_BCMATH:
-                $temp = new static();
-                $temp->value = bcadd($this->value, $y->value, 0);
-
-                return $this->_normalize($temp);
-        }
-
-        $temp = $this->_add($this->value, $this->is_negative, $y->value, $y->is_negative);
-
-        $result = new static();
-        $result->value = $temp[self::VALUE];
-        $result->is_negative = $temp[self::SIGN];
-
-        return $this->_normalize($result);
-    }
-
-    /**
-     * Performs addition.
-     *
-     * @param array $x_value
-     * @param bool $x_negative
-     * @param array $y_value
-     * @param bool $y_negative
-     * @return array
-     * @access private
-     */
-    function _add($x_value, $x_negative, $y_value, $y_negative)
-    {
-        $x_size = count($x_value);
-        $y_size = count($y_value);
-
-        if ($x_size == 0) {
-            return array(
-                self::VALUE => $y_value,
-                self::SIGN => $y_negative
-            );
-        } elseif ($y_size == 0) {
-            return array(
-                self::VALUE => $x_value,
-                self::SIGN => $x_negative
-            );
-        }
-
-        // subtract, if appropriate
-        if ($x_negative != $y_negative) {
-            if ($x_value == $y_value) {
-                return array(
-                    self::VALUE => array(),
-                    self::SIGN => false
-                );
-            }
-
-            $temp = $this->_subtract($x_value, false, $y_value, false);
-            $temp[self::SIGN] = $this->_compare($x_value, false, $y_value, false) > 0 ?
-                                          $x_negative : $y_negative;
-
-            return $temp;
-        }
-
-        if ($x_size < $y_size) {
-            $size = $x_size;
-            $value = $y_value;
-        } else {
-            $size = $y_size;
-            $value = $x_value;
-        }
-
-        $value[count($value)] = 0; // just in case the carry adds an extra digit
-
-        $carry = 0;
-        for ($i = 0, $j = 1; $j < $size; $i+=2, $j+=2) {
-            $sum = $x_value[$j] * self::$baseFull + $x_value[$i] + $y_value[$j] * self::$baseFull + $y_value[$i] + $carry;
-            $carry = $sum >= self::$maxDigit2; // eg. floor($sum / 2**52); only possible values (in any base) are 0 and 1
-            $sum = $carry ? $sum - self::$maxDigit2 : $sum;
-
-            $temp = self::$base === 26 ? intval($sum / 0x4000000) : ($sum >> 31);
-
-            $value[$i] = (int) ($sum - self::$baseFull * $temp); // eg. a faster alternative to fmod($sum, 0x4000000)
-            $value[$j] = $temp;
-        }
-
-        if ($j == $size) { // ie. if $y_size is odd
-            $sum = $x_value[$i] + $y_value[$i] + $carry;
-            $carry = $sum >= self::$baseFull;
-            $value[$i] = $carry ? $sum - self::$baseFull : $sum;
-            ++$i; // ie. let $i = $j since we've just done $value[$i]
-        }
-
-        if ($carry) {
-            for (; $value[$i] == self::$maxDigit; ++$i) {
-                $value[$i] = 0;
-            }
-            ++$value[$i];
-        }
-
-        return array(
-            self::VALUE => $this->_trim($value),
-            self::SIGN => $x_negative
-        );
-    }
-
-    /**
-     * Subtracts two BigIntegers.
-     *
-     * Here's an example:
-     * <code>
-     * <?php
-     *    $a = new \phpseclib\Math\BigInteger('10');
-     *    $b = new \phpseclib\Math\BigInteger('20');
-     *
-     *    $c = $a->subtract($b);
-     *
-     *    echo $c->toString(); // outputs -10
-     * ?>
-     * </code>
-     *
-     * @param \phpseclib\Math\BigInteger $y
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     * @internal Performs base-2**52 subtraction
-     */
-    function subtract($y)
-    {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                $temp = new static();
-                $temp->value = gmp_sub($this->value, $y->value);
-
-                return $this->_normalize($temp);
-            case self::MODE_BCMATH:
-                $temp = new static();
-                $temp->value = bcsub($this->value, $y->value, 0);
-
-                return $this->_normalize($temp);
-        }
-
-        $temp = $this->_subtract($this->value, $this->is_negative, $y->value, $y->is_negative);
-
-        $result = new static();
-        $result->value = $temp[self::VALUE];
-        $result->is_negative = $temp[self::SIGN];
-
-        return $this->_normalize($result);
-    }
-
-    /**
-     * Performs subtraction.
-     *
-     * @param array $x_value
-     * @param bool $x_negative
-     * @param array $y_value
-     * @param bool $y_negative
-     * @return array
-     * @access private
-     */
-    function _subtract($x_value, $x_negative, $y_value, $y_negative)
-    {
-        $x_size = count($x_value);
-        $y_size = count($y_value);
-
-        if ($x_size == 0) {
-            return array(
-                self::VALUE => $y_value,
-                self::SIGN => !$y_negative
-            );
-        } elseif ($y_size == 0) {
-            return array(
-                self::VALUE => $x_value,
-                self::SIGN => $x_negative
-            );
-        }
-
-        // add, if appropriate (ie. -$x - +$y or +$x - -$y)
-        if ($x_negative != $y_negative) {
-            $temp = $this->_add($x_value, false, $y_value, false);
-            $temp[self::SIGN] = $x_negative;
-
-            return $temp;
-        }
-
-        $diff = $this->_compare($x_value, $x_negative, $y_value, $y_negative);
-
-        if (!$diff) {
-            return array(
-                self::VALUE => array(),
-                self::SIGN => false
-            );
-        }
-
-        // switch $x and $y around, if appropriate.
-        if ((!$x_negative && $diff < 0) || ($x_negative && $diff > 0)) {
-            $temp = $x_value;
-            $x_value = $y_value;
-            $y_value = $temp;
-
-            $x_negative = !$x_negative;
-
-            $x_size = count($x_value);
-            $y_size = count($y_value);
-        }
-
-        // at this point, $x_value should be at least as big as - if not bigger than - $y_value
-
-        $carry = 0;
-        for ($i = 0, $j = 1; $j < $y_size; $i+=2, $j+=2) {
-            $sum = $x_value[$j] * self::$baseFull + $x_value[$i] - $y_value[$j] * self::$baseFull - $y_value[$i] - $carry;
-            $carry = $sum < 0; // eg. floor($sum / 2**52); only possible values (in any base) are 0 and 1
-            $sum = $carry ? $sum + self::$maxDigit2 : $sum;
-
-            $temp = self::$base === 26 ? intval($sum / 0x4000000) : ($sum >> 31);
-
-            $x_value[$i] = (int) ($sum - self::$baseFull * $temp);
-            $x_value[$j] = $temp;
-        }
-
-        if ($j == $y_size) { // ie. if $y_size is odd
-            $sum = $x_value[$i] - $y_value[$i] - $carry;
-            $carry = $sum < 0;
-            $x_value[$i] = $carry ? $sum + self::$baseFull : $sum;
-            ++$i;
-        }
-
-        if ($carry) {
-            for (; !$x_value[$i]; ++$i) {
-                $x_value[$i] = self::$maxDigit;
-            }
-            --$x_value[$i];
-        }
-
-        return array(
-            self::VALUE => $this->_trim($x_value),
-            self::SIGN => $x_negative
-        );
-    }
-
-    /**
-     * Multiplies two BigIntegers
-     *
-     * Here's an example:
-     * <code>
-     * <?php
-     *    $a = new \phpseclib\Math\BigInteger('10');
-     *    $b = new \phpseclib\Math\BigInteger('20');
-     *
-     *    $c = $a->multiply($b);
-     *
-     *    echo $c->toString(); // outputs 200
-     * ?>
-     * </code>
-     *
-     * @param \phpseclib\Math\BigInteger $x
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     */
-    function multiply($x)
-    {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                $temp = new static();
-                $temp->value = gmp_mul($this->value, $x->value);
-
-                return $this->_normalize($temp);
-            case self::MODE_BCMATH:
-                $temp = new static();
-                $temp->value = bcmul($this->value, $x->value, 0);
-
-                return $this->_normalize($temp);
-        }
-
-        $temp = $this->_multiply($this->value, $this->is_negative, $x->value, $x->is_negative);
-
-        $product = new static();
-        $product->value = $temp[self::VALUE];
-        $product->is_negative = $temp[self::SIGN];
-
-        return $this->_normalize($product);
-    }
-
-    /**
-     * Performs multiplication.
-     *
-     * @param array $x_value
-     * @param bool $x_negative
-     * @param array $y_value
-     * @param bool $y_negative
-     * @return array
-     * @access private
-     */
-    function _multiply($x_value, $x_negative, $y_value, $y_negative)
-    {
-        //if ( $x_value == $y_value ) {
-        //    return array(
-        //        self::VALUE => $this->_square($x_value),
-        //        self::SIGN => $x_sign != $y_value
-        //    );
-        //}
-
-        $x_length = count($x_value);
-        $y_length = count($y_value);
-
-        if (!$x_length || !$y_length) { // a 0 is being multiplied
-            return array(
-                self::VALUE => array(),
-                self::SIGN => false
-            );
-        }
-
-        return array(
-            self::VALUE => min($x_length, $y_length) < 2 * self::KARATSUBA_CUTOFF ?
-                $this->_trim($this->_regularMultiply($x_value, $y_value)) :
-                $this->_trim($this->_karatsuba($x_value, $y_value)),
-            self::SIGN => $x_negative != $y_negative
-        );
-    }
-
-    /**
-     * Performs long multiplication on two BigIntegers
-     *
-     * Modeled after 'multiply' in MutableBigInteger.java.
-     *
-     * @param array $x_value
-     * @param array $y_value
-     * @return array
-     * @access private
-     */
-    function _regularMultiply($x_value, $y_value)
-    {
-        $x_length = count($x_value);
-        $y_length = count($y_value);
-
-        if (!$x_length || !$y_length) { // a 0 is being multiplied
-            return array();
-        }
-
-        if ($x_length < $y_length) {
-            $temp = $x_value;
-            $x_value = $y_value;
-            $y_value = $temp;
-
-            $x_length = count($x_value);
-            $y_length = count($y_value);
-        }
-
-        $product_value = $this->_array_repeat(0, $x_length + $y_length);
-
-        // the following for loop could be removed if the for loop following it
-        // (the one with nested for loops) initially set $i to 0, but
-        // doing so would also make the result in one set of unnecessary adds,
-        // since on the outermost loops first pass, $product->value[$k] is going
-        // to always be 0
-
-        $carry = 0;
-
-        for ($j = 0; $j < $x_length; ++$j) { // ie. $i = 0
-            $temp = $x_value[$j] * $y_value[0] + $carry; // $product_value[$k] == 0
-            $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
-            $product_value[$j] = (int) ($temp - self::$baseFull * $carry);
-        }
-
-        $product_value[$j] = $carry;
-
-        // the above for loop is what the previous comment was talking about.  the
-        // following for loop is the "one with nested for loops"
-        for ($i = 1; $i < $y_length; ++$i) {
-            $carry = 0;
-
-            for ($j = 0, $k = $i; $j < $x_length; ++$j, ++$k) {
-                $temp = $product_value[$k] + $x_value[$j] * $y_value[$i] + $carry;
-                $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
-                $product_value[$k] = (int) ($temp - self::$baseFull * $carry);
-            }
-
-            $product_value[$k] = $carry;
-        }
-
-        return $product_value;
-    }
-
-    /**
-     * Performs Karatsuba multiplication on two BigIntegers
-     *
-     * See {@link http://en.wikipedia.org/wiki/Karatsuba_algorithm Karatsuba algorithm} and
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=120 MPM 5.2.3}.
-     *
-     * @param array $x_value
-     * @param array $y_value
-     * @return array
-     * @access private
-     */
-    function _karatsuba($x_value, $y_value)
-    {
-        $m = min(count($x_value) >> 1, count($y_value) >> 1);
-
-        if ($m < self::KARATSUBA_CUTOFF) {
-            return $this->_regularMultiply($x_value, $y_value);
-        }
-
-        $x1 = array_slice($x_value, $m);
-        $x0 = array_slice($x_value, 0, $m);
-        $y1 = array_slice($y_value, $m);
-        $y0 = array_slice($y_value, 0, $m);
-
-        $z2 = $this->_karatsuba($x1, $y1);
-        $z0 = $this->_karatsuba($x0, $y0);
-
-        $z1 = $this->_add($x1, false, $x0, false);
-        $temp = $this->_add($y1, false, $y0, false);
-        $z1 = $this->_karatsuba($z1[self::VALUE], $temp[self::VALUE]);
-        $temp = $this->_add($z2, false, $z0, false);
-        $z1 = $this->_subtract($z1, false, $temp[self::VALUE], false);
-
-        $z2 = array_merge(array_fill(0, 2 * $m, 0), $z2);
-        $z1[self::VALUE] = array_merge(array_fill(0, $m, 0), $z1[self::VALUE]);
-
-        $xy = $this->_add($z2, false, $z1[self::VALUE], $z1[self::SIGN]);
-        $xy = $this->_add($xy[self::VALUE], $xy[self::SIGN], $z0, false);
-
-        return $xy[self::VALUE];
-    }
-
-    /**
-     * Performs squaring
-     *
-     * @param array $x
-     * @return array
-     * @access private
-     */
-    function _square($x = false)
-    {
-        return count($x) < 2 * self::KARATSUBA_CUTOFF ?
-            $this->_trim($this->_baseSquare($x)) :
-            $this->_trim($this->_karatsubaSquare($x));
-    }
-
-    /**
-     * Performs traditional squaring on two BigIntegers
-     *
-     * Squaring can be done faster than multiplying a number by itself can be.  See
-     * {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=7 HAC 14.2.4} /
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=141 MPM 5.3} for more information.
-     *
-     * @param array $value
-     * @return array
-     * @access private
-     */
-    function _baseSquare($value)
-    {
-        if (empty($value)) {
-            return array();
-        }
-        $square_value = $this->_array_repeat(0, 2 * count($value));
-
-        for ($i = 0, $max_index = count($value) - 1; $i <= $max_index; ++$i) {
-            $i2 = $i << 1;
-
-            $temp = $square_value[$i2] + $value[$i] * $value[$i];
-            $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
-            $square_value[$i2] = (int) ($temp - self::$baseFull * $carry);
-
-            // note how we start from $i+1 instead of 0 as we do in multiplication.
-            for ($j = $i + 1, $k = $i2 + 1; $j <= $max_index; ++$j, ++$k) {
-                $temp = $square_value[$k] + 2 * $value[$j] * $value[$i] + $carry;
-                $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
-                $square_value[$k] = (int) ($temp - self::$baseFull * $carry);
-            }
-
-            // the following line can yield values larger 2**15.  at this point, PHP should switch
-            // over to floats.
-            $square_value[$i + $max_index + 1] = $carry;
-        }
-
-        return $square_value;
-    }
-
-    /**
-     * Performs Karatsuba "squaring" on two BigIntegers
-     *
-     * See {@link http://en.wikipedia.org/wiki/Karatsuba_algorithm Karatsuba algorithm} and
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=151 MPM 5.3.4}.
-     *
-     * @param array $value
-     * @return array
-     * @access private
-     */
-    function _karatsubaSquare($value)
-    {
-        $m = count($value) >> 1;
-
-        if ($m < self::KARATSUBA_CUTOFF) {
-            return $this->_baseSquare($value);
-        }
-
-        $x1 = array_slice($value, $m);
-        $x0 = array_slice($value, 0, $m);
-
-        $z2 = $this->_karatsubaSquare($x1);
-        $z0 = $this->_karatsubaSquare($x0);
-
-        $z1 = $this->_add($x1, false, $x0, false);
-        $z1 = $this->_karatsubaSquare($z1[self::VALUE]);
-        $temp = $this->_add($z2, false, $z0, false);
-        $z1 = $this->_subtract($z1, false, $temp[self::VALUE], false);
-
-        $z2 = array_merge(array_fill(0, 2 * $m, 0), $z2);
-        $z1[self::VALUE] = array_merge(array_fill(0, $m, 0), $z1[self::VALUE]);
-
-        $xx = $this->_add($z2, false, $z1[self::VALUE], $z1[self::SIGN]);
-        $xx = $this->_add($xx[self::VALUE], $xx[self::SIGN], $z0, false);
-
-        return $xx[self::VALUE];
-    }
-
-    /**
-     * Divides two BigIntegers.
-     *
-     * Returns an array whose first element contains the quotient and whose second element contains the
-     * "common residue".  If the remainder would be positive, the "common residue" and the remainder are the
-     * same.  If the remainder would be negative, the "common residue" is equal to the sum of the remainder
-     * and the divisor (basically, the "common residue" is the first positive modulo).
-     *
-     * Here's an example:
-     * <code>
-     * <?php
-     *    $a = new \phpseclib\Math\BigInteger('10');
-     *    $b = new \phpseclib\Math\BigInteger('20');
-     *
-     *    list($quotient, $remainder) = $a->divide($b);
-     *
-     *    echo $quotient->toString(); // outputs 0
-     *    echo "\r\n";
-     *    echo $remainder->toString(); // outputs 10
-     * ?>
-     * </code>
-     *
-     * @param \phpseclib\Math\BigInteger $y
-     * @return array
-     * @access public
-     * @internal This function is based off of {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=9 HAC 14.20}.
-     */
-    function divide($y)
-    {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                $quotient = new static();
-                $remainder = new static();
-
-                list($quotient->value, $remainder->value) = gmp_div_qr($this->value, $y->value);
-
-                if (gmp_sign($remainder->value) < 0) {
-                    $remainder->value = gmp_add($remainder->value, gmp_abs($y->value));
-                }
-
-                return array($this->_normalize($quotient), $this->_normalize($remainder));
-            case self::MODE_BCMATH:
-                $quotient = new static();
-                $remainder = new static();
-
-                $quotient->value = bcdiv($this->value, $y->value, 0);
-                $remainder->value = bcmod($this->value, $y->value);
-
-                if ($remainder->value[0] == '-') {
-                    $remainder->value = bcadd($remainder->value, $y->value[0] == '-' ? substr($y->value, 1) : $y->value, 0);
-                }
-
-                return array($this->_normalize($quotient), $this->_normalize($remainder));
-        }
-
-        if (count($y->value) == 1) {
-            list($q, $r) = $this->_divide_digit($this->value, $y->value[0]);
-            $quotient = new static();
-            $remainder = new static();
-            $quotient->value = $q;
-            $remainder->value = array($r);
-            $quotient->is_negative = $this->is_negative != $y->is_negative;
-            return array($this->_normalize($quotient), $this->_normalize($remainder));
-        }
-
-        static $zero;
-        if (!isset($zero)) {
-            $zero = new static();
-        }
-
-        $x = $this->copy();
-        $y = $y->copy();
-
-        $x_sign = $x->is_negative;
-        $y_sign = $y->is_negative;
-
-        $x->is_negative = $y->is_negative = false;
-
-        $diff = $x->compare($y);
-
-        if (!$diff) {
-            $temp = new static();
-            $temp->value = array(1);
-            $temp->is_negative = $x_sign != $y_sign;
-            return array($this->_normalize($temp), $this->_normalize(new static()));
-        }
-
-        if ($diff < 0) {
-            // if $x is negative, "add" $y.
-            if ($x_sign) {
-                $x = $y->subtract($x);
-            }
-            return array($this->_normalize(new static()), $this->_normalize($x));
-        }
-
-        // normalize $x and $y as described in HAC 14.23 / 14.24
-        $msb = $y->value[count($y->value) - 1];
-        for ($shift = 0; !($msb & self::$msb); ++$shift) {
-            $msb <<= 1;
-        }
-        $x->_lshift($shift);
-        $y->_lshift($shift);
-        $y_value = &$y->value;
-
-        $x_max = count($x->value) - 1;
-        $y_max = count($y->value) - 1;
-
-        $quotient = new static();
-        $quotient_value = &$quotient->value;
-        $quotient_value = $this->_array_repeat(0, $x_max - $y_max + 1);
-
-        static $temp, $lhs, $rhs;
-        if (!isset($temp)) {
-            $temp = new static();
-            $lhs =  new static();
-            $rhs =  new static();
-        }
-        $temp_value = &$temp->value;
-        $rhs_value =  &$rhs->value;
-
-        // $temp = $y << ($x_max - $y_max-1) in base 2**26
-        $temp_value = array_merge($this->_array_repeat(0, $x_max - $y_max), $y_value);
-
-        while ($x->compare($temp) >= 0) {
-            // calculate the "common residue"
-            ++$quotient_value[$x_max - $y_max];
-            $x = $x->subtract($temp);
-            $x_max = count($x->value) - 1;
-        }
-
-        for ($i = $x_max; $i >= $y_max + 1; --$i) {
-            $x_value = &$x->value;
-            $x_window = array(
-                isset($x_value[$i]) ? $x_value[$i] : 0,
-                isset($x_value[$i - 1]) ? $x_value[$i - 1] : 0,
-                isset($x_value[$i - 2]) ? $x_value[$i - 2] : 0
-            );
-            $y_window = array(
-                $y_value[$y_max],
-                ($y_max > 0) ? $y_value[$y_max - 1] : 0
-            );
-
-            $q_index = $i - $y_max - 1;
-            if ($x_window[0] == $y_window[0]) {
-                $quotient_value[$q_index] = self::$maxDigit;
-            } else {
-                $quotient_value[$q_index] = $this->_safe_divide(
-                    $x_window[0] * self::$baseFull + $x_window[1],
-                    $y_window[0]
-                );
-            }
-
-            $temp_value = array($y_window[1], $y_window[0]);
-
-            $lhs->value = array($quotient_value[$q_index]);
-            $lhs = $lhs->multiply($temp);
-
-            $rhs_value = array($x_window[2], $x_window[1], $x_window[0]);
-
-            while ($lhs->compare($rhs) > 0) {
-                --$quotient_value[$q_index];
-
-                $lhs->value = array($quotient_value[$q_index]);
-                $lhs = $lhs->multiply($temp);
-            }
-
-            $adjust = $this->_array_repeat(0, $q_index);
-            $temp_value = array($quotient_value[$q_index]);
-            $temp = $temp->multiply($y);
-            $temp_value = &$temp->value;
-            $temp_value = array_merge($adjust, $temp_value);
-
-            $x = $x->subtract($temp);
-
-            if ($x->compare($zero) < 0) {
-                $temp_value = array_merge($adjust, $y_value);
-                $x = $x->add($temp);
-
-                --$quotient_value[$q_index];
-            }
-
-            $x_max = count($x_value) - 1;
-        }
-
-        // unnormalize the remainder
-        $x->_rshift($shift);
-
-        $quotient->is_negative = $x_sign != $y_sign;
-
-        // calculate the "common residue", if appropriate
-        if ($x_sign) {
-            $y->_rshift($shift);
-            $x = $y->subtract($x);
-        }
-
-        return array($this->_normalize($quotient), $this->_normalize($x));
-    }
-
-    /**
-     * Divides a BigInteger by a regular integer
-     *
-     * abc / x = a00 / x + b0 / x + c / x
-     *
-     * @param array $dividend
-     * @param array $divisor
-     * @return array
-     * @access private
-     */
-    function _divide_digit($dividend, $divisor)
-    {
-        $carry = 0;
-        $result = array();
-
-        for ($i = count($dividend) - 1; $i >= 0; --$i) {
-            $temp = self::$baseFull * $carry + $dividend[$i];
-            $result[$i] = $this->_safe_divide($temp, $divisor);
-            $carry = (int) ($temp - $divisor * $result[$i]);
-        }
-
-        return array($result, $carry);
-    }
-
-    /**
-     * Performs modular exponentiation.
-     *
-     * Here's an example:
-     * <code>
-     * <?php
-     *    $a = new \phpseclib\Math\BigInteger('10');
-     *    $b = new \phpseclib\Math\BigInteger('20');
-     *    $c = new \phpseclib\Math\BigInteger('30');
-     *
-     *    $c = $a->modPow($b, $c);
-     *
-     *    echo $c->toString(); // outputs 10
-     * ?>
-     * </code>
-     *
-     * @param \phpseclib\Math\BigInteger $e
-     * @param \phpseclib\Math\BigInteger $n
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     * @internal The most naive approach to modular exponentiation has very unreasonable requirements, and
-     *    and although the approach involving repeated squaring does vastly better, it, too, is impractical
-     *    for our purposes.  The reason being that division - by far the most complicated and time-consuming
-     *    of the basic operations (eg. +,-,*,/) - occurs multiple times within it.
-     *
-     *    Modular reductions resolve this issue.  Although an individual modular reduction takes more time
-     *    then an individual division, when performed in succession (with the same modulo), they're a lot faster.
-     *
-     *    The two most commonly used modular reductions are Barrett and Montgomery reduction.  Montgomery reduction,
-     *    although faster, only works when the gcd of the modulo and of the base being used is 1.  In RSA, when the
-     *    base is a power of two, the modulo - a product of two primes - is always going to have a gcd of 1 (because
-     *    the product of two odd numbers is odd), but what about when RSA isn't used?
-     *
-     *    In contrast, Barrett reduction has no such constraint.  As such, some bigint implementations perform a
-     *    Barrett reduction after every operation in the modpow function.  Others perform Barrett reductions when the
-     *    modulo is even and Montgomery reductions when the modulo is odd.  BigInteger.java's modPow method, however,
-     *    uses a trick involving the Chinese Remainder Theorem to factor the even modulo into two numbers - one odd and
-     *    the other, a power of two - and recombine them, later.  This is the method that this modPow function uses.
-     *    {@link http://islab.oregonstate.edu/papers/j34monex.pdf Montgomery Reduction with Even Modulus} elaborates.
-     */
-    function modPow($e, $n)
-    {
-        $n = $this->bitmask !== false && $this->bitmask->compare($n) < 0 ? $this->bitmask : $n->abs();
-
-        if ($e->compare(new static()) < 0) {
-            $e = $e->abs();
-
-            $temp = $this->modInverse($n);
-            if ($temp === false) {
-                return false;
-            }
-
-            return $this->_normalize($temp->modPow($e, $n));
-        }
-
-        if (MATH_BIGINTEGER_MODE == self::MODE_GMP) {
-            $temp = new static();
-            $temp->value = gmp_powm($this->value, $e->value, $n->value);
-
-            return $this->_normalize($temp);
-        }
-
-        if ($this->compare(new static()) < 0 || $this->compare($n) > 0) {
-            list(, $temp) = $this->divide($n);
-            return $temp->modPow($e, $n);
-        }
-
-        if (defined('MATH_BIGINTEGER_OPENSSL_ENABLED')) {
-            $components = array(
-                'modulus' => $n->toBytes(true),
-                'publicExponent' => $e->toBytes(true)
-            );
-
-            $components = array(
-                'modulus' => pack('Ca*a*', 2, $this->_encodeASN1Length(strlen($components['modulus'])), $components['modulus']),
-                'publicExponent' => pack('Ca*a*', 2, $this->_encodeASN1Length(strlen($components['publicExponent'])), $components['publicExponent'])
-            );
-
-            $RSAPublicKey = pack(
-                'Ca*a*a*',
-                48,
-                $this->_encodeASN1Length(strlen($components['modulus']) + strlen($components['publicExponent'])),
-                $components['modulus'],
-                $components['publicExponent']
-            );
-
-            $rsaOID = pack('H*', '300d06092a864886f70d0101010500'); // hex version of MA0GCSqGSIb3DQEBAQUA
-            $RSAPublicKey = chr(0) . $RSAPublicKey;
-            $RSAPublicKey = chr(3) . $this->_encodeASN1Length(strlen($RSAPublicKey)) . $RSAPublicKey;
-
-            $encapsulated = pack(
-                'Ca*a*',
-                48,
-                $this->_encodeASN1Length(strlen($rsaOID . $RSAPublicKey)),
-                $rsaOID . $RSAPublicKey
-            );
-
-            $RSAPublicKey = "-----BEGIN PUBLIC KEY-----\r\n" .
-                             chunk_split(base64_encode($encapsulated)) .
-                             '-----END PUBLIC KEY-----';
-
-            $plaintext = str_pad($this->toBytes(), strlen($n->toBytes(true)) - 1, "\0", STR_PAD_LEFT);
-
-            if (openssl_public_encrypt($plaintext, $result, $RSAPublicKey, OPENSSL_NO_PADDING)) {
-                return new static($result, 256);
-            }
-        }
-
-        if (MATH_BIGINTEGER_MODE == self::MODE_BCMATH) {
-            $temp = new static();
-            $temp->value = bcpowmod($this->value, $e->value, $n->value, 0);
-
-            return $this->_normalize($temp);
-        }
-
-        if (empty($e->value)) {
-            $temp = new static();
-            $temp->value = array(1);
-            return $this->_normalize($temp);
-        }
-
-        if ($e->value == array(1)) {
-            list(, $temp) = $this->divide($n);
-            return $this->_normalize($temp);
-        }
-
-        if ($e->value == array(2)) {
-            $temp = new static();
-            $temp->value = $this->_square($this->value);
-            list(, $temp) = $temp->divide($n);
-            return $this->_normalize($temp);
-        }
-
-        return $this->_normalize($this->_slidingWindow($e, $n, self::BARRETT));
-
-        // the following code, although not callable, can be run independently of the above code
-        // although the above code performed better in my benchmarks the following could might
-        // perform better under different circumstances. in lieu of deleting it it's just been
-        // made uncallable
-
-        // is the modulo odd?
-        if ($n->value[0] & 1) {
-            return $this->_normalize($this->_slidingWindow($e, $n, self::MONTGOMERY));
-        }
-        // if it's not, it's even
-
-        // find the lowest set bit (eg. the max pow of 2 that divides $n)
-        for ($i = 0; $i < count($n->value); ++$i) {
-            if ($n->value[$i]) {
-                $temp = decbin($n->value[$i]);
-                $j = strlen($temp) - strrpos($temp, '1') - 1;
-                $j+= 26 * $i;
-                break;
-            }
-        }
-        // at this point, 2^$j * $n/(2^$j) == $n
-
-        $mod1 = $n->copy();
-        $mod1->_rshift($j);
-        $mod2 = new static();
-        $mod2->value = array(1);
-        $mod2->_lshift($j);
-
-        $part1 = ($mod1->value != array(1)) ? $this->_slidingWindow($e, $mod1, self::MONTGOMERY) : new static();
-        $part2 = $this->_slidingWindow($e, $mod2, self::POWEROF2);
-
-        $y1 = $mod2->modInverse($mod1);
-        $y2 = $mod1->modInverse($mod2);
-
-        $result = $part1->multiply($mod2);
-        $result = $result->multiply($y1);
-
-        $temp = $part2->multiply($mod1);
-        $temp = $temp->multiply($y2);
-
-        $result = $result->add($temp);
-        list(, $result) = $result->divide($n);
-
-        return $this->_normalize($result);
-    }
-
-    /**
-     * Performs modular exponentiation.
-     *
-     * Alias for modPow().
-     *
-     * @param \phpseclib\Math\BigInteger $e
-     * @param \phpseclib\Math\BigInteger $n
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     */
-    function powMod($e, $n)
-    {
-        return $this->modPow($e, $n);
-    }
-
-    /**
-     * Sliding Window k-ary Modular Exponentiation
-     *
-     * Based on {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=27 HAC 14.85} /
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=210 MPM 7.7}.  In a departure from those algorithims,
-     * however, this function performs a modular reduction after every multiplication and squaring operation.
-     * As such, this function has the same preconditions that the reductions being used do.
-     *
-     * @param \phpseclib\Math\BigInteger $e
-     * @param \phpseclib\Math\BigInteger $n
-     * @param int $mode
-     * @return \phpseclib\Math\BigInteger
-     * @access private
-     */
-    function _slidingWindow($e, $n, $mode)
-    {
-        static $window_ranges = array(7, 25, 81, 241, 673, 1793); // from BigInteger.java's oddModPow function
-        //static $window_ranges = array(0, 7, 36, 140, 450, 1303, 3529); // from MPM 7.3.1
-
-        $e_value = $e->value;
-        $e_length = count($e_value) - 1;
-        $e_bits = decbin($e_value[$e_length]);
-        for ($i = $e_length - 1; $i >= 0; --$i) {
-            $e_bits.= str_pad(decbin($e_value[$i]), self::$base, '0', STR_PAD_LEFT);
-        }
-
-        $e_length = strlen($e_bits);
-
-        // calculate the appropriate window size.
-        // $window_size == 3 if $window_ranges is between 25 and 81, for example.
-        for ($i = 0, $window_size = 1; $e_length > $window_ranges[$i] && $i < count($window_ranges); ++$window_size, ++$i) {
-        }
-
-        $n_value = $n->value;
-
-        // precompute $this^0 through $this^$window_size
-        $powers = array();
-        $powers[1] = $this->_prepareReduce($this->value, $n_value, $mode);
-        $powers[2] = $this->_squareReduce($powers[1], $n_value, $mode);
-
-        // we do every other number since substr($e_bits, $i, $j+1) (see below) is supposed to end
-        // in a 1.  ie. it's supposed to be odd.
-        $temp = 1 << ($window_size - 1);
-        for ($i = 1; $i < $temp; ++$i) {
-            $i2 = $i << 1;
-            $powers[$i2 + 1] = $this->_multiplyReduce($powers[$i2 - 1], $powers[2], $n_value, $mode);
-        }
-
-        $result = array(1);
-        $result = $this->_prepareReduce($result, $n_value, $mode);
-
-        for ($i = 0; $i < $e_length;) {
-            if (!$e_bits[$i]) {
-                $result = $this->_squareReduce($result, $n_value, $mode);
-                ++$i;
-            } else {
-                for ($j = $window_size - 1; $j > 0; --$j) {
-                    if (!empty($e_bits[$i + $j])) {
-                        break;
-                    }
-                }
-
-                // eg. the length of substr($e_bits, $i, $j + 1)
-                for ($k = 0; $k <= $j; ++$k) {
-                    $result = $this->_squareReduce($result, $n_value, $mode);
-                }
-
-                $result = $this->_multiplyReduce($result, $powers[bindec(substr($e_bits, $i, $j + 1))], $n_value, $mode);
-
-                $i += $j + 1;
-            }
-        }
-
-        $temp = new static();
-        $temp->value = $this->_reduce($result, $n_value, $mode);
-
-        return $temp;
-    }
-
-    /**
-     * Modular reduction
-     *
-     * For most $modes this will return the remainder.
-     *
-     * @see self::_slidingWindow()
-     * @access private
-     * @param array $x
-     * @param array $n
-     * @param int $mode
-     * @return array
-     */
-    function _reduce($x, $n, $mode)
-    {
-        switch ($mode) {
-            case self::MONTGOMERY:
-                return $this->_montgomery($x, $n);
-            case self::BARRETT:
-                return $this->_barrett($x, $n);
-            case self::POWEROF2:
-                $lhs = new static();
-                $lhs->value = $x;
-                $rhs = new static();
-                $rhs->value = $n;
-                return $x->_mod2($n);
-            case self::CLASSIC:
-                $lhs = new static();
-                $lhs->value = $x;
-                $rhs = new static();
-                $rhs->value = $n;
-                list(, $temp) = $lhs->divide($rhs);
-                return $temp->value;
-            case self::NONE:
-                return $x;
-            default:
-                // an invalid $mode was provided
-        }
-    }
-
-    /**
-     * Modular reduction preperation
-     *
-     * @see self::_slidingWindow()
-     * @access private
-     * @param array $x
-     * @param array $n
-     * @param int $mode
-     * @return array
-     */
-    function _prepareReduce($x, $n, $mode)
-    {
-        if ($mode == self::MONTGOMERY) {
-            return $this->_prepMontgomery($x, $n);
-        }
-        return $this->_reduce($x, $n, $mode);
-    }
-
-    /**
-     * Modular multiply
-     *
-     * @see self::_slidingWindow()
-     * @access private
-     * @param array $x
-     * @param array $y
-     * @param array $n
-     * @param int $mode
-     * @return array
-     */
-    function _multiplyReduce($x, $y, $n, $mode)
-    {
-        if ($mode == self::MONTGOMERY) {
-            return $this->_montgomeryMultiply($x, $y, $n);
-        }
-        $temp = $this->_multiply($x, false, $y, false);
-        return $this->_reduce($temp[self::VALUE], $n, $mode);
-    }
-
-    /**
-     * Modular square
-     *
-     * @see self::_slidingWindow()
-     * @access private
-     * @param array $x
-     * @param array $n
-     * @param int $mode
-     * @return array
-     */
-    function _squareReduce($x, $n, $mode)
-    {
-        if ($mode == self::MONTGOMERY) {
-            return $this->_montgomeryMultiply($x, $x, $n);
-        }
-        return $this->_reduce($this->_square($x), $n, $mode);
-    }
-
-    /**
-     * Modulos for Powers of Two
-     *
-     * Calculates $x%$n, where $n = 2**$e, for some $e.  Since this is basically the same as doing $x & ($n-1),
-     * we'll just use this function as a wrapper for doing that.
-     *
-     * @see self::_slidingWindow()
-     * @access private
-     * @param \phpseclib\Math\BigInteger
-     * @return \phpseclib\Math\BigInteger
-     */
-    function _mod2($n)
-    {
-        $temp = new static();
-        $temp->value = array(1);
-        return $this->bitwise_and($n->subtract($temp));
-    }
-
-    /**
-     * Barrett Modular Reduction
-     *
-     * See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=14 HAC 14.3.3} /
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=165 MPM 6.2.5} for more information.  Modified slightly,
-     * so as not to require negative numbers (initially, this script didn't support negative numbers).
-     *
-     * Employs "folding", as described at
-     * {@link http://www.cosic.esat.kuleuven.be/publications/thesis-149.pdf#page=66 thesis-149.pdf#page=66}.  To quote from
-     * it, "the idea [behind folding] is to find a value x' such that x (mod m) = x' (mod m), with x' being smaller than x."
+     * Sets engine type.
      *
-     * Unfortunately, the "Barrett Reduction with Folding" algorithm described in thesis-149.pdf is not, as written, all that
-     * usable on account of (1) its not using reasonable radix points as discussed in
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=162 MPM 6.2.2} and (2) the fact that, even with reasonable
-     * radix points, it only works when there are an even number of digits in the denominator.  The reason for (2) is that
-     * (x >> 1) + (x >> 1) != x / 2 + x / 2.  If x is even, they're the same, but if x is odd, they're not.  See the in-line
-     * comments for details.
+     * Throws an exception if the type is invalid
      *
-     * @see self::_slidingWindow()
-     * @access private
-     * @param array $n
-     * @param array $m
-     * @return array
+     * @param list<string> $modexps optional
      */
-    function _barrett($n, $m)
+    public static function setEngine(string $main, array $modexps = ['DefaultEngine']): void
     {
-        static $cache = array(
-            self::VARIABLE => array(),
-            self::DATA => array()
-        );
-
-        $m_length = count($m);
-
-        // if ($this->_compare($n, $this->_square($m)) >= 0) {
-        if (count($n) > 2 * $m_length) {
-            $lhs = new static();
-            $rhs = new static();
-            $lhs->value = $n;
-            $rhs->value = $m;
-            list(, $temp) = $lhs->divide($rhs);
-            return $temp->value;
-        }
+        self::$engines = [];
 
-        // if (m.length >> 1) + 2 <= m.length then m is too small and n can't be reduced
-        if ($m_length < 5) {
-            return $this->_regularBarrett($n, $m);
+        $fqmain = 'phpseclib3\\Math\\BigInteger\\Engines\\' . $main;
+        if (!class_exists($fqmain) || !method_exists($fqmain, 'isValidEngine')) {
+            throw new InvalidArgumentException("$main is not a valid engine");
         }
-
-        // n = 2 * m.length
-
-        if (($key = array_search($m, $cache[self::VARIABLE])) === false) {
-            $key = count($cache[self::VARIABLE]);
-            $cache[self::VARIABLE][] = $m;
-
-            $lhs = new static();
-            $lhs_value = &$lhs->value;
-            $lhs_value = $this->_array_repeat(0, $m_length + ($m_length >> 1));
-            $lhs_value[] = 1;
-            $rhs = new static();
-            $rhs->value = $m;
-
-            list($u, $m1) = $lhs->divide($rhs);
-            $u = $u->value;
-            $m1 = $m1->value;
-
-            $cache[self::DATA][] = array(
-                'u' => $u, // m.length >> 1 (technically (m.length >> 1) + 1)
-                'm1'=> $m1 // m.length
-            );
-        } else {
-            extract($cache[self::DATA][$key]);
+        if (!$fqmain::isValidEngine()) {
+            throw new BadConfigurationException("$main is not setup correctly on this system");
         }
+        /** @var class-string<Engine> $fqmain */
+        self::$mainEngine = $fqmain;
 
-        $cutoff = $m_length + ($m_length >> 1);
-        $lsd = array_slice($n, 0, $cutoff); // m.length + (m.length >> 1)
-        $msd = array_slice($n, $cutoff);    // m.length >> 1
-        $lsd = $this->_trim($lsd);
-        $temp = $this->_multiply($msd, false, $m1, false);
-        $n = $this->_add($lsd, false, $temp[self::VALUE], false); // m.length + (m.length >> 1) + 1
-
-        if ($m_length & 1) {
-            return $this->_regularBarrett($n[self::VALUE], $m);
+        $found = false;
+        foreach ($modexps as $modexp) {
+            try {
+                $fqmain::setModExpEngine($modexp);
+                $found = true;
+                break;
+            } catch (\Exception $e) {
+            }
         }
 
-        // (m.length + (m.length >> 1) + 1) - (m.length - 1) == (m.length >> 1) + 2
-        $temp = array_slice($n[self::VALUE], $m_length - 1);
-        // if even: ((m.length >> 1) + 2) + (m.length >> 1) == m.length + 2
-        // if odd:  ((m.length >> 1) + 2) + (m.length >> 1) == (m.length - 1) + 2 == m.length + 1
-        $temp = $this->_multiply($temp, false, $u, false);
-        // if even: (m.length + 2) - ((m.length >> 1) + 1) = m.length - (m.length >> 1) + 1
-        // if odd:  (m.length + 1) - ((m.length >> 1) + 1) = m.length - (m.length >> 1)
-        $temp = array_slice($temp[self::VALUE], ($m_length >> 1) + 1);
-        // if even: (m.length - (m.length >> 1) + 1) + m.length = 2 * m.length - (m.length >> 1) + 1
-        // if odd:  (m.length - (m.length >> 1)) + m.length     = 2 * m.length - (m.length >> 1)
-        $temp = $this->_multiply($temp, false, $m, false);
-
-        // at this point, if m had an odd number of digits, we'd be subtracting a 2 * m.length - (m.length >> 1) digit
-        // number from a m.length + (m.length >> 1) + 1 digit number.  ie. there'd be an extra digit and the while loop
-        // following this comment would loop a lot (hence our calling _regularBarrett() in that situation).
-
-        $result = $this->_subtract($n[self::VALUE], false, $temp[self::VALUE], false);
-
-        while ($this->_compare($result[self::VALUE], $result[self::SIGN], $m, false) >= 0) {
-            $result = $this->_subtract($result[self::VALUE], $result[self::SIGN], $m, false);
+        if (!$found) {
+            throw new BadConfigurationException("No valid modular exponentiation engine found for $main");
         }
 
-        return $result[self::VALUE];
+        self::$engines = [$main, $modexp];
     }
 
     /**
-     * (Regular) Barrett Modular Reduction
-     *
-     * For numbers with more than four digits BigInteger::_barrett() is faster.  The difference between that and this
-     * is that this function does not fold the denominator into a smaller form.
+     * Returns the engine type
      *
-     * @see self::_slidingWindow()
-     * @access private
-     * @param array $x
-     * @param array $n
-     * @return array
+     * @return string[]
      */
-    function _regularBarrett($x, $n)
+    public static function getEngine(): array
     {
-        static $cache = array(
-            self::VARIABLE => array(),
-            self::DATA => array()
-        );
-
-        $n_length = count($n);
-
-        if (count($x) > 2 * $n_length) {
-            $lhs = new static();
-            $rhs = new static();
-            $lhs->value = $x;
-            $rhs->value = $n;
-            list(, $temp) = $lhs->divide($rhs);
-            return $temp->value;
-        }
-
-        if (($key = array_search($n, $cache[self::VARIABLE])) === false) {
-            $key = count($cache[self::VARIABLE]);
-            $cache[self::VARIABLE][] = $n;
-            $lhs = new static();
-            $lhs_value = &$lhs->value;
-            $lhs_value = $this->_array_repeat(0, 2 * $n_length);
-            $lhs_value[] = 1;
-            $rhs = new static();
-            $rhs->value = $n;
-            list($temp, ) = $lhs->divide($rhs); // m.length
-            $cache[self::DATA][] = $temp->value;
-        }
+        self::initialize_static_variables();
 
-        // 2 * m.length - (m.length - 1) = m.length + 1
-        $temp = array_slice($x, $n_length - 1);
-        // (m.length + 1) + m.length = 2 * m.length + 1
-        $temp = $this->_multiply($temp, false, $cache[self::DATA][$key], false);
-        // (2 * m.length + 1) - (m.length - 1) = m.length + 2
-        $temp = array_slice($temp[self::VALUE], $n_length + 1);
-
-        // m.length + 1
-        $result = array_slice($x, 0, $n_length + 1);
-        // m.length + 1
-        $temp = $this->_multiplyLower($temp, false, $n, false, $n_length + 1);
-        // $temp == array_slice($temp->_multiply($temp, false, $n, false)->value, 0, $n_length + 1)
-
-        if ($this->_compare($result, false, $temp[self::VALUE], $temp[self::SIGN]) < 0) {
-            $corrector_value = $this->_array_repeat(0, $n_length + 1);
-            $corrector_value[count($corrector_value)] = 1;
-            $result = $this->_add($result, false, $corrector_value, false);
-            $result = $result[self::VALUE];
-        }
-
-        // at this point, we're subtracting a number with m.length + 1 digits from another number with m.length + 1 digits
-        $result = $this->_subtract($result, false, $temp[self::VALUE], $temp[self::SIGN]);
-        while ($this->_compare($result[self::VALUE], $result[self::SIGN], $n, false) > 0) {
-            $result = $this->_subtract($result[self::VALUE], $result[self::SIGN], $n, false);
-        }
-
-        return $result[self::VALUE];
+        return self::$engines;
     }
 
     /**
-     * Performs long multiplication up to $stop digits
-     *
-     * If you're going to be doing array_slice($product->value, 0, $stop), some cycles can be saved.
-     *
-     * @see self::_regularBarrett()
-     * @param array $x_value
-     * @param bool $x_negative
-     * @param array $y_value
-     * @param bool $y_negative
-     * @param int $stop
-     * @return array
-     * @access private
+     * Initialize static variables
      */
-    function _multiplyLower($x_value, $x_negative, $y_value, $y_negative, $stop)
+    private static function initialize_static_variables(): void
     {
-        $x_length = count($x_value);
-        $y_length = count($y_value);
-
-        if (!$x_length || !$y_length) { // a 0 is being multiplied
-            return array(
-                self::VALUE => array(),
-                self::SIGN => false
-            );
-        }
-
-        if ($x_length < $y_length) {
-            $temp = $x_value;
-            $x_value = $y_value;
-            $y_value = $temp;
-
-            $x_length = count($x_value);
-            $y_length = count($y_value);
-        }
-
-        $product_value = $this->_array_repeat(0, $x_length + $y_length);
-
-        // the following for loop could be removed if the for loop following it
-        // (the one with nested for loops) initially set $i to 0, but
-        // doing so would also make the result in one set of unnecessary adds,
-        // since on the outermost loops first pass, $product->value[$k] is going
-        // to always be 0
-
-        $carry = 0;
-
-        for ($j = 0; $j < $x_length; ++$j) { // ie. $i = 0, $k = $i
-            $temp = $x_value[$j] * $y_value[0] + $carry; // $product_value[$k] == 0
-            $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
-            $product_value[$j] = (int) ($temp - self::$baseFull * $carry);
-        }
+        if (!isset(self::$mainEngine)) {
+            $engines = [
+                ['GMP', ['DefaultEngine']],
+                ['PHP64', ['OpenSSL']],
+                ['BCMath', ['OpenSSL']],
+                ['PHP32', ['OpenSSL']],
+                ['PHP64', ['DefaultEngine']],
+                ['PHP32', ['DefaultEngine']],
+            ];
 
-        if ($j < $stop) {
-            $product_value[$j] = $carry;
-        }
-
-        // the above for loop is what the previous comment was talking about.  the
-        // following for loop is the "one with nested for loops"
-
-        for ($i = 1; $i < $y_length; ++$i) {
-            $carry = 0;
-
-            for ($j = 0, $k = $i; $j < $x_length && $k < $stop; ++$j, ++$k) {
-                $temp = $product_value[$k] + $x_value[$j] * $y_value[$i] + $carry;
-                $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
-                $product_value[$k] = (int) ($temp - self::$baseFull * $carry);
+            foreach ($engines as $engine) {
+                try {
+                    self::setEngine($engine[0], $engine[1]);
+                    return;
+                } catch (\Exception $e) {
+                }
             }
 
-            if ($k < $stop) {
-                $product_value[$k] = $carry;
-            }
+            throw new UnexpectedValueException('No valid BigInteger found. This is only possible when JIT is enabled on Windows and neither the GMP or BCMath extensions are available so either disable JIT or install GMP / BCMath');
         }
-
-        return array(
-            self::VALUE => $this->_trim($product_value),
-            self::SIGN => $x_negative != $y_negative
-        );
     }
 
     /**
-     * Montgomery Modular Reduction
+     * Converts base-2, base-10, base-16, and binary strings (base-256) to BigIntegers.
      *
-     * ($x->_prepMontgomery($n))->_montgomery($n) yields $x % $n.
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=170 MPM 6.3} provides insights on how this can be
-     * improved upon (basically, by using the comba method).  gcd($n, 2) must be equal to one for this function
-     * to work correctly.
+     * If the second parameter - $base - is negative, then it will be assumed that the number's are encoded using
+     * two's compliment.  The sole exception to this is -10, which is treated the same as 10 is.
      *
-     * @see self::_prepMontgomery()
-     * @see self::_slidingWindow()
-     * @access private
-     * @param array $x
-     * @param array $n
-     * @return array
+     * @param string|int|Engine $x Base-10 number or base-$base number if $base set.
      */
-    function _montgomery($x, $n)
+    public function __construct($x = 0, int $base = 10)
     {
-        static $cache = array(
-            self::VARIABLE => array(),
-            self::DATA => array()
-        );
-
-        if (($key = array_search($n, $cache[self::VARIABLE])) === false) {
-            $key = count($cache[self::VARIABLE]);
-            $cache[self::VARIABLE][] = $x;
-            $cache[self::DATA][] = $this->_modInverse67108864($n);
-        }
+        self::initialize_static_variables();
 
-        $k = count($n);
-
-        $result = array(self::VALUE => $x);
-
-        for ($i = 0; $i < $k; ++$i) {
-            $temp = $result[self::VALUE][$i] * $cache[self::DATA][$key];
-            $temp = $temp - self::$baseFull * (self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31));
-            $temp = $this->_regularMultiply(array($temp), $n);
-            $temp = array_merge($this->_array_repeat(0, $i), $temp);
-            $result = $this->_add($result[self::VALUE], false, $temp, false);
+        if ($x instanceof self::$mainEngine) {
+            $this->value = clone $x;
+        } elseif ($x instanceof Engine) {
+            $this->value = new static("$x");
+            $this->value->setPrecision($x->getPrecision());
+        } else {
+            $this->value = new self::$mainEngine($x, $base);
         }
+    }
 
-        $result[self::VALUE] = array_slice($result[self::VALUE], $k);
-
-        if ($this->_compare($result, false, $n, false) >= 0) {
-            $result = $this->_subtract($result[self::VALUE], false, $n, false);
-        }
+    /**
+     * Converts a BigInteger to a base-10 number.
+     */
+    public function toString(): string
+    {
+        return $this->value->toString();
+    }
 
-        return $result[self::VALUE];
+    /**
+     *  __toString() magic method
+     */
+    public function __toString()
+    {
+        return (string)$this->value;
     }
 
     /**
-     * Montgomery Multiply
-     *
-     * Interleaves the montgomery reduction and long multiplication algorithms together as described in
-     * {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=13 HAC 14.36}
+     *  __debugInfo() magic method
      *
-     * @see self::_prepMontgomery()
-     * @see self::_montgomery()
-     * @access private
-     * @param array $x
-     * @param array $y
-     * @param array $m
-     * @return array
+     * Will be called, automatically, when print_r() or var_dump() are called
      */
-    function _montgomeryMultiply($x, $y, $m)
+    public function __debugInfo()
     {
-        $temp = $this->_multiply($x, false, $y, false);
-        return $this->_montgomery($temp[self::VALUE], $m);
-
-        // the following code, although not callable, can be run independently of the above code
-        // although the above code performed better in my benchmarks the following could might
-        // perform better under different circumstances. in lieu of deleting it it's just been
-        // made uncallable
-
-        static $cache = array(
-            self::VARIABLE => array(),
-            self::DATA => array()
-        );
-
-        if (($key = array_search($m, $cache[self::VARIABLE])) === false) {
-            $key = count($cache[self::VARIABLE]);
-            $cache[self::VARIABLE][] = $m;
-            $cache[self::DATA][] = $this->_modInverse67108864($m);
-        }
+        return $this->value->__debugInfo();
+    }
 
-        $n = max(count($x), count($y), count($m));
-        $x = array_pad($x, $n, 0);
-        $y = array_pad($y, $n, 0);
-        $m = array_pad($m, $n, 0);
-        $a = array(self::VALUE => $this->_array_repeat(0, $n + 1));
-        for ($i = 0; $i < $n; ++$i) {
-            $temp = $a[self::VALUE][0] + $x[$i] * $y[0];
-            $temp = $temp - self::$baseFull * (self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31));
-            $temp = $temp * $cache[self::DATA][$key];
-            $temp = $temp - self::$baseFull * (self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31));
-            $temp = $this->_add($this->_regularMultiply(array($x[$i]), $y), false, $this->_regularMultiply(array($temp), $m), false);
-            $a = $this->_add($a[self::VALUE], false, $temp[self::VALUE], false);
-            $a[self::VALUE] = array_slice($a[self::VALUE], 1);
-        }
-        if ($this->_compare($a[self::VALUE], false, $m, false) >= 0) {
-            $a = $this->_subtract($a[self::VALUE], false, $m, false);
-        }
-        return $a[self::VALUE];
+    /**
+     * Converts a BigInteger to a byte string (eg. base-256).
+     */
+    public function toBytes(bool $twos_compliment = false): string
+    {
+        return $this->value->toBytes($twos_compliment);
+    }
+
+    /**
+     * Converts a BigInteger to a hex string (eg. base-16).
+     */
+    public function toHex(bool $twos_compliment = false): string
+    {
+        return $this->value->toHex($twos_compliment);
     }
 
     /**
-     * Prepare a number for use in Montgomery Modular Reductions
+     * Converts a BigInteger to a bit string (eg. base-2).
      *
-     * @see self::_montgomery()
-     * @see self::_slidingWindow()
-     * @access private
-     * @param array $x
-     * @param array $n
-     * @return array
+     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
+     * saved as two's compliment.
      */
-    function _prepMontgomery($x, $n)
+    public function toBits(bool $twos_compliment = false): string
     {
-        $lhs = new static();
-        $lhs->value = array_merge($this->_array_repeat(0, count($n)), $x);
-        $rhs = new static();
-        $rhs->value = $n;
+        return $this->value->toBits($twos_compliment);
+    }
 
-        list(, $temp) = $lhs->divide($rhs);
-        return $temp->value;
+    /**
+     * Adds two BigIntegers.
+     */
+    public function add(BigInteger $y): BigInteger
+    {
+        return new static($this->value->add($y->value));
     }
 
     /**
-     * Modular Inverse of a number mod 2**26 (eg. 67108864)
-     *
-     * Based off of the bnpInvDigit function implemented and justified in the following URL:
-     *
-     * {@link http://www-cs-students.stanford.edu/~tjw/jsbn/jsbn.js}
-     *
-     * The following URL provides more info:
-     *
-     * {@link http://groups.google.com/group/sci.crypt/msg/7a137205c1be7d85}
-     *
-     * As for why we do all the bitmasking...  strange things can happen when converting from floats to ints. For
-     * instance, on some computers, var_dump((int) -4294967297) yields int(-1) and on others, it yields
-     * int(-2147483648).  To avoid problems stemming from this, we use bitmasks to guarantee that ints aren't
-     * auto-converted to floats.  The outermost bitmask is present because without it, there's no guarantee that
-     * the "residue" returned would be the so-called "common residue".  We use fmod, in the last step, because the
-     * maximum possible $x is 26 bits and the maximum $result is 16 bits.  Thus, we have to be able to handle up to
-     * 40 bits, which only 64-bit floating points will support.
-     *
-     * Thanks to Pedro Gimeno Fortea for input!
-     *
-     * @see self::_montgomery()
-     * @access private
-     * @param array $x
-     * @return int
+     * Subtracts two BigIntegers.
      */
-    function _modInverse67108864($x) // 2**26 == 67,108,864
+    public function subtract(BigInteger $y): BigInteger
     {
-        $x = -$x[0];
-        $result = $x & 0x3; // x**-1 mod 2**2
-        $result = ($result * (2 - $x * $result)) & 0xF; // x**-1 mod 2**4
-        $result = ($result * (2 - ($x & 0xFF) * $result))  & 0xFF; // x**-1 mod 2**8
-        $result = ($result * ((2 - ($x & 0xFFFF) * $result) & 0xFFFF)) & 0xFFFF; // x**-1 mod 2**16
-        $result = fmod($result * (2 - fmod($x * $result, self::$baseFull)), self::$baseFull); // x**-1 mod 2**26
-        return $result & self::$maxDigit;
+        return new static($this->value->subtract($y->value));
     }
 
     /**
-     * Calculates modular inverses.
+     * Multiplies two BigIntegers
+     */
+    public function multiply(BigInteger $x): BigInteger
+    {
+        return new static($this->value->multiply($x->value));
+    }
+
+    /**
+     * Divides two BigIntegers.
      *
-     * Say you have (30 mod 17 * x mod 17) mod 17 == 1.  x can be found using modular inverses.
+     * Returns an array whose first element contains the quotient and whose second element contains the
+     * "common residue".  If the remainder would be positive, the "common residue" and the remainder are the
+     * same.  If the remainder would be negative, the "common residue" is equal to the sum of the remainder
+     * and the divisor (basically, the "common residue" is the first positive modulo).
      *
      * Here's an example:
      * <code>
      * <?php
-     *    $a = new \phpseclib\Math\BigInteger(30);
-     *    $b = new \phpseclib\Math\BigInteger(17);
+     *    $a = new \phpseclib3\Math\BigInteger('10');
+     *    $b = new \phpseclib3\Math\BigInteger('20');
      *
-     *    $c = $a->modInverse($b);
-     *    echo $c->toString(); // outputs 4
+     *    list($quotient, $remainder) = $a->divide($b);
      *
+     *    echo $quotient->toString(); // outputs 0
      *    echo "\r\n";
-     *
-     *    $d = $a->multiply($c);
-     *    list(, $d) = $d->divide($b);
-     *    echo $d; // outputs 1 (as per the definition of modular inverse)
+     *    echo $remainder->toString(); // outputs 10
      * ?>
      * </code>
      *
-     * @param \phpseclib\Math\BigInteger $n
-     * @return \phpseclib\Math\BigInteger|false
-     * @access public
-     * @internal See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=21 HAC 14.64} for more information.
+     * @return BigInteger[]
      */
-    function modInverse($n)
+    public function divide(BigInteger $y): array
     {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                $temp = new static();
-                $temp->value = gmp_invert($this->value, $n->value);
-
-                return ($temp->value === false) ? false : $this->_normalize($temp);
-        }
-
-        static $zero, $one;
-        if (!isset($zero)) {
-            $zero = new static();
-            $one = new static(1);
-        }
-
-        // $x mod -$n == $x mod $n.
-        $n = $n->abs();
-
-        if ($this->compare($zero) < 0) {
-            $temp = $this->abs();
-            $temp = $temp->modInverse($n);
-            return $this->_normalize($n->subtract($temp));
-        }
-
-        extract($this->extendedGCD($n));
-
-        if (!$gcd->equals($one)) {
-            return false;
-        }
-
-        $x = $x->compare($zero) < 0 ? $x->add($n) : $x;
-
-        return $this->compare($zero) < 0 ? $this->_normalize($n->subtract($x)) : $this->_normalize($x);
+        [$q, $r] = $this->value->divide($y->value);
+        return [
+            new static($q),
+            new static($r),
+        ];
     }
 
     /**
-     * Calculates the greatest common divisor and Bezout's identity.
-     *
-     * Say you have 693 and 609.  The GCD is 21.  Bezout's identity states that there exist integers x and y such that
-     * 693*x + 609*y == 21.  In point of fact, there are actually an infinite number of x and y combinations and which
-     * combination is returned is dependant upon which mode is in use.  See
-     * {@link http://en.wikipedia.org/wiki/B%C3%A9zout%27s_identity Bezout's identity - Wikipedia} for more information.
-     *
-     * Here's an example:
-     * <code>
-     * <?php
-     *    $a = new \phpseclib\Math\BigInteger(693);
-     *    $b = new \phpseclib\Math\BigInteger(609);
+     * Calculates modular inverses.
      *
-     *    extract($a->extendedGCD($b));
+     * Say you have (30 mod 17 * x mod 17) mod 17 == 1.  x can be found using modular inverses.
+     */
+    public function modInverse(BigInteger $n): BigInteger
+    {
+        return new static($this->value->modInverse($n->value));
+    }
+
+    /**
+     * Calculates modular inverses.
      *
-     *    echo $gcd->toString() . "\r\n"; // outputs 21
-     *    echo $a->toString() * $x->toString() + $b->toString() * $y->toString(); // outputs 21
-     * ?>
-     * </code>
+     * Say you have (30 mod 17 * x mod 17) mod 17 == 1.  x can be found using modular inverses.
      *
-     * @param \phpseclib\Math\BigInteger $n
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     * @internal Calculates the GCD using the binary xGCD algorithim described in
-     *    {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=19 HAC 14.61}.  As the text above 14.61 notes,
-     *    the more traditional algorithim requires "relatively costly multiple-precision divisions".
+     * @return BigInteger[]
      */
-    function extendedGCD($n)
+    public function extendedGCD(BigInteger $n): array
     {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                extract(gmp_gcdext($this->value, $n->value));
-
-                return array(
-                    'gcd' => $this->_normalize(new static($g)),
-                    'x'   => $this->_normalize(new static($s)),
-                    'y'   => $this->_normalize(new static($t))
-                );
-            case self::MODE_BCMATH:
-                // it might be faster to use the binary xGCD algorithim here, as well, but (1) that algorithim works
-                // best when the base is a power of 2 and (2) i don't think it'd make much difference, anyway.  as is,
-                // the basic extended euclidean algorithim is what we're using.
-
-                $u = $this->value;
-                $v = $n->value;
-
-                $a = '1';
-                $b = '0';
-                $c = '0';
-                $d = '1';
-
-                while (bccomp($v, '0', 0) != 0) {
-                    $q = bcdiv($u, $v, 0);
-
-                    $temp = $u;
-                    $u = $v;
-                    $v = bcsub($temp, bcmul($v, $q, 0), 0);
-
-                    $temp = $a;
-                    $a = $c;
-                    $c = bcsub($temp, bcmul($a, $q, 0), 0);
-
-                    $temp = $b;
-                    $b = $d;
-                    $d = bcsub($temp, bcmul($b, $q, 0), 0);
-                }
-
-                return array(
-                    'gcd' => $this->_normalize(new static($u)),
-                    'x'   => $this->_normalize(new static($a)),
-                    'y'   => $this->_normalize(new static($b))
-                );
-        }
-
-        $y = $n->copy();
-        $x = $this->copy();
-        $g = new static();
-        $g->value = array(1);
-
-        while (!(($x->value[0] & 1)|| ($y->value[0] & 1))) {
-            $x->_rshift(1);
-            $y->_rshift(1);
-            $g->_lshift(1);
-        }
-
-        $u = $x->copy();
-        $v = $y->copy();
-
-        $a = new static();
-        $b = new static();
-        $c = new static();
-        $d = new static();
-
-        $a->value = $d->value = $g->value = array(1);
-        $b->value = $c->value = array();
-
-        while (!empty($u->value)) {
-            while (!($u->value[0] & 1)) {
-                $u->_rshift(1);
-                if ((!empty($a->value) && ($a->value[0] & 1)) || (!empty($b->value) && ($b->value[0] & 1))) {
-                    $a = $a->add($y);
-                    $b = $b->subtract($x);
-                }
-                $a->_rshift(1);
-                $b->_rshift(1);
-            }
-
-            while (!($v->value[0] & 1)) {
-                $v->_rshift(1);
-                if ((!empty($d->value) && ($d->value[0] & 1)) || (!empty($c->value) && ($c->value[0] & 1))) {
-                    $c = $c->add($y);
-                    $d = $d->subtract($x);
-                }
-                $c->_rshift(1);
-                $d->_rshift(1);
-            }
-
-            if ($u->compare($v) >= 0) {
-                $u = $u->subtract($v);
-                $a = $a->subtract($c);
-                $b = $b->subtract($d);
-            } else {
-                $v = $v->subtract($u);
-                $c = $c->subtract($a);
-                $d = $d->subtract($b);
-            }
-        }
-
-        return array(
-            'gcd' => $this->_normalize($g->multiply($v)),
-            'x'   => $this->_normalize($c),
-            'y'   => $this->_normalize($d)
-        );
+        ['gcd' => $gcd, 'x' => $x, 'y' => $y] = $this->value->extendedGCD($n->value);
+        return [
+            'gcd' => new static($gcd),
+            'x' => new static($x),
+            'y' => new static($y),
+        ];
     }
 
     /**
      * Calculates the greatest common divisor
      *
      * Say you have 693 and 609.  The GCD is 21.
-     *
-     * Here's an example:
-     * <code>
-     * <?php
-     *    $a = new \phpseclib\Math\BigInteger(693);
-     *    $b = new \phpseclib\Math\BigInteger(609);
-     *
-     *    $gcd = a->extendedGCD($b);
-     *
-     *    echo $gcd->toString() . "\r\n"; // outputs 21
-     * ?>
-     * </code>
-     *
-     * @param \phpseclib\Math\BigInteger $n
-     * @return \phpseclib\Math\BigInteger
-     * @access public
      */
-    function gcd($n)
+    public function gcd(BigInteger $n): BigInteger
     {
-        extract($this->extendedGCD($n));
-        return $gcd;
+        return new static($this->value->gcd($n->value));
     }
 
     /**
      * Absolute value.
-     *
-     * @return \phpseclib\Math\BigInteger
-     * @access public
      */
-    function abs()
+    public function abs(): BigInteger
     {
-        $temp = new static();
+        return new static($this->value->abs());
+    }
 
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                $temp->value = gmp_abs($this->value);
-                break;
-            case self::MODE_BCMATH:
-                $temp->value = (bccomp($this->value, '0', 0) < 0) ? substr($this->value, 1) : $this->value;
-                break;
-            default:
-                $temp->value = $this->value;
-        }
+    /**
+     * Set Precision
+     *
+     * Some bitwise operations give different results depending on the precision being used.  Examples include left
+     * shift, not, and rotates.
+     */
+    public function setPrecision(int $bits): void
+    {
+        $this->value->setPrecision($bits);
+    }
 
-        return $temp;
+    /**
+     * Get Precision
+     *
+     * Returns the precision if it exists, false if it doesn't
+     *
+     * @return int|bool
+     */
+    public function getPrecision()
+    {
+        return $this->value->getPrecision();
     }
 
     /**
-     * Compares two numbers.
+     * Serialize
      *
-     * Although one might think !$x->compare($y) means $x != $y, it, in fact, means the opposite.  The reason for this is
-     * demonstrated thusly:
+     * Will be called, automatically, when serialize() is called on a BigInteger object.
      *
-     * $x  > $y: $x->compare($y)  > 0
-     * $x  < $y: $x->compare($y)  < 0
-     * $x == $y: $x->compare($y) == 0
+     * __sleep() / __wakeup() have been around since PHP 4.0
      *
-     * Note how the same comparison operator is used.  If you want to test for equality, use $x->equals($y).
+     * \Serializable was introduced in PHP 5.1 and deprecated in PHP 8.1:
+     * https://wiki.php.net/rfc/phase_out_serializable
      *
-     * @param \phpseclib\Math\BigInteger $y
-     * @return int < 0 if $this is less than $y; > 0 if $this is greater than $y, and 0 if they are equal.
-     * @access public
-     * @see self::equals()
-     * @internal Could return $this->subtract($x), but that's not as fast as what we do do.
+     * __serialize() / __unserialize() were introduced in PHP 7.4:
+     * https://wiki.php.net/rfc/custom_object_serialization
+     *
+     * @return array
      */
-    function compare($y)
+    public function __sleep()
     {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                return gmp_cmp($this->value, $y->value);
-            case self::MODE_BCMATH:
-                return bccomp($this->value, $y->value, 0);
+        $this->hex = $this->toHex(true);
+        $vars = ['hex'];
+        if ($this->getPrecision() > 0) {
+            $vars[] = 'precision';
         }
-
-        return $this->_compare($this->value, $this->is_negative, $y->value, $y->is_negative);
+        return $vars;
     }
 
     /**
-     * Compares two numbers.
+     * Serialize
      *
-     * @param array $x_value
-     * @param bool $x_negative
-     * @param array $y_value
-     * @param bool $y_negative
-     * @return int
-     * @see self::compare()
-     * @access private
+     * Will be called, automatically, when unserialize() is called on a BigInteger object.
      */
-    function _compare($x_value, $x_negative, $y_value, $y_negative)
+    public function __wakeup(): void
     {
-        if ($x_negative != $y_negative) {
-            return (!$x_negative && $y_negative) ? 1 : -1;
-        }
-
-        $result = $x_negative ? -1 : 1;
-
-        if (count($x_value) != count($y_value)) {
-            return (count($x_value) > count($y_value)) ? $result : -$result;
-        }
-        $size = max(count($x_value), count($y_value));
-
-        $x_value = array_pad($x_value, $size, 0);
-        $y_value = array_pad($y_value, $size, 0);
-
-        for ($i = count($x_value) - 1; $i >= 0; --$i) {
-            if ($x_value[$i] != $y_value[$i]) {
-                return ($x_value[$i] > $y_value[$i]) ? $result : -$result;
-            }
+        $temp = new static($this->hex, -16);
+        $this->value = $temp->value;
+        if ($this->precision > 0) {
+            // recalculate $this->bitmask
+            $this->setPrecision($this->precision);
         }
-
-        return 0;
     }
 
     /**
-     * Tests the equality of two numbers.
+     * JSON Serialize
      *
-     * If you need to see if one number is greater than or less than another number, use BigInteger::compare()
+     * Will be called, automatically, when json_encode() is called on a BigInteger object.
      *
-     * @param \phpseclib\Math\BigInteger $x
-     * @return bool
-     * @access public
-     * @see self::compare()
+     * @return array{hex: string, precision?: int]
      */
-    function equals($x)
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize(): array
     {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                return gmp_cmp($this->value, $x->value) == 0;
-            default:
-                return $this->value === $x->value && $this->is_negative == $x->is_negative;
+        $result = ['hex' => $this->toHex(true)];
+        if ($this->precision > 0) {
+            $result['precision'] = $this->getPrecision();
         }
+        return $result;
     }
 
     /**
-     * Set Precision
-     *
-     * Some bitwise operations give different results depending on the precision being used.  Examples include left
-     * shift, not, and rotates.
-     *
-     * @param int $bits
-     * @access public
+     * Performs modular exponentiation.
      */
-    function setPrecision($bits)
+    public function powMod(BigInteger $e, BigInteger $n): BigInteger
     {
-        $this->precision = $bits;
-        if (MATH_BIGINTEGER_MODE != self::MODE_BCMATH) {
-            $this->bitmask = new static(chr((1 << ($bits & 0x7)) - 1) . str_repeat(chr(0xFF), $bits >> 3), 256);
-        } else {
-            $this->bitmask = new static(bcpow('2', $bits, 0));
-        }
+        return new static($this->value->powMod($e->value, $n->value));
+    }
 
-        $temp = $this->_normalize($this);
-        $this->value = $temp->value;
+    /**
+     * Performs modular exponentiation.
+     */
+    public function modPow(BigInteger $e, BigInteger $n): BigInteger
+    {
+        return new static($this->value->modPow($e->value, $n->value));
     }
 
     /**
-     * Logical And
+     * Compares two numbers.
+     *
+     * Although one might think !$x->compare($y) means $x != $y, it, in fact, means the opposite.  The reason for this
+     * is demonstrated thusly:
+     *
+     * $x  > $y: $x->compare($y)  > 0
+     * $x  < $y: $x->compare($y)  < 0
+     * $x == $y: $x->compare($y) == 0
+     *
+     * Note how the same comparison operator is used.  If you want to test for equality, use $x->equals($y).
+     *
+     * {@internal Could return $this->subtract($x), but that's not as fast as what we do do.}
      *
-     * @param \phpseclib\Math\BigInteger $x
-     * @access public
-     * @internal Implemented per a request by Lluis Pamies i Juarez <lluis _a_ pamies.cat>
-     * @return \phpseclib\Math\BigInteger
+     * @return int in case < 0 if $this is less than $y; > 0 if $this is greater than $y, and 0 if they are equal.
+     * @see self::equals()
      */
-    function bitwise_and($x)
+    public function compare(BigInteger $y): int
     {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                $temp = new static();
-                $temp->value = gmp_and($this->value, $x->value);
-
-                return $this->_normalize($temp);
-            case self::MODE_BCMATH:
-                $left = $this->toBytes();
-                $right = $x->toBytes();
-
-                $length = max(strlen($left), strlen($right));
-
-                $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
-                $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
-
-                return $this->_normalize(new static($left & $right, 256));
-        }
-
-        $result = $this->copy();
-
-        $length = min(count($x->value), count($this->value));
-
-        $result->value = array_slice($result->value, 0, $length);
-
-        for ($i = 0; $i < $length; ++$i) {
-            $result->value[$i]&= $x->value[$i];
-        }
+        return $this->value->compare($y->value);
+    }
 
-        return $this->_normalize($result);
+    /**
+     * Tests the equality of two numbers.
+     *
+     * If you need to see if one number is greater than or less than another number, use BigInteger::compare()
+     */
+    public function equals(BigInteger $x): bool
+    {
+        return $this->value->equals($x->value);
     }
 
     /**
-     * Logical Or
-     *
-     * @param \phpseclib\Math\BigInteger $x
-     * @access public
-     * @internal Implemented per a request by Lluis Pamies i Juarez <lluis _a_ pamies.cat>
-     * @return \phpseclib\Math\BigInteger
+     * Logical Not
      */
-    function bitwise_or($x)
+    public function bitwise_not(): BigInteger
     {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                $temp = new static();
-                $temp->value = gmp_or($this->value, $x->value);
-
-                return $this->_normalize($temp);
-            case self::MODE_BCMATH:
-                $left = $this->toBytes();
-                $right = $x->toBytes();
-
-                $length = max(strlen($left), strlen($right));
-
-                $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
-                $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
-
-                return $this->_normalize(new static($left | $right, 256));
-        }
-
-        $length = max(count($this->value), count($x->value));
-        $result = $this->copy();
-        $result->value = array_pad($result->value, $length, 0);
-        $x->value = array_pad($x->value, $length, 0);
-
-        for ($i = 0; $i < $length; ++$i) {
-            $result->value[$i]|= $x->value[$i];
-        }
-
-        return $this->_normalize($result);
+        return new static($this->value->bitwise_not());
     }
 
     /**
-     * Logical Exclusive-Or
-     *
-     * @param \phpseclib\Math\BigInteger $x
-     * @access public
-     * @internal Implemented per a request by Lluis Pamies i Juarez <lluis _a_ pamies.cat>
-     * @return \phpseclib\Math\BigInteger
+     * Logical And
      */
-    function bitwise_xor($x)
+    public function bitwise_and(BigInteger $x): BigInteger
     {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                $temp = new static();
-                $temp->value = gmp_xor($this->value, $x->value);
-
-                return $this->_normalize($temp);
-            case self::MODE_BCMATH:
-                $left = $this->toBytes();
-                $right = $x->toBytes();
-
-                $length = max(strlen($left), strlen($right));
-
-                $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
-                $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
-
-                return $this->_normalize(new static($left ^ $right, 256));
-        }
-
-        $length = max(count($this->value), count($x->value));
-        $result = $this->copy();
-        $result->value = array_pad($result->value, $length, 0);
-        $x->value = array_pad($x->value, $length, 0);
-
-        for ($i = 0; $i < $length; ++$i) {
-            $result->value[$i]^= $x->value[$i];
-        }
-
-        return $this->_normalize($result);
+        return new static($this->value->bitwise_and($x->value));
     }
 
     /**
-     * Logical Not
-     *
-     * @access public
-     * @internal Implemented per a request by Lluis Pamies i Juarez <lluis _a_ pamies.cat>
-     * @return \phpseclib\Math\BigInteger
+     * Logical Or
      */
-    function bitwise_not()
+    public function bitwise_or(BigInteger $x): BigInteger
     {
-        // calculuate "not" without regard to $this->precision
-        // (will always result in a smaller number.  ie. ~1 isn't 1111 1110 - it's 0)
-        $temp = $this->toBytes();
-        $pre_msb = decbin(ord($temp[0]));
-        $temp = ~$temp;
-        $msb = decbin(ord($temp[0]));
-        if (strlen($msb) == 8) {
-            $msb = substr($msb, strpos($msb, '0'));
-        }
-        $temp[0] = chr(bindec($msb));
-
-        // see if we need to add extra leading 1's
-        $current_bits = strlen($pre_msb) + 8 * strlen($temp) - 8;
-        $new_bits = $this->precision - $current_bits;
-        if ($new_bits <= 0) {
-            return $this->_normalize(new static($temp, 256));
-        }
-
-        // generate as many leading 1's as we need to.
-        $leading_ones = chr((1 << ($new_bits & 0x7)) - 1) . str_repeat(chr(0xFF), $new_bits >> 3);
-        $this->_base256_lshift($leading_ones, $current_bits);
-
-        $temp = str_pad($temp, strlen($leading_ones), chr(0), STR_PAD_LEFT);
+        return new static($this->value->bitwise_or($x->value));
+    }
 
-        return $this->_normalize(new static($leading_ones | $temp, 256));
+    /**
+     * Logical Exclusive Or
+     */
+    public function bitwise_xor(BigInteger $x): BigInteger
+    {
+        return new static($this->value->bitwise_xor($x->value));
     }
 
     /**
      * Logical Right Shift
      *
      * Shifts BigInteger's by $shift bits, effectively dividing by 2**$shift.
-     *
-     * @param int $shift
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     * @internal The only version that yields any speed increases is the internal version.
      */
-    function bitwise_rightShift($shift)
+    public function bitwise_rightShift(int $shift): BigInteger
     {
-        $temp = new static();
-
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                static $two;
-
-                if (!isset($two)) {
-                    $two = gmp_init('2');
-                }
-
-                $temp->value = gmp_div_q($this->value, gmp_pow($two, $shift));
-
-                break;
-            case self::MODE_BCMATH:
-                $temp->value = bcdiv($this->value, bcpow('2', $shift, 0), 0);
-
-                break;
-            default: // could just replace _lshift with this, but then all _lshift() calls would need to be rewritten
-                     // and I don't want to do that...
-                $temp->value = $this->value;
-                $temp->_rshift($shift);
-        }
-
-        return $this->_normalize($temp);
+        return new static($this->value->bitwise_rightShift($shift));
     }
 
     /**
      * Logical Left Shift
      *
      * Shifts BigInteger's by $shift bits, effectively multiplying by 2**$shift.
-     *
-     * @param int $shift
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     * @internal The only version that yields any speed increases is the internal version.
      */
-    function bitwise_leftShift($shift)
+    public function bitwise_leftShift(int $shift): BigInteger
     {
-        $temp = new static();
-
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                static $two;
-
-                if (!isset($two)) {
-                    $two = gmp_init('2');
-                }
-
-                $temp->value = gmp_mul($this->value, gmp_pow($two, $shift));
-
-                break;
-            case self::MODE_BCMATH:
-                $temp->value = bcmul($this->value, bcpow('2', $shift, 0), 0);
-
-                break;
-            default: // could just replace _rshift with this, but then all _lshift() calls would need to be rewritten
-                     // and I don't want to do that...
-                $temp->value = $this->value;
-                $temp->_lshift($shift);
-        }
-
-        return $this->_normalize($temp);
+        return new static($this->value->bitwise_leftShift($shift));
     }
 
     /**
      * Logical Left Rotate
      *
      * Instead of the top x bits being dropped they're appended to the shifted bit string.
-     *
-     * @param int $shift
-     * @return \phpseclib\Math\BigInteger
-     * @access public
      */
-    function bitwise_leftRotate($shift)
+    public function bitwise_leftRotate(int $shift): BigInteger
     {
-        $bits = $this->toBytes();
-
-        if ($this->precision > 0) {
-            $precision = $this->precision;
-            if (MATH_BIGINTEGER_MODE == self::MODE_BCMATH) {
-                $mask = $this->bitmask->subtract(new static(1));
-                $mask = $mask->toBytes();
-            } else {
-                $mask = $this->bitmask->toBytes();
-            }
-        } else {
-            $temp = ord($bits[0]);
-            for ($i = 0; $temp >> $i; ++$i) {
-            }
-            $precision = 8 * strlen($bits) - 8 + $i;
-            $mask = chr((1 << ($precision & 0x7)) - 1) . str_repeat(chr(0xFF), $precision >> 3);
-        }
-
-        if ($shift < 0) {
-            $shift+= $precision;
-        }
-        $shift%= $precision;
-
-        if (!$shift) {
-            return $this->copy();
-        }
-
-        $left = $this->bitwise_leftShift($shift);
-        $left = $left->bitwise_and(new static($mask, 256));
-        $right = $this->bitwise_rightShift($precision - $shift);
-        $result = MATH_BIGINTEGER_MODE != self::MODE_BCMATH ? $left->bitwise_or($right) : $left->add($right);
-        return $this->_normalize($result);
+        return new static($this->value->bitwise_leftRotate($shift));
     }
 
     /**
      * Logical Right Rotate
      *
      * Instead of the bottom x bits being dropped they're prepended to the shifted bit string.
-     *
-     * @param int $shift
-     * @return \phpseclib\Math\BigInteger
-     * @access public
      */
-    function bitwise_rightRotate($shift)
+    public function bitwise_rightRotate(int $shift): BigInteger
     {
-        return $this->bitwise_leftRotate(-$shift);
+        return new static($this->value->bitwise_rightRotate($shift));
     }
 
     /**
-     * Generates a random BigInteger
+     * Returns the smallest and largest n-bit number
      *
-     * Byte length is equal to $length. Uses \phpseclib\Crypt\Random if it's loaded and mt_rand if it's not.
-     *
-     * @param int $length
-     * @return \phpseclib\Math\BigInteger
-     * @access private
+     * @return BigInteger[]
      */
-    function _random_number_helper($size)
+    public static function minMaxBits(int $bits): array
     {
-        if (class_exists('\phpseclib\Crypt\Random')) {
-            $random = Random::string($size);
-        } else {
-            $random = '';
+        self::initialize_static_variables();
 
-            if ($size & 1) {
-                $random.= chr(mt_rand(0, 255));
-            }
+        $class = self::$mainEngine;
+        ['min' => $min, 'max' => $max] = $class::minMaxBits($bits);
+        return [
+            'min' => new static($min),
+            'max' => new static($max),
+        ];
+    }
 
-            $blocks = $size >> 1;
-            for ($i = 0; $i < $blocks; ++$i) {
-                // mt_rand(-2147483648, 0x7FFFFFFF) always produces -2147483648 on some systems
-                $random.= pack('n', mt_rand(0, 0xFFFF));
-            }
-        }
+    /**
+     * Return the size of a BigInteger in bits
+     */
+    public function getLength(): int
+    {
+        return $this->value->getLength();
+    }
 
-        return new static($random, 256);
+    /**
+     * Return the size of a BigInteger in bytes
+     */
+    public function getLengthInBytes(): int
+    {
+        return $this->value->getLengthInBytes();
     }
 
     /**
-     * Generate a random number
-     *
-     * Returns a random number between $min and $max where $min and $max
-     * can be defined using one of the two methods:
+     * Generates a random number of a certain size
      *
-     * $min->random($max)
-     * $max->random($min)
-     *
-     * @param \phpseclib\Math\BigInteger $arg1
-     * @param \phpseclib\Math\BigInteger $arg2
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     * @internal The API for creating random numbers used to be $a->random($min, $max), where $a was a BigInteger object.
-     *           That method is still supported for BC purposes.
+     * Bit length is equal to $size
      */
-    function random($arg1, $arg2 = false)
+    public static function random(int $size): BigInteger
     {
-        if ($arg1 === false) {
-            return false;
-        }
-
-        if ($arg2 === false) {
-            $max = $arg1;
-            $min = $this;
-        } else {
-            $min = $arg1;
-            $max = $arg2;
-        }
-
-        $compare = $max->compare($min);
-
-        if (!$compare) {
-            return $this->_normalize($min);
-        } elseif ($compare < 0) {
-            // if $min is bigger then $max, swap $min and $max
-            $temp = $max;
-            $max = $min;
-            $min = $temp;
-        }
+        self::initialize_static_variables();
 
-        static $one;
-        if (!isset($one)) {
-            $one = new static(1);
-        }
+        $class = self::$mainEngine;
+        return new static($class::random($size));
+    }
 
-        $max = $max->subtract($min->subtract($one));
-        $size = strlen(ltrim($max->toBytes(), chr(0)));
-
-        /*
-            doing $random % $max doesn't work because some numbers will be more likely to occur than others.
-            eg. if $max is 140 and $random's max is 255 then that'd mean both $random = 5 and $random = 145
-            would produce 5 whereas the only value of random that could produce 139 would be 139. ie.
-            not all numbers would be equally likely. some would be more likely than others.
-
-            creating a whole new random number until you find one that is within the range doesn't work
-            because, for sufficiently small ranges, the likelihood that you'd get a number within that range
-            would be pretty small. eg. with $random's max being 255 and if your $max being 1 the probability
-            would be pretty high that $random would be greater than $max.
-
-            phpseclib works around this using the technique described here:
-
-            http://crypto.stackexchange.com/questions/5708/creating-a-small-number-from-a-cryptographically-secure-random-string
-        */
-        $random_max = new static(chr(1) . str_repeat("\0", $size), 256);
-        $random = $this->_random_number_helper($size);
-
-        list($max_multiple) = $random_max->divide($max);
-        $max_multiple = $max_multiple->multiply($max);
-
-        while ($random->compare($max_multiple) >= 0) {
-            $random = $random->subtract($max_multiple);
-            $random_max = $random_max->subtract($max_multiple);
-            $random = $random->bitwise_leftShift(8);
-            $random = $random->add($this->_random_number_helper(1));
-            $random_max = $random_max->bitwise_leftShift(8);
-            list($max_multiple) = $random_max->divide($max);
-            $max_multiple = $max_multiple->multiply($max);
-        }
-        list(, $random) = $random->divide($max);
+    /**
+     * Generates a random prime number of a certain size
+     *
+     * Bit length is equal to $size
+     */
+    public static function randomPrime(int $size): BigInteger
+    {
+        self::initialize_static_variables();
 
-        return $this->_normalize($random->add($min));
+        $class = self::$mainEngine;
+        return new static($class::randomPrime($size));
     }
 
     /**
-     * Generate a random prime number.
+     * Generate a random prime number between a range
      *
      * If there's not a prime within the given range, false will be returned.
-     * If more than $timeout seconds have elapsed, give up and return false.
      *
-     * @param \phpseclib\Math\BigInteger $arg1
-     * @param \phpseclib\Math\BigInteger $arg2
-     * @param int $timeout
-     * @return Math_BigInteger|false
-     * @access public
-     * @internal See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap4.pdf#page=15 HAC 4.44}.
+     * @return false|BigInteger
      */
-    function randomPrime($arg1, $arg2 = false, $timeout = false)
+    public static function randomRangePrime(BigInteger $min, BigInteger $max)
     {
-        if ($arg1 === false) {
-            return false;
-        }
-
-        if ($arg2 === false) {
-            $max = $arg1;
-            $min = $this;
-        } else {
-            $min = $arg1;
-            $max = $arg2;
-        }
-
-        $compare = $max->compare($min);
-
-        if (!$compare) {
-            return $min->isPrime() ? $min : false;
-        } elseif ($compare < 0) {
-            // if $min is bigger then $max, swap $min and $max
-            $temp = $max;
-            $max = $min;
-            $min = $temp;
-        }
-
-        static $one, $two;
-        if (!isset($one)) {
-            $one = new static(1);
-            $two = new static(2);
-        }
-
-        $start = time();
-
-        $x = $this->random($min, $max);
-
-        // gmp_nextprime() requires PHP 5 >= 5.2.0 per <http://php.net/gmp-nextprime>.
-        if (MATH_BIGINTEGER_MODE == self::MODE_GMP && extension_loaded('gmp')) {
-            $p = new static();
-            $p->value = gmp_nextprime($x->value);
-
-            if ($p->compare($max) <= 0) {
-                return $p;
-            }
-
-            if (!$min->equals($x)) {
-                $x = $x->subtract($one);
-            }
-
-            return $x->randomPrime($min, $x);
-        }
-
-        if ($x->equals($two)) {
-            return $x;
-        }
-
-        $x->_make_odd();
-        if ($x->compare($max) > 0) {
-            // if $x > $max then $max is even and if $min == $max then no prime number exists between the specified range
-            if ($min->equals($max)) {
-                return false;
-            }
-            $x = $min->copy();
-            $x->_make_odd();
-        }
-
-        $initial_x = $x->copy();
-
-        while (true) {
-            if ($timeout !== false && time() - $start > $timeout) {
-                return false;
-            }
-
-            if ($x->isPrime()) {
-                return $x;
-            }
-
-            $x = $x->add($two);
-
-            if ($x->compare($max) > 0) {
-                $x = $min->copy();
-                if ($x->equals($two)) {
-                    return $x;
-                }
-                $x->_make_odd();
-            }
-
-            if ($x->equals($initial_x)) {
-                return false;
-            }
-        }
+        $class = self::$mainEngine;
+        return new static($class::randomRangePrime($min->value, $max->value));
     }
 
     /**
-     * Make the current number odd
+     * Generate a random number between a range
      *
-     * If the current number is odd it'll be unchanged.  If it's even, one will be added to it.
+     * Returns a random number between $min and $max where $min and $max
+     * can be defined using one of the two methods:
      *
-     * @see self::randomPrime()
-     * @access private
+     * BigInteger::randomRange($min, $max)
+     * BigInteger::randomRange($max, $min)
      */
-    function _make_odd()
+    public static function randomRange(BigInteger $min, BigInteger $max): BigInteger
     {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                gmp_setbit($this->value, 0);
-                break;
-            case self::MODE_BCMATH:
-                if ($this->value[strlen($this->value) - 1] % 2 == 0) {
-                    $this->value = bcadd($this->value, '1');
-                }
-                break;
-            default:
-                $this->value[0] |= 1;
-        }
+        $class = self::$mainEngine;
+        return new static($class::randomRange($min->value, $max->value));
     }
 
     /**
@@ -3307,445 +629,137 @@ function _make_odd()
      * $t parameter is distributability.  BigInteger::randomPrime() can be distributed across multiple pageloads
      * on a website instead of just one.
      *
-     * @param \phpseclib\Math\BigInteger $t
-     * @return bool
-     * @access public
-     * @internal Uses the
-     *     {@link http://en.wikipedia.org/wiki/Miller%E2%80%93Rabin_primality_test Miller-Rabin primality test}.  See
-     *     {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap4.pdf#page=8 HAC 4.24}.
+     * @param int|bool $t
      */
-    function isPrime($t = false)
+    public function isPrime($t = false): bool
     {
-        $length = strlen($this->toBytes());
-
-        if (!$t) {
-            // see HAC 4.49 "Note (controlling the error probability)"
-            // @codingStandardsIgnoreStart
-                 if ($length >= 163) { $t =  2; } // floor(1300 / 8)
-            else if ($length >= 106) { $t =  3; } // floor( 850 / 8)
-            else if ($length >= 81 ) { $t =  4; } // floor( 650 / 8)
-            else if ($length >= 68 ) { $t =  5; } // floor( 550 / 8)
-            else if ($length >= 56 ) { $t =  6; } // floor( 450 / 8)
-            else if ($length >= 50 ) { $t =  7; } // floor( 400 / 8)
-            else if ($length >= 43 ) { $t =  8; } // floor( 350 / 8)
-            else if ($length >= 37 ) { $t =  9; } // floor( 300 / 8)
-            else if ($length >= 31 ) { $t = 12; } // floor( 250 / 8)
-            else if ($length >= 25 ) { $t = 15; } // floor( 200 / 8)
-            else if ($length >= 18 ) { $t = 18; } // floor( 150 / 8)
-            else                     { $t = 27; }
-            // @codingStandardsIgnoreEnd
-        }
-
-        // ie. gmp_testbit($this, 0)
-        // ie. isEven() or !isOdd()
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                return gmp_prob_prime($this->value, $t) != 0;
-            case self::MODE_BCMATH:
-                if ($this->value === '2') {
-                    return true;
-                }
-                if ($this->value[strlen($this->value) - 1] % 2 == 0) {
-                    return false;
-                }
-                break;
-            default:
-                if ($this->value == array(2)) {
-                    return true;
-                }
-                if (~$this->value[0] & 1) {
-                    return false;
-                }
-        }
-
-        static $primes, $zero, $one, $two;
-
-        if (!isset($primes)) {
-            $primes = array(
-                3,    5,    7,    11,   13,   17,   19,   23,   29,   31,   37,   41,   43,   47,   53,   59,
-                61,   67,   71,   73,   79,   83,   89,   97,   101,  103,  107,  109,  113,  127,  131,  137,
-                139,  149,  151,  157,  163,  167,  173,  179,  181,  191,  193,  197,  199,  211,  223,  227,
-                229,  233,  239,  241,  251,  257,  263,  269,  271,  277,  281,  283,  293,  307,  311,  313,
-                317,  331,  337,  347,  349,  353,  359,  367,  373,  379,  383,  389,  397,  401,  409,  419,
-                421,  431,  433,  439,  443,  449,  457,  461,  463,  467,  479,  487,  491,  499,  503,  509,
-                521,  523,  541,  547,  557,  563,  569,  571,  577,  587,  593,  599,  601,  607,  613,  617,
-                619,  631,  641,  643,  647,  653,  659,  661,  673,  677,  683,  691,  701,  709,  719,  727,
-                733,  739,  743,  751,  757,  761,  769,  773,  787,  797,  809,  811,  821,  823,  827,  829,
-                839,  853,  857,  859,  863,  877,  881,  883,  887,  907,  911,  919,  929,  937,  941,  947,
-                953,  967,  971,  977,  983,  991,  997
-            );
-
-            if (MATH_BIGINTEGER_MODE != self::MODE_INTERNAL) {
-                for ($i = 0; $i < count($primes); ++$i) {
-                    $primes[$i] = new static($primes[$i]);
-                }
-            }
-
-            $zero = new static();
-            $one = new static(1);
-            $two = new static(2);
-        }
-
-        if ($this->equals($one)) {
-            return false;
-        }
-
-        // see HAC 4.4.1 "Random search for probable primes"
-        if (MATH_BIGINTEGER_MODE != self::MODE_INTERNAL) {
-            foreach ($primes as $prime) {
-                list(, $r) = $this->divide($prime);
-                if ($r->equals($zero)) {
-                    return $this->equals($prime);
-                }
-            }
-        } else {
-            $value = $this->value;
-            foreach ($primes as $prime) {
-                list(, $r) = $this->_divide_digit($value, $prime);
-                if (!$r) {
-                    return count($value) == 1 && $value[0] == $prime;
-                }
-            }
-        }
-
-        $n   = $this->copy();
-        $n_1 = $n->subtract($one);
-        $n_2 = $n->subtract($two);
-
-        $r = $n_1->copy();
-        $r_value = $r->value;
-        // ie. $s = gmp_scan1($n, 0) and $r = gmp_div_q($n, gmp_pow(gmp_init('2'), $s));
-        if (MATH_BIGINTEGER_MODE == self::MODE_BCMATH) {
-            $s = 0;
-            // if $n was 1, $r would be 0 and this would be an infinite loop, hence our $this->equals($one) check earlier
-            while ($r->value[strlen($r->value) - 1] % 2 == 0) {
-                $r->value = bcdiv($r->value, '2', 0);
-                ++$s;
-            }
-        } else {
-            for ($i = 0, $r_length = count($r_value); $i < $r_length; ++$i) {
-                $temp = ~$r_value[$i] & 0xFFFFFF;
-                for ($j = 1; ($temp >> $j) & 1; ++$j) {
-                }
-                if ($j != 25) {
-                    break;
-                }
-            }
-            $s = 26 * $i + $j - 1;
-            $r->_rshift($s);
-        }
-
-        for ($i = 0; $i < $t; ++$i) {
-            $a = $this->random($two, $n_2);
-            $y = $a->modPow($r, $n);
-
-            if (!$y->equals($one) && !$y->equals($n_1)) {
-                for ($j = 1; $j < $s && !$y->equals($n_1); ++$j) {
-                    $y = $y->modPow($two, $n);
-                    if ($y->equals($one)) {
-                        return false;
-                    }
-                }
-
-                if (!$y->equals($n_1)) {
-                    return false;
-                }
-            }
-        }
-        return true;
+        return $this->value->isPrime($t);
     }
 
     /**
-     * Logical Left Shift
+     * Calculates the nth root of a biginteger.
      *
-     * Shifts BigInteger's by $shift bits.
+     * Returns the nth root of a positive biginteger, where n defaults to 2
      *
-     * @param int $shift
-     * @access private
+     * @param int $n optional
      */
-    function _lshift($shift)
+    public function root(int $n = 2): BigInteger
     {
-        if ($shift == 0) {
-            return;
-        }
-
-        $num_digits = (int) ($shift / self::$base);
-        $shift %= self::$base;
-        $shift = 1 << $shift;
-
-        $carry = 0;
-
-        for ($i = 0; $i < count($this->value); ++$i) {
-            $temp = $this->value[$i] * $shift + $carry;
-            $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
-            $this->value[$i] = (int) ($temp - $carry * self::$baseFull);
-        }
-
-        if ($carry) {
-            $this->value[count($this->value)] = $carry;
-        }
-
-        while ($num_digits--) {
-            array_unshift($this->value, 0);
-        }
+        return new static($this->value->root($n));
     }
 
     /**
-     * Logical Right Shift
-     *
-     * Shifts BigInteger's by $shift bits.
-     *
-     * @param int $shift
-     * @access private
+     * Performs exponentiation.
      */
-    function _rshift($shift)
+    public function pow(BigInteger $n): BigInteger
     {
-        if ($shift == 0) {
-            return;
-        }
-
-        $num_digits = (int) ($shift / self::$base);
-        $shift %= self::$base;
-        $carry_shift = self::$base - $shift;
-        $carry_mask = (1 << $shift) - 1;
-
-        if ($num_digits) {
-            $this->value = array_slice($this->value, $num_digits);
-        }
-
-        $carry = 0;
-
-        for ($i = count($this->value) - 1; $i >= 0; --$i) {
-            $temp = $this->value[$i] >> $shift | $carry;
-            $carry = ($this->value[$i] & $carry_mask) << $carry_shift;
-            $this->value[$i] = $temp;
-        }
-
-        $this->value = $this->_trim($this->value);
+        return new static($this->value->pow($n->value));
     }
 
     /**
-     * Normalize
-     *
-     * Removes leading zeros and truncates (if necessary) to maintain the appropriate precision
-     *
-     * @param \phpseclib\Math\BigInteger
-     * @return \phpseclib\Math\BigInteger
-     * @see self::_trim()
-     * @access private
+     * Return the minimum BigInteger between an arbitrary number of BigIntegers.
      */
-    function _normalize($result)
+    public static function min(BigInteger ...$nums): BigInteger
     {
-        $result->precision = $this->precision;
-        $result->bitmask = $this->bitmask;
-
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                if ($this->bitmask !== false) {
-                    $result->value = gmp_and($result->value, $result->bitmask->value);
-                }
-
-                return $result;
-            case self::MODE_BCMATH:
-                if (!empty($result->bitmask->value)) {
-                    $result->value = bcmod($result->value, $result->bitmask->value);
-                }
-
-                return $result;
-        }
-
-        $value = &$result->value;
-
-        if (!count($value)) {
-            return $result;
-        }
-
-        $value = $this->_trim($value);
-
-        if (!empty($result->bitmask->value)) {
-            $length = min(count($value), count($this->bitmask->value));
-            $value = array_slice($value, 0, $length);
-
-            for ($i = 0; $i < $length; ++$i) {
-                $value[$i] = $value[$i] & $this->bitmask->value[$i];
-            }
-        }
-
-        return $result;
+        $class = self::$mainEngine;
+        $nums = array_map(fn ($num) => $num->value, $nums);
+        return new static($class::min(...$nums));
     }
 
     /**
-     * Trim
-     *
-     * Removes leading zeros
-     *
-     * @param array $value
-     * @return \phpseclib\Math\BigInteger
-     * @access private
+     * Return the maximum BigInteger between an arbitrary number of BigIntegers.
      */
-    function _trim($value)
+    public static function max(BigInteger ...$nums): BigInteger
     {
-        for ($i = count($value) - 1; $i >= 0; --$i) {
-            if ($value[$i]) {
-                break;
-            }
-            unset($value[$i]);
-        }
-
-        return $value;
+        $class = self::$mainEngine;
+        $nums = array_map(fn ($num) => $num->value, $nums);
+        return new static($class::max(...$nums));
     }
 
     /**
-     * Array Repeat
-     *
-     * @param $input Array
-     * @param $multiplier mixed
-     * @return array
-     * @access private
+     * Tests BigInteger to see if it is between two integers, inclusive
      */
-    function _array_repeat($input, $multiplier)
+    public function between(BigInteger $min, BigInteger $max): bool
     {
-        return ($multiplier) ? array_fill(0, $multiplier, $input) : array();
+        return $this->value->between($min->value, $max->value);
     }
 
     /**
-     * Logical Left Shift
-     *
-     * Shifts binary strings $shift bits, essentially multiplying by 2**$shift.
-     *
-     * @param $x String
-     * @param $shift Integer
-     * @return string
-     * @access private
+     * Clone
      */
-    function _base256_lshift(&$x, $shift)
+    public function __clone()
     {
-        if ($shift == 0) {
-            return;
-        }
-
-        $num_bytes = $shift >> 3; // eg. floor($shift/8)
-        $shift &= 7; // eg. $shift % 8
-
-        $carry = 0;
-        for ($i = strlen($x) - 1; $i >= 0; --$i) {
-            $temp = ord($x[$i]) << $shift | $carry;
-            $x[$i] = chr($temp);
-            $carry = $temp >> 8;
-        }
-        $carry = ($carry != 0) ? chr($carry) : '';
-        $x = $carry . $x . str_repeat(chr(0), $num_bytes);
+        $this->value = clone $this->value;
     }
 
     /**
-     * Logical Right Shift
-     *
-     * Shifts binary strings $shift bits, essentially dividing by 2**$shift and returning the remainder.
-     *
-     * @param $x String
-     * @param $shift Integer
-     * @return string
-     * @access private
+     * Is Odd?
      */
-    function _base256_rshift(&$x, $shift)
+    public function isOdd(): bool
     {
-        if ($shift == 0) {
-            $x = ltrim($x, chr(0));
-            return '';
-        }
-
-        $num_bytes = $shift >> 3; // eg. floor($shift/8)
-        $shift &= 7; // eg. $shift % 8
-
-        $remainder = '';
-        if ($num_bytes) {
-            $start = $num_bytes > strlen($x) ? -strlen($x) : -$num_bytes;
-            $remainder = substr($x, $start);
-            $x = substr($x, 0, -$num_bytes);
-        }
-
-        $carry = 0;
-        $carry_shift = 8 - $shift;
-        for ($i = 0; $i < strlen($x); ++$i) {
-            $temp = (ord($x[$i]) >> $shift) | $carry;
-            $carry = (ord($x[$i]) << $carry_shift) & 0xFF;
-            $x[$i] = chr($temp);
-        }
-        $x = ltrim($x, chr(0));
-
-        $remainder = chr($carry >> $carry_shift) . $remainder;
+        return $this->value->isOdd();
+    }
 
-        return ltrim($remainder, chr(0));
+    /**
+     * Tests if a bit is set
+     */
+    public function testBit(int $x): bool
+    {
+        return $this->value->testBit($x);
     }
 
-    // one quirk about how the following functions are implemented is that PHP defines N to be an unsigned long
-    // at 32-bits, while java's longs are 64-bits.
+    /**
+     * Is Negative?
+     */
+    public function isNegative(): bool
+    {
+        return $this->value->isNegative();
+    }
 
     /**
-     * Converts 32-bit integers to bytes.
+     * Negate
      *
-     * @param int $x
-     * @return string
-     * @access private
+     * Given $k, returns -$k
      */
-    function _int2bytes($x)
+    public function negate(): BigInteger
     {
-        return ltrim(pack('N', $x), chr(0));
+        return new static($this->value->negate());
     }
 
     /**
-     * Converts bytes to 32-bit integers
+     * Scan for 1 and right shift by that amount
      *
-     * @param string $x
-     * @return int
-     * @access private
+     * ie. $s = gmp_scan1($n, 0) and $r = gmp_div_q($n, gmp_pow(gmp_init('2'), $s));
      */
-    function _bytes2int($x)
+    public static function scan1divide(BigInteger $r): int
     {
-        $temp = unpack('Nint', str_pad($x, 4, chr(0), STR_PAD_LEFT));
-        return $temp['int'];
+        $class = self::$mainEngine;
+        return $class::scan1divide($r->value);
     }
 
     /**
-     * DER-encode an integer
+     * Create Recurring Modulo Function
      *
-     * The ability to DER-encode integers is needed to create RSA public keys for use with OpenSSL
+     * Sometimes it may be desirable to do repeated modulos with the same number outside of
+     * modular exponentiation
      *
-     * @see self::modPow()
-     * @access private
-     * @param int $length
-     * @return string
+     * @return callable
      */
-    function _encodeASN1Length($length)
+    public function createRecurringModuloFunction()
     {
-        if ($length <= 0x7F) {
-            return chr($length);
-        }
-
-        $temp = ltrim(pack('N', $length), chr(0));
-        return pack('Ca*', 0x80 | strlen($temp), $temp);
+        $func = $this->value->createRecurringModuloFunction();
+        return fn (BigInteger $x) => new static($func($x->value));
     }
 
     /**
-     * Single digit division
+     * Bitwise Split
      *
-     * Even if int64 is being used the division operator will return a float64 value
-     * if the dividend is not evenly divisible by the divisor. Since a float64 doesn't
-     * have the precision of int64 this is a problem so, when int64 is being used,
-     * we'll guarantee that the dividend is divisible by first subtracting the remainder.
+     * Splits BigInteger's into chunks of $split bits
      *
-     * @access private
-     * @param int $x
-     * @param int $y
-     * @return int
+     * @return BigInteger[]
      */
-    function _safe_divide($x, $y)
+    public function bitwise_split(int $split): array
     {
-        if (self::$base === 26) {
-            return (int) ($x / $y);
-        }
-
-        // self::$base === 31
-        return ($x - ($x % $y)) / $y;
+        return array_map(fn ($val) => new static($val), $this->value->bitwise_split($split));
     }
 }
diff --git a/phpseclib/Math/BigInteger/Engines/BCMath.php b/phpseclib/Math/BigInteger/Engines/BCMath.php
new file mode 100644
index 000000000..f5bff15a7
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/BCMath.php
@@ -0,0 +1,606 @@
+<?php
+
+/**
+ * BCMath BigInteger Engine
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Exception\BadConfigurationException;
+
+/**
+ * BCMath Engine.
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class BCMath extends Engine
+{
+    /**
+     * Can Bitwise operations be done fast?
+     *
+     * @see parent::bitwise_leftRotate()
+     * @see parent::bitwise_rightRotate()
+     */
+    public const FAST_BITWISE = false;
+
+    /**
+     * Engine Directory
+     *
+     * @see parent::setModExpEngine
+     */
+    public const ENGINE_DIR = 'BCMath';
+
+    /**
+     * Test for engine validity
+     *
+     * @see parent::__construct()
+     */
+    public static function isValidEngine(): bool
+    {
+        return extension_loaded('bcmath');
+    }
+
+    /**
+     * Default constructor
+     *
+     * @param mixed $x integer Base-10 number or base-$base number if $base set.
+     * @see parent::__construct()
+     */
+    public function __construct($x = 0, int $base = 10)
+    {
+        if (!isset(static::$isValidEngine[static::class])) {
+            static::$isValidEngine[static::class] = self::isValidEngine();
+        }
+        if (!static::$isValidEngine[static::class]) {
+            throw new BadConfigurationException('BCMath is not setup correctly on this system');
+        }
+
+        $this->value = '0';
+
+        parent::__construct($x, $base);
+    }
+
+    /**
+     * Initialize a BCMath BigInteger Engine instance
+     *
+     * @see parent::__construct()
+     */
+    protected function initialize(int $base): void
+    {
+        switch (abs($base)) {
+            case 256:
+                // round $len to the nearest 4
+                $len = (strlen($this->value) + 3) & ~3;
+
+                $x = str_pad($this->value, $len, chr(0), STR_PAD_LEFT);
+
+                $this->value = '0';
+                for ($i = 0; $i < $len; $i += 4) {
+                    $this->value = bcmul($this->value, '4294967296', 0); // 4294967296 == 2**32
+                    $this->value = bcadd(
+                        $this->value,
+                        (string) (0x1000000 * ord($x[$i]) + ((ord($x[$i + 1]) << 16) | (ord($x[$i + 2]) << 8) | ord($x[$i + 3]))),
+                        0
+                    );
+                }
+
+                if ($this->is_negative) {
+                    $this->value = '-' . $this->value;
+                }
+                break;
+            case 16:
+                $x = (strlen($this->value) & 1) ? '0' . $this->value : $this->value;
+                $temp = new self(Strings::hex2bin($x), 256);
+                $this->value = $this->is_negative ? '-' . $temp->value : $temp->value;
+                $this->is_negative = false;
+                break;
+            case 10:
+                // explicitly casting $x to a string is necessary, here, since doing $x[0] on -1 yields different
+                // results then doing it on '-1' does (modInverse does $x[0])
+                $this->value = $this->value === '-' ? '0' : (string)$this->value;
+        }
+    }
+
+    /**
+     * Converts a BigInteger to a base-10 number.
+     */
+    public function toString(): string
+    {
+        if ($this->value === '0') {
+            return '0';
+        }
+
+        return ltrim($this->value, '0');
+    }
+
+    /**
+     * Converts a BigInteger to a byte string (eg. base-256).
+     */
+    public function toBytes(bool $twos_compliment = false): string
+    {
+        if ($twos_compliment) {
+            return $this->toBytesHelper();
+        }
+
+        $value = '';
+        $current = $this->value;
+
+        if ($current[0] == '-') {
+            $current = substr($current, 1);
+        }
+
+        while (bccomp($current, '0', 0) > 0) {
+            $temp = bcmod($current, '16777216');
+            $value = chr($temp >> 16) . chr($temp >> 8) . chr((int) $temp) . $value;
+            $current = bcdiv($current, '16777216', 0);
+        }
+
+        return $this->precision > 0 ?
+            substr(str_pad($value, $this->precision >> 3, chr(0), STR_PAD_LEFT), -($this->precision >> 3)) :
+            ltrim($value, chr(0));
+    }
+
+    /**
+     * Adds two BigIntegers.
+     */
+    public function add(BCMath $y): BCMath
+    {
+        $temp = new self();
+        $temp->value = bcadd($this->value, $y->value);
+
+        return $this->normalize($temp);
+    }
+
+    /**
+     * Subtracts two BigIntegers.
+     */
+    public function subtract(BCMath $y): BCMath
+    {
+        $temp = new self();
+        $temp->value = bcsub($this->value, $y->value);
+
+        return $this->normalize($temp);
+    }
+
+    /**
+     * Multiplies two BigIntegers.
+     */
+    public function multiply(BCMath $x): BCMath
+    {
+        $temp = new self();
+        $temp->value = bcmul($this->value, $x->value);
+
+        return $this->normalize($temp);
+    }
+
+    /**
+     * Divides two BigIntegers.
+     *
+     * Returns an array whose first element contains the quotient and whose second element contains the
+     * "common residue".  If the remainder would be positive, the "common residue" and the remainder are the
+     * same.  If the remainder would be negative, the "common residue" is equal to the sum of the remainder
+     * and the divisor (basically, the "common residue" is the first positive modulo).
+     *
+     * @return array{static, static}
+     */
+    public function divide(BCMath $y): array
+    {
+        $quotient = new self();
+        $remainder = new self();
+
+        $quotient->value = bcdiv($this->value, $y->value, 0);
+        $remainder->value = bcmod($this->value, $y->value);
+
+        if ($remainder->value[0] == '-') {
+            $remainder->value = bcadd($remainder->value, $y->value[0] == '-' ? substr($y->value, 1) : $y->value, 0);
+        }
+
+        return [$this->normalize($quotient), $this->normalize($remainder)];
+    }
+
+    /**
+     * Calculates modular inverses.
+     *
+     * Say you have (30 mod 17 * x mod 17) mod 17 == 1.  x can be found using modular inverses.
+     *
+     * @return false|BCMath
+     */
+    public function modInverse(BCMath $n)
+    {
+        return $this->modInverseHelper($n);
+    }
+
+    /**
+     * Calculates the greatest common divisor and Bezout's identity.
+     *
+     * Say you have 693 and 609.  The GCD is 21.  Bezout's identity states that there exist integers x and y such that
+     * 693*x + 609*y == 21.  In point of fact, there are actually an infinite number of x and y combinations and which
+     * combination is returned is dependent upon which mode is in use.  See
+     * {@link http://en.wikipedia.org/wiki/B%C3%A9zout%27s_identity Bezout's identity - Wikipedia} for more information.
+     *
+     * @return array{gcd: static, x: static, y: static}
+     */
+    public function extendedGCD(BCMath $n): array
+    {
+        // it might be faster to use the binary xGCD algorithim here, as well, but (1) that algorithim works
+        // best when the base is a power of 2 and (2) i don't think it'd make much difference, anyway.  as is,
+        // the basic extended euclidean algorithim is what we're using.
+
+        $u = $this->value;
+        $v = $n->value;
+
+        $a = '1';
+        $b = '0';
+        $c = '0';
+        $d = '1';
+
+        while (bccomp($v, '0', 0) != 0) {
+            $q = bcdiv($u, $v, 0);
+
+            $temp = $u;
+            $u = $v;
+            $v = bcsub($temp, bcmul($v, $q, 0), 0);
+
+            $temp = $a;
+            $a = $c;
+            $c = bcsub($temp, bcmul($a, $q, 0), 0);
+
+            $temp = $b;
+            $b = $d;
+            $d = bcsub($temp, bcmul($b, $q, 0), 0);
+        }
+
+        return [
+            'gcd' => $this->normalize(new static($u)),
+            'x' => $this->normalize(new static($a)),
+            'y' => $this->normalize(new static($b)),
+        ];
+    }
+
+    /**
+     * Calculates the greatest common divisor
+     *
+     * Say you have 693 and 609.  The GCD is 21.
+     */
+    public function gcd(BCMath $n): BCMath
+    {
+        ['gcd' => $gcd] = $this->extendedGCD($n);
+        return $gcd;
+    }
+
+    /**
+     * Absolute value.
+     */
+    public function abs(): BCMath
+    {
+        $temp = new static();
+        $temp->value = strlen($this->value) && $this->value[0] == '-' ?
+            substr($this->value, 1) :
+            $this->value;
+
+        return $temp;
+    }
+
+    /**
+     * Logical And
+     */
+    public function bitwise_and(BCMath $x): BCMath
+    {
+        return $this->bitwiseAndHelper($x);
+    }
+
+    /**
+     * Logical Or
+     */
+    public function bitwise_or(BCMath $x): BCMath
+    {
+        return $this->bitwiseOrHelper($x);
+    }
+
+    /**
+     * Logical Exclusive Or
+     */
+    public function bitwise_xor(BCMath $x): BCMath
+    {
+        return $this->bitwiseXorHelper($x);
+    }
+
+    /**
+     * Logical Right Shift
+     *
+     * Shifts BigInteger's by $shift bits, effectively dividing by 2**$shift.
+     */
+    public function bitwise_rightShift(int $shift): BCMath
+    {
+        $temp = new static();
+        $temp->value = bcdiv($this->value, bcpow('2', (string)$shift, 0), 0);
+
+        return $this->normalize($temp);
+    }
+
+    /**
+     * Logical Left Shift
+     *
+     * Shifts BigInteger's by $shift bits, effectively multiplying by 2**$shift.
+     */
+    public function bitwise_leftShift(int $shift): BCMath
+    {
+        $temp = new static();
+        $temp->value = bcmul($this->value, bcpow('2', (string) $shift, 0), 0);
+
+        return $this->normalize($temp);
+    }
+
+    /**
+     * Compares two numbers.
+     *
+     * Although one might think !$x->compare($y) means $x != $y, it, in fact, means the opposite.  The reason for this
+     * is demonstrated thusly:
+     *
+     * $x  > $y: $x->compare($y)  > 0
+     * $x  < $y: $x->compare($y)  < 0
+     * $x == $y: $x->compare($y) == 0
+     *
+     * Note how the same comparison operator is used.  If you want to test for equality, use $x->equals($y).
+     *
+     * {@internal Could return $this->subtract($x), but that's not as fast as what we do do.}
+     *
+     * @return int in case < 0 if $this is less than $y; > 0 if $this is greater than $y, and 0 if they are equal.
+     * @see self::equals()
+     */
+    public function compare(BCMath $y): int
+    {
+        return bccomp($this->value, $y->value, 0);
+    }
+
+    /**
+     * Tests the equality of two numbers.
+     *
+     * If you need to see if one number is greater than or less than another number, use BigInteger::compare()
+     */
+    public function equals(BCMath $x): bool
+    {
+        return $this->value == $x->value;
+    }
+
+    /**
+     * Performs modular exponentiation.
+     */
+    public function modPow(BCMath $e, BCMath $n): BCMath
+    {
+        return $this->powModOuter($e, $n);
+    }
+
+    /**
+     * Performs modular exponentiation.
+     *
+     * Alias for modPow().
+     */
+    public function powMod(BCMath $e, BCMath $n): BCMath
+    {
+        return $this->powModOuter($e, $n);
+    }
+
+    /**
+     * Performs modular exponentiation.
+     */
+    protected function powModInner(BCMath $e, BCMath $n): BCMath
+    {
+        try {
+            $class = static::$modexpEngine[static::class];
+            return $class::powModHelper($this, $e, $n, static::class);
+        } catch (\Exception $err) {
+            return BCMath\DefaultEngine::powModHelper($this, $e, $n, static::class);
+        }
+    }
+
+    /**
+     * Normalize
+     *
+     * Removes leading zeros and truncates (if necessary) to maintain the appropriate precision
+     */
+    protected function normalize(BCMath $result): BCMath
+    {
+        $result->precision = $this->precision;
+        $result->bitmask = $this->bitmask;
+
+        if ($result->bitmask !== false) {
+            $result->value = bcmod($result->value, $result->bitmask->value);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Generate a random prime number between a range
+     *
+     * If there's not a prime within the given range, false will be returned.
+     *
+     * @return false|BCMath
+     */
+    public static function randomRangePrime(BCMath $min, BCMath $max)
+    {
+        return self::randomRangePrimeOuter($min, $max);
+    }
+
+    /**
+     * Generate a random number between a range
+     *
+     * Returns a random number between $min and $max where $min and $max
+     * can be defined using one of the two methods:
+     *
+     * BigInteger::randomRange($min, $max)
+     * BigInteger::randomRange($max, $min)
+     */
+    public static function randomRange(BCMath $min, BCMath $max): BCMath
+    {
+        return self::randomRangeHelper($min, $max);
+    }
+
+    /**
+     * Make the current number odd
+     *
+     * If the current number is odd it'll be unchanged.  If it's even, one will be added to it.
+     *
+     * @see self::randomPrime()
+     */
+    protected function make_odd(): void
+    {
+        if (!$this->isOdd()) {
+            $this->value = bcadd($this->value, '1');
+        }
+    }
+
+    /**
+     * Test the number against small primes.
+     *
+     * @see self::isPrime()
+     */
+    protected function testSmallPrimes(): bool
+    {
+        if ($this->value === '1') {
+            return false;
+        }
+        if ($this->value === '2') {
+            return true;
+        }
+        if ($this->value[-1] % 2 == 0) {
+            return false;
+        }
+
+        $value = $this->value;
+
+        foreach (self::PRIMES as $prime) {
+            $r = bcmod($this->value, (string)$prime);
+            if ($r == '0') {
+                return $this->value == $prime;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Scan for 1 and right shift by that amount
+     *
+     * ie. $s = gmp_scan1($n, 0) and $r = gmp_div_q($n, gmp_pow(gmp_init('2'), $s));
+     *
+     * @see self::isPrime()
+     */
+    public static function scan1divide(BCMath $r): int
+    {
+        $r_value = &$r->value;
+        $s = 0;
+        // if $n was 1, $r would be 0 and this would be an infinite loop, hence our $this->equals(static::$one[static::class]) check earlier
+        while ($r_value[-1] % 2 == 0) {
+            $r_value = bcdiv($r_value, '2', 0);
+            ++$s;
+        }
+
+        return $s;
+    }
+
+    /**
+     * Performs exponentiation.
+     */
+    public function pow(BCMath $n): BCMath
+    {
+        $temp = new self();
+        $temp->value = bcpow($this->value, $n->value);
+
+        return $this->normalize($temp);
+    }
+
+    /**
+     * Return the minimum BigInteger between an arbitrary number of BigIntegers.
+     */
+    public static function min(BCMath ...$nums): BCMath
+    {
+        return self::minHelper($nums);
+    }
+
+    /**
+     * Return the maximum BigInteger between an arbitrary number of BigIntegers.
+     */
+    public static function max(BCMath ...$nums): BCMath
+    {
+        return self::maxHelper($nums);
+    }
+
+    /**
+     * Tests BigInteger to see if it is between two integers, inclusive
+     */
+    public function between(BCMath $min, BCMath $max): bool
+    {
+        return $this->compare($min) >= 0 && $this->compare($max) <= 0;
+    }
+
+    /**
+     * Set Bitmask
+     *
+     * @see self::setPrecision()
+     */
+    protected static function setBitmask(int $bits): Engine
+    {
+        $temp = parent::setBitmask($bits);
+        return $temp->add(static::$one[static::class]);
+    }
+
+    /**
+     * Is Odd?
+     */
+    public function isOdd(): bool
+    {
+        return $this->value[-1] % 2 == 1;
+    }
+
+    /**
+     * Tests if a bit is set
+     */
+    public function testBit($x): bool
+    {
+        return bccomp(
+            bcmod($this->value, bcpow('2', $x + 1, 0)),
+            bcpow('2', $x, 0),
+            0
+        ) >= 0;
+    }
+
+    /**
+     * Is Negative?
+     */
+    public function isNegative(): bool
+    {
+        return strlen($this->value) && $this->value[0] == '-';
+    }
+
+    /**
+     * Negate
+     *
+     * Given $k, returns -$k
+     */
+    public function negate(): BCMath
+    {
+        $temp = clone $this;
+
+        if (!strlen($temp->value)) {
+            return $temp;
+        }
+
+        $temp->value = $temp->value[0] == '-' ?
+            substr($this->value, 1) :
+            '-' . $this->value;
+
+        return $temp;
+    }
+}
diff --git a/phpseclib/Math/BigInteger/Engines/BCMath/Base.php b/phpseclib/Math/BigInteger/Engines/BCMath/Base.php
new file mode 100644
index 000000000..7bca0b290
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/BCMath/Base.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * Modular Exponentiation Engine
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines\BCMath;
+
+use phpseclib3\Math\BigInteger\Engines\BCMath;
+
+/**
+ * Sliding Window Exponentiation Engine
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Base extends BCMath
+{
+    /**
+     * Cache constants
+     *
+     * $cache[self::VARIABLE] tells us whether or not the cached data is still valid.
+     */
+    public const VARIABLE = 0;
+    /**
+     * $cache[self::DATA] contains the cached data.
+     */
+    public const DATA = 1;
+
+    /**
+     * Test for engine validity
+     */
+    public static function isValidEngine(): bool
+    {
+        return static::class != __CLASS__;
+    }
+
+    /**
+     * Performs modular exponentiation.
+     */
+    protected static function powModHelper(BCMath $x, BCMath $e, BCMath $n, string $class): BCMath
+    {
+        if (empty($e->value)) {
+            $temp = new $class();
+            $temp->value = '1';
+            return $x->normalize($temp);
+        }
+
+        return $x->normalize(static::slidingWindow($x, $e, $n, $class));
+    }
+
+    /**
+     * Modular reduction preparation
+     *
+     * @see self::slidingWindow()
+     */
+    protected static function prepareReduce(string $x, string $n, string $class): string
+    {
+        return static::reduce($x, $n);
+    }
+
+    /**
+     * Modular multiply
+     *
+     * @see self::slidingWindow()
+     */
+    protected static function multiplyReduce(string $x, string $y, string $n, string $class): string
+    {
+        return static::reduce(bcmul($x, $y), $n);
+    }
+
+    /**
+     * Modular square
+     *
+     * @see self::slidingWindow()
+     */
+    protected static function squareReduce(string $x, string $n, string $class): string
+    {
+        return static::reduce(bcmul($x, $x), $n);
+    }
+}
diff --git a/phpseclib/Math/BigInteger/Engines/BCMath/BuiltIn.php b/phpseclib/Math/BigInteger/Engines/BCMath/BuiltIn.php
new file mode 100644
index 000000000..fede15de7
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/BCMath/BuiltIn.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Built-In BCMath Modular Exponentiation Engine
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines\BCMath;
+
+use phpseclib3\Math\BigInteger\Engines\BCMath;
+
+/**
+ * Built-In BCMath Modular Exponentiation Engine
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class BuiltIn extends BCMath
+{
+    /**
+     * Performs modular exponentiation.
+     */
+    protected static function powModHelper(BCMath $x, BCMath $e, BCMath $n): BCMath
+    {
+        $temp = new BCMath();
+        $temp->value = bcpowmod($x->value, $e->value, $n->value);
+
+        return $x->normalize($temp);
+    }
+}
diff --git a/phpseclib/Math/BigInteger/Engines/BCMath/DefaultEngine.php b/phpseclib/Math/BigInteger/Engines/BCMath/DefaultEngine.php
new file mode 100644
index 000000000..cda01c8a1
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/BCMath/DefaultEngine.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * BCMath Default Modular Exponentiation Engine
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines\BCMath;
+
+use phpseclib3\Math\BigInteger\Engines\BCMath\Reductions\Barrett;
+
+/**
+ * PHP Default Modular Exponentiation Engine
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class DefaultEngine extends Barrett
+{
+}
diff --git a/phpseclib/Math/BigInteger/Engines/BCMath/OpenSSL.php b/phpseclib/Math/BigInteger/Engines/BCMath/OpenSSL.php
new file mode 100644
index 000000000..44762836f
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/BCMath/OpenSSL.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * OpenSSL Modular Exponentiation Engine
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines\BCMath;
+
+use phpseclib3\Math\BigInteger\Engines\OpenSSL as Progenitor;
+
+/**
+ * OpenSSL Modular Exponentiation Engine
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class OpenSSL extends Progenitor
+{
+}
diff --git a/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/Barrett.php b/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/Barrett.php
new file mode 100644
index 000000000..23b56a7c5
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/Barrett.php
@@ -0,0 +1,189 @@
+<?php
+
+/**
+ * BCMath Barrett Modular Exponentiation Engine
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines\BCMath\Reductions;
+
+use phpseclib3\Math\BigInteger\Engines\BCMath\Base;
+
+/**
+ * PHP Barrett Modular Exponentiation Engine
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Barrett extends Base
+{
+    /**
+     * Cache constants
+     *
+     * $cache[self::VARIABLE] tells us whether or not the cached data is still valid.
+     */
+    public const VARIABLE = 0;
+    /**
+     * $cache[self::DATA] contains the cached data.
+     */
+    public const DATA = 1;
+
+    /**
+     * Barrett Modular Reduction
+     *
+     * See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=14 HAC 14.3.3} /
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=165 MPM 6.2.5} for more information.  Modified slightly,
+     * so as not to require negative numbers (initially, this script didn't support negative numbers).
+     *
+     * Employs "folding", as described at
+     * {@link http://www.cosic.esat.kuleuven.be/publications/thesis-149.pdf#page=66 thesis-149.pdf#page=66}.  To quote from
+     * it, "the idea [behind folding] is to find a value x' such that x (mod m) = x' (mod m), with x' being smaller than x."
+     *
+     * Unfortunately, the "Barrett Reduction with Folding" algorithm described in thesis-149.pdf is not, as written, all that
+     * usable on account of (1) its not using reasonable radix points as discussed in
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=162 MPM 6.2.2} and (2) the fact that, even with reasonable
+     * radix points, it only works when there are an even number of digits in the denominator.  The reason for (2) is that
+     * (x >> 1) + (x >> 1) != x / 2 + x / 2.  If x is even, they're the same, but if x is odd, they're not.  See the in-line
+     * comments for details.
+     */
+    protected static function reduce(string $n, string $m): string
+    {
+        static $cache = [
+            self::VARIABLE => [],
+            self::DATA => [],
+        ];
+
+        $m_length = strlen($m);
+
+        if (strlen($n) > 2 * $m_length) {
+            return bcmod($n, $m);
+        }
+
+        // if (m.length >> 1) + 2 <= m.length then m is too small and n can't be reduced
+        if ($m_length < 5) {
+            return self::regularBarrett($n, $m);
+        }
+        // n = 2 * m.length
+        $correctionNeeded = false;
+        if ($m_length & 1) {
+            $correctionNeeded = true;
+            $n .= '0';
+            $m .= '0';
+            $m_length++;
+        }
+
+        if (($key = array_search($m, $cache[self::VARIABLE])) === false) {
+            $key = count($cache[self::VARIABLE]);
+            $cache[self::VARIABLE][] = $m;
+
+            $lhs = '1' . str_repeat('0', $m_length + ($m_length >> 1));
+            $u = bcdiv($lhs, $m, 0);
+            $m1 = bcsub($lhs, bcmul($u, $m));
+
+            $cache[self::DATA][] = [
+                'u' => $u, // m.length >> 1 (technically (m.length >> 1) + 1)
+                'm1' => $m1, // m.length
+            ];
+        } else {
+            [
+                'u' => $u,
+                'm1' => $m1
+            ] = $cache[self::DATA][$key];
+        }
+
+        $cutoff = $m_length + ($m_length >> 1);
+
+        $lsd = substr($n, -$cutoff);
+        $msd = substr($n, 0, -$cutoff);
+
+        $temp = bcmul($msd, $m1); // m.length + (m.length >> 1)
+        $n = bcadd($lsd, $temp); // m.length + (m.length >> 1) + 1 (so basically we're adding two same length numbers)
+        //if ($m_length & 1) {
+        //    return self::regularBarrett($n, $m);
+        //}
+
+        // (m.length + (m.length >> 1) + 1) - (m.length - 1) == (m.length >> 1) + 2
+        $temp = substr($n, 0, -$m_length + 1);
+        // if even: ((m.length >> 1) + 2) + (m.length >> 1) == m.length + 2
+        // if odd:  ((m.length >> 1) + 2) + (m.length >> 1) == (m.length - 1) + 2 == m.length + 1
+        $temp = bcmul($temp, $u);
+        // if even: (m.length + 2) - ((m.length >> 1) + 1) = m.length - (m.length >> 1) + 1
+        // if odd:  (m.length + 1) - ((m.length >> 1) + 1) = m.length - (m.length >> 1)
+        $temp = substr($temp, 0, -($m_length >> 1) - 1);
+        // if even: (m.length - (m.length >> 1) + 1) + m.length = 2 * m.length - (m.length >> 1) + 1
+        // if odd:  (m.length - (m.length >> 1)) + m.length     = 2 * m.length - (m.length >> 1)
+        $temp = bcmul($temp, $m);
+
+        // at this point, if m had an odd number of digits, we'd be subtracting a 2 * m.length - (m.length >> 1) digit
+        // number from a m.length + (m.length >> 1) + 1 digit number.  ie. there'd be an extra digit and the while loop
+        // following this comment would loop a lot (hence our calling _regularBarrett() in that situation).
+
+        $result = bcsub($n, $temp);
+
+        //if (bccomp($result, '0') < 0) {
+        if ($result[0] == '-') {
+            $temp = '1' . str_repeat('0', $m_length + 1);
+            $result = bcadd($result, $temp);
+        }
+
+        while (bccomp($result, $m) >= 0) {
+            $result = bcsub($result, $m);
+        }
+
+        return $correctionNeeded ? substr($result, 0, -1) : $result;
+    }
+
+    /**
+     * (Regular) Barrett Modular Reduction
+     *
+     * For numbers with more than four digits BigInteger::_barrett() is faster.  The difference between that and this
+     * is that this function does not fold the denominator into a smaller form.
+     */
+    private static function regularBarrett(string $x, string $n): string
+    {
+        static $cache = [
+            self::VARIABLE => [],
+            self::DATA => [],
+        ];
+
+        $n_length = strlen($n);
+
+        if (strlen($x) > 2 * $n_length) {
+            return bcmod($x, $n);
+        }
+
+        if (($key = array_search($n, $cache[self::VARIABLE])) === false) {
+            $key = count($cache[self::VARIABLE]);
+            $cache[self::VARIABLE][] = $n;
+            $lhs = '1' . str_repeat('0', 2 * $n_length);
+            $cache[self::DATA][] = bcdiv($lhs, $n, 0);
+        }
+
+        $temp = substr($x, 0, -$n_length + 1);
+        $temp = bcmul($temp, $cache[self::DATA][$key]);
+        $temp = substr($temp, 0, -$n_length - 1);
+
+        $r1 = substr($x, -$n_length - 1);
+        $r2 = substr(bcmul($temp, $n), -$n_length - 1);
+        $result = bcsub($r1, $r2);
+
+        //if (bccomp($result, '0') < 0) {
+        if ($result[0] == '-') {
+            $q = '1' . str_repeat('0', $n_length + 1);
+            $result = bcadd($result, $q);
+        }
+
+        while (bccomp($result, $n) >= 0) {
+            $result = bcsub($result, $n);
+        }
+
+        return $result;
+    }
+}
diff --git a/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/EvalBarrett.php b/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/EvalBarrett.php
new file mode 100644
index 000000000..a703ea567
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/EvalBarrett.php
@@ -0,0 +1,104 @@
+<?php
+
+/**
+ * BCMath Dynamic Barrett Modular Exponentiation Engine
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines\BCMath\Reductions;
+
+use phpseclib3\Math\BigInteger\Engines\BCMath;
+use phpseclib3\Math\BigInteger\Engines\BCMath\Base;
+
+/**
+ * PHP Barrett Modular Exponentiation Engine
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class EvalBarrett extends Base
+{
+    /**
+     * Custom Reduction Function
+     *
+     * @see self::generateCustomReduction
+     */
+    private static $custom_reduction;
+
+    /**
+     * Barrett Modular Reduction
+     *
+     * This calls a dynamically generated loop unrolled function that's specific to a given modulo.
+     * Array lookups are avoided as are if statements testing for how many bits the host OS supports, etc.
+     */
+    protected static function reduce(string $n, string $m): string
+    {
+        $inline = self::$custom_reduction;
+        return $inline($n);
+    }
+
+    /**
+     * Generate Custom Reduction
+     *
+     * @return callable|void
+     */
+    protected static function generateCustomReduction(BCMath $m, string $class)
+    {
+        $m_length = strlen($m);
+
+        if ($m_length < 5) {
+            $code = 'return bcmod($x, $n);';
+            eval('$func = function ($n) { ' . $code . '};');
+            self::$custom_reduction = $func;
+            return;
+        }
+
+        $lhs = '1' . str_repeat('0', $m_length + ($m_length >> 1));
+        $u = bcdiv($lhs, $m, 0);
+        $m1 = bcsub($lhs, bcmul($u, $m));
+
+        $cutoff = $m_length + ($m_length >> 1);
+
+        $m = "'$m'";
+        $u = "'$u'";
+        $m1 = "'$m1'";
+
+        $code = '
+            $lsd = substr($n, -' . $cutoff . ');
+            $msd = substr($n, 0, -' . $cutoff . ');
+
+            $temp = bcmul($msd, ' . $m1 . ');
+            $n = bcadd($lsd, $temp);
+
+            $temp = substr($n, 0, ' . (-$m_length + 1) . ');
+            $temp = bcmul($temp, ' . $u . ');
+            $temp = substr($temp, 0, ' . (-($m_length >> 1) - 1) . ');
+            $temp = bcmul($temp, ' . $m . ');
+
+            $result = bcsub($n, $temp);
+
+            if ($result[0] == \'-\') {
+                $temp = \'1' . str_repeat('0', $m_length + 1) . '\';
+                $result = bcadd($result, $temp);
+            }
+
+            while (bccomp($result, ' . $m . ') >= 0) {
+                $result = bcsub($result, ' . $m . ');
+            }
+
+            return $result;';
+
+        eval('$func = function ($n) { ' . $code . '};');
+
+        self::$custom_reduction = $func;
+
+        return $func;
+    }
+}
diff --git a/phpseclib/Math/BigInteger/Engines/Engine.php b/phpseclib/Math/BigInteger/Engines/Engine.php
new file mode 100644
index 000000000..5b141548d
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/Engine.php
@@ -0,0 +1,1207 @@
+<?php
+
+/**
+ * Base BigInteger Engine
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Random;
+use phpseclib3\Exception\BadConfigurationException;
+use phpseclib3\Exception\InvalidArgumentException;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * Base Engine.
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Engine implements \JsonSerializable
+{
+    /* final */ protected const PRIMES = [
+        3,   5,   7,   11,  13,  17,  19,  23,  29,  31,  37,  41,  43,  47,  53,  59,
+        61,  67,  71,  73,  79,  83,  89,  97,  101, 103, 107, 109, 113, 127, 131, 137,
+        139, 149, 151, 157, 163, 167, 173, 179, 181, 191, 193, 197, 199, 211, 223, 227,
+        229, 233, 239, 241, 251, 257, 263, 269, 271, 277, 281, 283, 293, 307, 311, 313,
+        317, 331, 337, 347, 349, 353, 359, 367, 373, 379, 383, 389, 397, 401, 409, 419,
+        421, 431, 433, 439, 443, 449, 457, 461, 463, 467, 479, 487, 491, 499, 503, 509,
+        521, 523, 541, 547, 557, 563, 569, 571, 577, 587, 593, 599, 601, 607, 613, 617,
+        619, 631, 641, 643, 647, 653, 659, 661, 673, 677, 683, 691, 701, 709, 719, 727,
+        733, 739, 743, 751, 757, 761, 769, 773, 787, 797, 809, 811, 821, 823, 827, 829,
+        839, 853, 857, 859, 863, 877, 881, 883, 887, 907, 911, 919, 929, 937, 941, 947,
+        953, 967, 971, 977, 983, 991, 997,
+    ];
+
+    /**
+     * BigInteger(0)
+     *
+     * @var array<class-string<static>, static>
+     */
+    protected static $zero = [];
+
+    /**
+     * BigInteger(1)
+     *
+     * @var array<class-string<static>, static>
+     */
+    protected static $one  = [];
+
+    /**
+     * BigInteger(2)
+     *
+     * @var array<class-string<static>, static>
+     */
+    protected static $two = [];
+
+    /**
+     * Modular Exponentiation Engine
+     *
+     * @var array<class-string<static>, class-string<static>>
+     */
+    protected static $modexpEngine;
+
+    /**
+     * Engine Validity Flag
+     *
+     * @var array<class-string<static>, bool>
+     */
+    protected static $isValidEngine;
+
+    /**
+     * Holds the BigInteger's value
+     *
+     * @var \GMP|string|array|int
+     */
+    protected $value;
+
+    /**
+     * Holds the BigInteger's sign
+     *
+     * @var bool
+     */
+    protected $is_negative = false;
+
+    /**
+     * Precision
+     *
+     * @see static::setPrecision()
+     * @var int
+     */
+    protected $precision = -1;
+
+    /**
+     * Precision Bitmask
+     *
+     * @see static::setPrecision()
+     * @var static|false
+     */
+    protected $bitmask = false;
+
+    /**
+     * Recurring Modulo Function
+     *
+     * @var callable
+     */
+    protected $reduce;
+
+    /**
+     * Mode independent value used for serialization.
+     *
+     * @see self::__sleep()
+     * @see self::__wakeup()
+     * @var string
+     */
+    protected $hex;
+
+    /**
+     * Default constructor
+     *
+     * @param int|numeric-string $x integer Base-10 number or base-$base number if $base set.
+     */
+    public function __construct($x = 0, int $base = 10)
+    {
+        if (!array_key_exists(static::class, static::$zero)) {
+            static::$zero[static::class] = null; // Placeholder to prevent infinite loop.
+            static::$zero[static::class] = new static(0);
+            static::$one[static::class] = new static(1);
+            static::$two[static::class] = new static(2);
+        }
+
+        // '0' counts as empty() but when the base is 256 '0' is equal to ord('0') or 48
+        // '0' is the only value like this per http://php.net/empty
+        if (empty($x) && (abs($base) != 256 || $x !== '0')) {
+            return;
+        }
+
+        switch ($base) {
+            case -256:
+            case 256:
+                if ($base == -256 && (ord($x[0]) & 0x80)) {
+                    $this->value = ~$x;
+                    $this->is_negative = true;
+                } else {
+                    $this->value = $x;
+                    $this->is_negative = false;
+                }
+
+                $this->initialize($base);
+
+                if ($this->is_negative) {
+                    $temp = $this->add(new static('-1'));
+                    $this->value = $temp->value;
+                }
+                break;
+            case -16:
+            case 16:
+                if ($base > 0 && $x[0] == '-') {
+                    $this->is_negative = true;
+                    $x = substr($x, 1);
+                }
+
+                $x = preg_replace('#^(?:0x)?([A-Fa-f0-9]*).*#s', '$1', $x);
+
+                $is_negative = false;
+                if ($base < 0 && hexdec($x[0]) >= 8) {
+                    $this->is_negative = $is_negative = true;
+                    $x = Strings::bin2hex(~Strings::hex2bin($x));
+                }
+
+                $this->value = $x;
+                $this->initialize($base);
+
+                if ($is_negative) {
+                    $temp = $this->add(new static('-1'));
+                    $this->value = $temp->value;
+                }
+                break;
+            case -10:
+            case 10:
+                // (?<!^)(?:-).*: find any -'s that aren't at the beginning and then any characters that follow that
+                // (?<=^|-)0*: find any 0's that are preceded by the start of the string or by a - (ie. octals)
+                // [^-0-9].*: find any non-numeric characters and then any characters that follow that
+                $this->value = preg_replace('#(?<!^)-.*|(?<=^|-)0*|[^-0-9].*#s', '', (string) $x);
+                if (!strlen($this->value) || $this->value == '-') {
+                    $this->value = '0';
+                }
+                $this->initialize($base);
+                break;
+            case -2:
+            case 2:
+                if ($base > 0 && $x[0] == '-') {
+                    $this->is_negative = true;
+                    $x = substr($x, 1);
+                }
+
+                $x = preg_replace('#^([01]*).*#s', '$1', $x);
+
+                $temp = new static(Strings::bits2bin($x), 128 * $base); // ie. either -16 or +16
+                $this->value = $temp->value;
+                if ($temp->is_negative) {
+                    $this->is_negative = true;
+                }
+
+                break;
+            default:
+                // base not supported, so we'll let $this == 0
+        }
+    }
+
+    /**
+     * Sets engine type.
+     *
+     * Throws an exception if the type is invalid
+     *
+     * @param class-string<Engine> $engine
+     */
+    public static function setModExpEngine(string $engine): void
+    {
+        $fqengine = '\\phpseclib3\\Math\\BigInteger\\Engines\\' . static::ENGINE_DIR . '\\' . $engine;
+        if (!class_exists($fqengine) || !method_exists($fqengine, 'isValidEngine')) {
+            throw new InvalidArgumentException("$engine is not a valid engine");
+        }
+        if (!$fqengine::isValidEngine()) {
+            throw new BadConfigurationException("$engine is not setup correctly on this system");
+        }
+        static::$modexpEngine[static::class] = $fqengine;
+    }
+
+    /**
+     * Converts a BigInteger to a byte string (eg. base-256).
+     *
+     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
+     * saved as two's compliment.
+     */
+    protected function toBytesHelper(): string
+    {
+        $comparison = $this->compare(new static());
+        if ($comparison == 0) {
+            return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
+        }
+
+        $temp = $comparison < 0 ? $this->add(new static(1)) : $this;
+        $bytes = $temp->toBytes();
+
+        if (!strlen($bytes)) { // eg. if the number we're trying to convert is -1
+            $bytes = chr(0);
+        }
+
+        if (ord($bytes[0]) & 0x80) {
+            $bytes = chr(0) . $bytes;
+        }
+
+        return $comparison < 0 ? ~$bytes : $bytes;
+    }
+
+    /**
+     * Converts a BigInteger to a hex string (eg. base-16).
+     */
+    public function toHex(bool $twos_compliment = false): string
+    {
+        return Strings::bin2hex($this->toBytes($twos_compliment));
+    }
+
+    /**
+     * Converts a BigInteger to a bit string (eg. base-2).
+     *
+     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
+     * saved as two's compliment.
+     */
+    public function toBits(bool $twos_compliment = false): string
+    {
+        $hex = $this->toBytes($twos_compliment);
+        $bits = Strings::bin2bits($hex);
+
+        $result = $this->precision > 0 ? substr($bits, -$this->precision) : ltrim($bits, '0');
+
+        if ($twos_compliment && $this->compare(new static()) > 0 && $this->precision <= 0) {
+            return '0' . $result;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Calculates modular inverses.
+     *
+     * Say you have (30 mod 17 * x mod 17) mod 17 == 1.  x can be found using modular inverses.
+     *
+     * {@internal See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=21 HAC 14.64} for more information.}
+     *
+     * @return static|false
+     */
+    protected function modInverseHelper(Engine $n)
+    {
+        // $x mod -$n == $x mod $n.
+        $n = $n->abs();
+
+        if ($this->compare(static::$zero[static::class]) < 0) {
+            $temp = $this->abs();
+            $temp = $temp->modInverse($n);
+            return $this->normalize($n->subtract($temp));
+        }
+
+        ['gcd' => $gcd, 'x' => $x] = $this->extendedGCD($n);
+
+        if (!$gcd->equals(static::$one[static::class])) {
+            return false;
+        }
+
+        $x = $x->compare(static::$zero[static::class]) < 0 ? $x->add($n) : $x;
+
+        return $this->compare(static::$zero[static::class]) < 0 ? $this->normalize($n->subtract($x)) : $this->normalize($x);
+    }
+
+    /**
+     * Serialize
+     *
+     * Will be called, automatically, when serialize() is called on a BigInteger object.
+     *
+     * @return array
+     */
+    public function __sleep()
+    {
+        $this->hex = $this->toHex(true);
+        $vars = ['hex'];
+        if ($this->precision > 0) {
+            $vars[] = 'precision';
+        }
+        return $vars;
+    }
+
+    /**
+     * Serialize
+     *
+     * Will be called, automatically, when unserialize() is called on a BigInteger object.
+     */
+    public function __wakeup(): void
+    {
+        $temp = new static($this->hex, -16);
+        $this->value = $temp->value;
+        $this->is_negative = $temp->is_negative;
+        if ($this->precision > 0) {
+            // recalculate $this->bitmask
+            $this->setPrecision($this->precision);
+        }
+    }
+
+    /**
+     * JSON Serialize
+     *
+     * Will be called, automatically, when json_encode() is called on a BigInteger object.
+     *
+     * @return array{hex: string, precision?: int]
+     */
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize(): array
+    {
+        $result = ['hex' => $this->toHex(true)];
+        if ($this->precision > 0) {
+            $result['precision'] = $this->precision;
+        }
+        return $result;
+    }
+
+    /**
+     * Converts a BigInteger to a base-10 number.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->toString();
+    }
+
+    /**
+     *  __debugInfo() magic method
+     *
+     * Will be called, automatically, when print_r() or var_dump() are called
+     *
+     * @return array
+     */
+    public function __debugInfo()
+    {
+        $result = [
+            'value' => '0x' . $this->toHex(true),
+            'engine' => basename(static::class),
+        ];
+        return $this->precision > 0 ? $result + ['precision' => $this->precision] : $result;
+    }
+
+    /**
+     * Set Precision
+     *
+     * Some bitwise operations give different results depending on the precision being used.  Examples include left
+     * shift, not, and rotates.
+     */
+    public function setPrecision(int $bits): void
+    {
+        if ($bits < 1) {
+            $this->precision = -1;
+            $this->bitmask = false;
+
+            return;
+        }
+        $this->precision = $bits;
+        $this->bitmask = static::setBitmask($bits);
+
+        $temp = $this->normalize($this);
+        $this->value = $temp->value;
+    }
+
+    /**
+     * Get Precision
+     *
+     * Returns the precision if it exists, -1 if it doesn't
+     */
+    public function getPrecision(): int
+    {
+        return $this->precision;
+    }
+
+    /**
+     * Set Bitmask
+     *
+     * @return static
+     * @see self::setPrecision()
+     */
+    protected static function setBitmask(int $bits): Engine
+    {
+        return new static(chr((1 << ($bits & 0x7)) - 1) . str_repeat(chr(0xFF), $bits >> 3), 256);
+    }
+
+    /**
+     * Logical Not
+     *
+     * @return Engine|string
+     */
+    public function bitwise_not()
+    {
+        // calculuate "not" without regard to $this->precision
+        // (will always result in a smaller number.  ie. ~1 isn't 1111 1110 - it's 0)
+        $temp = $this->toBytes();
+        if ($temp == '') {
+            return $this->normalize(static::$zero[static::class]);
+        }
+        $pre_msb = decbin(ord($temp[0]));
+        $temp = ~$temp;
+        $msb = decbin(ord($temp[0]));
+        if (strlen($msb) == 8) {
+            $msb = substr($msb, strpos($msb, '0'));
+        }
+        $temp[0] = chr(bindec($msb));
+
+        // see if we need to add extra leading 1's
+        $current_bits = strlen($pre_msb) + 8 * strlen($temp) - 8;
+        $new_bits = $this->precision - $current_bits;
+        if ($new_bits <= 0) {
+            return $this->normalize(new static($temp, 256));
+        }
+
+        // generate as many leading 1's as we need to.
+        $leading_ones = chr((1 << ($new_bits & 0x7)) - 1) . str_repeat(chr(0xFF), $new_bits >> 3);
+
+        self::base256_lshift($leading_ones, $current_bits);
+
+        $temp = str_pad($temp, strlen($leading_ones), chr(0), STR_PAD_LEFT);
+
+        return $this->normalize(new static($leading_ones | $temp, 256));
+    }
+
+    /**
+     * Logical Left Shift
+     *
+     * Shifts binary strings $shift bits, essentially multiplying by 2**$shift.
+     */
+    protected static function base256_lshift(string &$x, int $shift): void
+    {
+        if ($shift == 0) {
+            return;
+        }
+
+        $num_bytes = $shift >> 3; // eg. floor($shift/8)
+        $shift &= 7; // eg. $shift % 8
+
+        $carry = 0;
+        for ($i = strlen($x) - 1; $i >= 0; --$i) {
+            $temp = ord($x[$i]) << $shift | $carry;
+            $x[$i] = chr($temp);
+            $carry = $temp >> 8;
+        }
+        $carry = ($carry != 0) ? chr($carry) : '';
+        $x = $carry . $x . str_repeat(chr(0), $num_bytes);
+    }
+
+    /**
+     * Logical Left Rotate
+     *
+     * Instead of the top x bits being dropped they're appended to the shifted bit string.
+     */
+    public function bitwise_leftRotate(int $shift): Engine
+    {
+        $bits = $this->toBytes();
+
+        if ($this->precision > 0) {
+            $precision = $this->precision;
+            if (static::FAST_BITWISE) {
+                $mask = $this->bitmask->toBytes();
+            } else {
+                $mask = $this->bitmask->subtract(new static(1));
+                $mask = $mask->toBytes();
+            }
+        } else {
+            $temp = ord($bits[0]);
+            for ($i = 0; $temp >> $i; ++$i) {
+            }
+            $precision = 8 * strlen($bits) - 8 + $i;
+            $mask = chr((1 << ($precision & 0x7)) - 1) . str_repeat(chr(0xFF), $precision >> 3);
+        }
+
+        if ($shift < 0) {
+            $shift += $precision;
+        }
+        $shift %= $precision;
+
+        if (!$shift) {
+            return clone $this;
+        }
+
+        $left = $this->bitwise_leftShift($shift);
+        $left = $left->bitwise_and(new static($mask, 256));
+        $right = $this->bitwise_rightShift($precision - $shift);
+        $result = static::FAST_BITWISE ? $left->bitwise_or($right) : $left->add($right);
+        return $this->normalize($result);
+    }
+
+    /**
+     * Logical Right Rotate
+     *
+     * Instead of the bottom x bits being dropped they're prepended to the shifted bit string.
+     */
+    public function bitwise_rightRotate(int $shift): Engine
+    {
+        return $this->bitwise_leftRotate(-$shift);
+    }
+
+    /**
+     * Returns the smallest and largest n-bit number
+     *
+     * @return array{min: static, max: static}
+     */
+    public static function minMaxBits(int $bits): array
+    {
+        $bytes = $bits >> 3;
+        $min = str_repeat(chr(0), $bytes);
+        $max = str_repeat(chr(0xFF), $bytes);
+        $msb = $bits & 7;
+        if ($msb) {
+            $min = chr(1 << ($msb - 1)) . $min;
+            $max = chr((1 << $msb) - 1) . $max;
+        } else {
+            $min[0] = chr(0x80);
+        }
+        return [
+            'min' => new static($min, 256),
+            'max' => new static($max, 256),
+        ];
+    }
+
+    /**
+     * Return the size of a BigInteger in bits
+     */
+    public function getLength(): int
+    {
+        return strlen($this->toBits());
+    }
+
+    /**
+     * Return the size of a BigInteger in bytes
+     */
+    public function getLengthInBytes(): int
+    {
+        return (int) ceil($this->getLength() / 8);
+    }
+
+    /**
+     * Performs some pre-processing for powMod
+     *
+     * @return static|false
+     */
+    protected function powModOuter(Engine $e, Engine $n)
+    {
+        $n = $this->bitmask !== false && $this->bitmask->compare($n) < 0 ? $this->bitmask : $n->abs();
+
+        if ($e->compare(new static()) < 0) {
+            $e = $e->abs();
+
+            $temp = $this->modInverse($n);
+            if ($temp === false) {
+                return false;
+            }
+
+            return $this->normalize($temp->powModInner($e, $n));
+        }
+
+        if ($this->compare($n) > 0) {
+            [, $temp] = $this->divide($n);
+            return $temp->powModInner($e, $n);
+        }
+
+        return $this->powModInner($e, $n);
+    }
+
+    /**
+     * Sliding Window k-ary Modular Exponentiation
+     *
+     * Based on {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=27 HAC 14.85} /
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=210 MPM 7.7}.  In a departure from those algorithims,
+     * however, this function performs a modular reduction after every multiplication and squaring operation.
+     * As such, this function has the same preconditions that the reductions being used do.
+     *
+     * @template T of Engine
+     * @param class-string<T> $class
+     * @return T
+     */
+    protected static function slidingWindow(Engine $x, Engine $e, Engine $n, string $class)
+    {
+        static $window_ranges = [7, 25, 81, 241, 673, 1793]; // from BigInteger.java's oddModPow function
+        //static $window_ranges = [0, 7, 36, 140, 450, 1303, 3529]; // from MPM 7.3.1
+
+        $e_bits = $e->toBits();
+        $e_length = strlen($e_bits);
+
+        // calculate the appropriate window size.
+        // $window_size == 3 if $window_ranges is between 25 and 81, for example.
+        for ($i = 0, $window_size = 1; $i < count($window_ranges) && $e_length > $window_ranges[$i]; ++$window_size, ++$i) {
+        }
+
+        $n_value = $n->value;
+
+        if (method_exists(static::class, 'generateCustomReduction')) {
+            static::generateCustomReduction($n, $class);
+        }
+
+        // precompute $this^0 through $this^$window_size
+        $powers = [];
+        $powers[1] = static::prepareReduce($x->value, $n_value, $class);
+        $powers[2] = static::squareReduce($powers[1], $n_value, $class);
+
+        // we do every other number since substr($e_bits, $i, $j+1) (see below) is supposed to end
+        // in a 1.  ie. it's supposed to be odd.
+        $temp = 1 << ($window_size - 1);
+        for ($i = 1; $i < $temp; ++$i) {
+            $i2 = $i << 1;
+            $powers[$i2 + 1] = static::multiplyReduce($powers[$i2 - 1], $powers[2], $n_value, $class);
+        }
+
+        $result = new $class(1);
+        $result = static::prepareReduce($result->value, $n_value, $class);
+
+        for ($i = 0; $i < $e_length;) {
+            if (!$e_bits[$i]) {
+                $result = static::squareReduce($result, $n_value, $class);
+                ++$i;
+            } else {
+                for ($j = $window_size - 1; $j > 0; --$j) {
+                    if (!empty($e_bits[$i + $j])) {
+                        break;
+                    }
+                }
+
+                // eg. the length of substr($e_bits, $i, $j + 1)
+                for ($k = 0; $k <= $j; ++$k) {
+                    $result = static::squareReduce($result, $n_value, $class);
+                }
+
+                $result = static::multiplyReduce($result, $powers[bindec(substr($e_bits, $i, $j + 1))], $n_value, $class);
+
+                $i += $j + 1;
+            }
+        }
+
+        $temp = new $class();
+        $temp->value = static::reduce($result, $n_value, $class);
+
+        return $temp;
+    }
+
+    /**
+     * Generates a random number of a certain size
+     *
+     * Bit length is equal to $size
+     */
+    public static function random(int $size): Engine
+    {
+        ['min' => $min, 'max' => $max] = static::minMaxBits($size);
+        return static::randomRange($min, $max);
+    }
+
+    /**
+     * Generates a random prime number of a certain size
+     *
+     * Bit length is equal to $size
+     */
+    public static function randomPrime(int $size): Engine
+    {
+        ['min' => $min, 'max' => $max] = static::minMaxBits($size);
+        return static::randomRangePrime($min, $max);
+    }
+
+    /**
+     * Performs some pre-processing for randomRangePrime
+     *
+     * @return static|false
+     */
+    protected static function randomRangePrimeOuter(Engine $min, Engine $max)
+    {
+        $compare = $max->compare($min);
+
+        if (!$compare) {
+            return $min->isPrime() ? $min : false;
+        } elseif ($compare < 0) {
+            // if $min is bigger then $max, swap $min and $max
+            $temp = $max;
+            $max = $min;
+            $min = $temp;
+        }
+
+        $length = $max->getLength();
+        if ($length > 8196) {
+            throw new \RuntimeException("Generation of random prime numbers larger than 8196 has been disabled ($length)");
+        }
+
+        $x = static::randomRange($min, $max);
+
+        return static::randomRangePrimeInner($x, $min, $max);
+    }
+
+    /**
+     * Generate a random number between a range
+     *
+     * Returns a random number between $min and $max where $min and $max
+     * can be defined using one of the two methods:
+     *
+     * BigInteger::randomRange($min, $max)
+     * BigInteger::randomRange($max, $min)
+     */
+    protected static function randomRangeHelper(Engine $min, Engine $max): Engine
+    {
+        $compare = $max->compare($min);
+
+        if (!$compare) {
+            return $min;
+        } elseif ($compare < 0) {
+            // if $min is bigger then $max, swap $min and $max
+            $temp = $max;
+            $max = $min;
+            $min = $temp;
+        }
+
+        if (!isset(static::$one[static::class])) {
+            static::$one[static::class] = new static(1);
+        }
+
+        $max = $max->subtract($min->subtract(static::$one[static::class]));
+
+        $size = strlen(ltrim($max->toBytes(), chr(0)));
+
+        /*
+            doing $random % $max doesn't work because some numbers will be more likely to occur than others.
+            eg. if $max is 140 and $random's max is 255 then that'd mean both $random = 5 and $random = 145
+            would produce 5 whereas the only value of random that could produce 139 would be 139. ie.
+            not all numbers would be equally likely. some would be more likely than others.
+
+            creating a whole new random number until you find one that is within the range doesn't work
+            because, for sufficiently small ranges, the likelihood that you'd get a number within that range
+            would be pretty small. eg. with $random's max being 255 and if your $max being 1 the probability
+            would be pretty high that $random would be greater than $max.
+
+            phpseclib works around this using the technique described here:
+
+            http://crypto.stackexchange.com/questions/5708/creating-a-small-number-from-a-cryptographically-secure-random-string
+        */
+        $random_max = new static(chr(1) . str_repeat("\0", $size), 256);
+        $random = new static(Random::string($size), 256);
+
+        [$max_multiple] = $random_max->divide($max);
+        $max_multiple = $max_multiple->multiply($max);
+
+        while ($random->compare($max_multiple) >= 0) {
+            $random = $random->subtract($max_multiple);
+            $random_max = $random_max->subtract($max_multiple);
+            $random = $random->bitwise_leftShift(8);
+            $random = $random->add(new static(Random::string(1), 256));
+            $random_max = $random_max->bitwise_leftShift(8);
+            [$max_multiple] = $random_max->divide($max);
+            $max_multiple = $max_multiple->multiply($max);
+        }
+        [, $random] = $random->divide($max);
+
+        return $random->add($min);
+    }
+
+    /**
+     * Performs some post-processing for randomRangePrime
+     *
+     * @return static|false
+     */
+    protected static function randomRangePrimeInner(Engine $x, Engine $min, Engine $max)
+    {
+        if (!isset(static::$two[static::class])) {
+            static::$two[static::class] = new static('2');
+        }
+
+        $x->make_odd();
+        if ($x->compare($max) > 0) {
+            // if $x > $max then $max is even and if $min == $max then no prime number exists between the specified range
+            if ($min->equals($max)) {
+                return false;
+            }
+            $x = clone $min;
+            $x->make_odd();
+        }
+
+        $initial_x = clone $x;
+
+        while (true) {
+            if ($x->isPrime()) {
+                return $x;
+            }
+
+            $x = $x->add(static::$two[static::class]);
+
+            if ($x->compare($max) > 0) {
+                $x = clone $min;
+                if ($x->equals(static::$two[static::class])) {
+                    return $x;
+                }
+                $x->make_odd();
+            }
+
+            if ($x->equals($initial_x)) {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * Sets the $t parameter for primality testing
+     */
+    protected function setupIsPrime(): int
+    {
+        $length = $this->getLengthInBytes();
+
+        // see HAC 4.49 "Note (controlling the error probability)"
+        // @codingStandardsIgnoreStart
+             if ($length >= 163) { $t =  2; } // floor(1300 / 8)
+        else if ($length >= 106) { $t =  3; } // floor( 850 / 8)
+        else if ($length >= 81 ) { $t =  4; } // floor( 650 / 8)
+        else if ($length >= 68 ) { $t =  5; } // floor( 550 / 8)
+        else if ($length >= 56 ) { $t =  6; } // floor( 450 / 8)
+        else if ($length >= 50 ) { $t =  7; } // floor( 400 / 8)
+        else if ($length >= 43 ) { $t =  8; } // floor( 350 / 8)
+        else if ($length >= 37 ) { $t =  9; } // floor( 300 / 8)
+        else if ($length >= 31 ) { $t = 12; } // floor( 250 / 8)
+        else if ($length >= 25 ) { $t = 15; } // floor( 200 / 8)
+        else if ($length >= 18 ) { $t = 18; } // floor( 150 / 8)
+        else                     { $t = 27; }
+        // @codingStandardsIgnoreEnd
+
+        return $t;
+    }
+
+    /**
+     * Tests Primality
+     *
+     * Uses the {@link http://en.wikipedia.org/wiki/Miller%E2%80%93Rabin_primality_test Miller-Rabin primality test}.
+     * See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap4.pdf#page=8 HAC 4.24} for more info.
+     */
+    protected function testPrimality(int $t): bool
+    {
+        if (!$this->testSmallPrimes()) {
+            return false;
+        }
+
+        $n   = clone $this;
+        $n_1 = $n->subtract(static::$one[static::class]);
+        $n_2 = $n->subtract(static::$two[static::class]);
+
+        $r = clone $n_1;
+        $s = static::scan1divide($r);
+
+        for ($i = 0; $i < $t; ++$i) {
+            $a = static::randomRange(static::$two[static::class], $n_2);
+            $y = $a->modPow($r, $n);
+
+            if (!$y->equals(static::$one[static::class]) && !$y->equals($n_1)) {
+                for ($j = 1; $j < $s && !$y->equals($n_1); ++$j) {
+                    $y = $y->modPow(static::$two[static::class], $n);
+                    if ($y->equals(static::$one[static::class])) {
+                        return false;
+                    }
+                }
+
+                if (!$y->equals($n_1)) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Checks a numer to see if it's prime
+     *
+     * Assuming the $t parameter is not set, this function has an error rate of 2**-80.  The main motivation for the
+     * $t parameter is distributability.  BigInteger::randomPrime() can be distributed across multiple pageloads
+     * on a website instead of just one.
+     *
+     * @param int|bool $t
+     */
+    public function isPrime($t = false): bool
+    {
+        // OpenSSL limits RSA keys to 16384 bits. The length of an RSA key is equal to the length of the modulo, which is
+        // produced by multiplying the primes p and q by one another. The largest number two 8196 bit primes can produce is
+        // a 16384 bit number so, basically, 8196 bit primes are the largest OpenSSL will generate and if that's the largest
+        // that it'll generate it also stands to reason that that's the largest you'll be able to test primality on
+        $length = $this->getLength();
+        if ($length > 8196) {
+            throw new \RuntimeException("Primality testing is not supported for numbers larger than 8196 bits ($length)");
+        }
+
+        if (!$t) {
+            $t = $this->setupIsPrime();
+        }
+        return $this->testPrimality($t);
+    }
+
+    /**
+     * Performs a few preliminary checks on root
+     */
+    protected function rootHelper(int $n): Engine
+    {
+        if ($n < 1) {
+            return clone static::$zero[static::class];
+        } // we want positive exponents
+        if ($this->compare(static::$one[static::class]) < 0) {
+            return clone static::$zero[static::class];
+        } // we want positive numbers
+        if ($this->compare(static::$two[static::class]) < 0) {
+            return clone static::$one[static::class];
+        } // n-th root of 1 or 2 is 1
+
+        return $this->rootInner($n);
+    }
+
+    /**
+     * Calculates the nth root of a biginteger.
+     *
+     * Returns the nth root of a positive biginteger, where n defaults to 2
+     *
+     * {@internal This function is based off of {@link http://mathforum.org/library/drmath/view/52605.html this page} and {@link http://stackoverflow.com/questions/11242920/calculating-nth-root-with-bcmath-in-php this stackoverflow question}.}
+     */
+    protected function rootInner(int $n): Engine
+    {
+        $n = new static($n);
+
+        // g is our guess number
+        $g = static::$two[static::class];
+        // while (g^n < num) g=g*2
+        while ($g->pow($n)->compare($this) < 0) {
+            $g = $g->multiply(static::$two[static::class]);
+        }
+        // if (g^n==num) num is a power of 2, we're lucky, end of job
+        // == 0 bccomp(bcpow($g, $n), $n->value)==0
+        if ($g->pow($n)->equals($this) > 0) {
+            $root = $g;
+            return $this->normalize($root);
+        }
+
+        // if we're here num wasn't a power of 2 :(
+        $og = $g; // og means original guess and here is our upper bound
+        $g = $g->divide(static::$two[static::class])[0]; // g is set to be our lower bound
+        $step = $og->subtract($g)->divide(static::$two[static::class])[0]; // step is the half of upper bound - lower bound
+        $g = $g->add($step); // we start at lower bound + step , basically in the middle of our interval
+
+        // while step>1
+
+        while ($step->compare(static::$one[static::class]) == 1) {
+            $guess = $g->pow($n);
+            $step = $step->divide(static::$two[static::class])[0];
+            $comp = $guess->compare($this); // compare our guess with real number
+            switch ($comp) {
+                case -1: // if guess is lower we add the new step
+                    $g = $g->add($step);
+                    break;
+                case 1: // if guess is higher we sub the new step
+                    $g = $g->subtract($step);
+                    break;
+                case 0: // if guess is exactly the num we're done, we return the value
+                    $root = $g;
+                    break 2;
+            }
+        }
+
+        if ($comp == 1) {
+            $g = $g->subtract($step);
+        }
+
+        // whatever happened, g is the closest guess we can make so return it
+        $root = $g;
+
+        return $this->normalize($root);
+    }
+
+    /**
+     * Calculates the nth root of a biginteger.
+     */
+    public function root(int $n = 2): Engine
+    {
+        return $this->rootHelper($n);
+    }
+
+    /**
+     * Return the minimum BigInteger between an arbitrary number of BigIntegers.
+     */
+    protected static function minHelper(array $nums): Engine
+    {
+        if (count($nums) == 1) {
+            return $nums[0];
+        }
+        $min = $nums[0];
+        for ($i = 1; $i < count($nums); $i++) {
+            $min = $min->compare($nums[$i]) > 0 ? $nums[$i] : $min;
+        }
+        return $min;
+    }
+
+    /**
+     * Return the minimum BigInteger between an arbitrary number of BigIntegers.
+     */
+    protected static function maxHelper(array $nums): Engine
+    {
+        if (count($nums) == 1) {
+            return $nums[0];
+        }
+        $max = $nums[0];
+        for ($i = 1; $i < count($nums); $i++) {
+            $max = $max->compare($nums[$i]) < 0 ? $nums[$i] : $max;
+        }
+        return $max;
+    }
+
+    /**
+     * Create Recurring Modulo Function
+     *
+     * Sometimes it may be desirable to do repeated modulos with the same number outside of
+     * modular exponentiation
+     */
+    public function createRecurringModuloFunction(): \Closure
+    {
+        $class = static::class;
+
+        $fqengine = !method_exists(static::$modexpEngine[static::class], 'reduce') ?
+            '\\phpseclib3\\Math\\BigInteger\\Engines\\' . static::ENGINE_DIR . '\\DefaultEngine' :
+            static::$modexpEngine[static::class];
+        if (method_exists($fqengine, 'generateCustomReduction')) {
+            $func = $fqengine::generateCustomReduction($this, static::class);
+            return eval('return function(' . static::class . ' $x) use ($func, $class) {
+                $r = new $class();
+                $r->value = $func($x->value);
+                return $r;
+            };');
+        }
+        $n = $this->value;
+        return eval('return function(' . static::class . ' $x) use ($n, $fqengine, $class) {
+            $r = new $class();
+            $r->value = $fqengine::reduce($x->value, $n, $class);
+            return $r;
+        };');
+    }
+
+    /**
+     * Calculates the greatest common divisor and Bezout's identity.
+     *
+     * @return array{gcd: Engine, x: Engine, y: Engine}
+     */
+    protected function extendedGCDHelper(Engine $n): array
+    {
+        $u = clone $this;
+        $v = clone $n;
+
+        $one = new static(1);
+        $zero = new static();
+
+        $a = clone $one;
+        $b = clone $zero;
+        $c = clone $zero;
+        $d = clone $one;
+
+        while (!$v->equals($zero)) {
+            [$q] = $u->divide($v);
+
+            $temp = $u;
+            $u = $v;
+            $v = $temp->subtract($v->multiply($q));
+
+            $temp = $a;
+            $a = $c;
+            $c = $temp->subtract($a->multiply($q));
+
+            $temp = $b;
+            $b = $d;
+            $d = $temp->subtract($b->multiply($q));
+        }
+
+        return [
+            'gcd' => $u,
+            'x' => $a,
+            'y' => $b,
+        ];
+    }
+
+    /**
+     * Bitwise Split
+     *
+     * Splits BigInteger's into chunks of $split bits
+     *
+     * @return Engine[]
+     */
+    public function bitwise_split(int $split): array
+    {
+        if ($split < 1) {
+            throw new RuntimeException('Offset must be greater than 1');
+        }
+
+        $mask = static::$one[static::class]->bitwise_leftShift($split)->subtract(static::$one[static::class]);
+
+        $num = clone $this;
+
+        $vals = [];
+        while (!$num->equals(static::$zero[static::class])) {
+            $vals[] = $num->bitwise_and($mask);
+            $num = $num->bitwise_rightShift($split);
+        }
+
+        return array_reverse($vals);
+    }
+
+    /**
+     * Logical And
+     */
+    protected function bitwiseAndHelper(Engine $x): Engine
+    {
+        $left = $this->toBytes(true);
+        $right = $x->toBytes(true);
+
+        $length = max(strlen($left), strlen($right));
+
+        $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
+        $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
+
+        return $this->normalize(new static($left & $right, -256));
+    }
+
+    /**
+     * Logical Or
+     */
+    protected function bitwiseOrHelper(Engine $x): Engine
+    {
+        $left = $this->toBytes(true);
+        $right = $x->toBytes(true);
+
+        $length = max(strlen($left), strlen($right));
+
+        $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
+        $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
+
+        return $this->normalize(new static($left | $right, -256));
+    }
+
+    /**
+     * Logical Exclusive Or
+     */
+    protected function bitwiseXorHelper(Engine $x): Engine
+    {
+        $left = $this->toBytes(true);
+        $right = $x->toBytes(true);
+
+        $length = max(strlen($left), strlen($right));
+
+
+        $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
+        $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
+        return $this->normalize(new static($left ^ $right, -256));
+    }
+}
diff --git a/phpseclib/Math/BigInteger/Engines/GMP.php b/phpseclib/Math/BigInteger/Engines/GMP.php
new file mode 100644
index 000000000..59c8c4865
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/GMP.php
@@ -0,0 +1,595 @@
+<?php
+
+/**
+ * GMP BigInteger Engine
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines;
+
+use phpseclib3\Exception\BadConfigurationException;
+
+/**
+ * GMP Engine.
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class GMP extends Engine
+{
+    /**
+     * Can Bitwise operations be done fast?
+     *
+     * @see parent::bitwise_leftRotate()
+     * @see parent::bitwise_rightRotate()
+     */
+    public const FAST_BITWISE = true;
+
+    /**
+     * Engine Directory
+     *
+     * @see parent::setModExpEngine
+     */
+    public const ENGINE_DIR = 'GMP';
+
+    /**
+     * Test for engine validity
+     *
+     * @see parent::__construct()
+     */
+    public static function isValidEngine(): bool
+    {
+        return extension_loaded('gmp');
+    }
+
+    /**
+     * Default constructor
+     *
+     * @param mixed $x integer Base-10 number or base-$base number if $base set.
+     * @see parent::__construct()
+     */
+    public function __construct($x = 0, int $base = 10)
+    {
+        if (!isset(static::$isValidEngine[static::class])) {
+            static::$isValidEngine[static::class] = self::isValidEngine();
+        }
+        if (!static::$isValidEngine[static::class]) {
+            throw new BadConfigurationException('GMP is not setup correctly on this system');
+        }
+
+        if ($x instanceof \GMP) {
+            $this->value = $x;
+            return;
+        }
+
+        $this->value = gmp_init(0);
+
+        parent::__construct($x, $base);
+    }
+
+    /**
+     * Initialize a GMP BigInteger Engine instance
+     *
+     * @see parent::__construct()
+     */
+    protected function initialize(int $base): void
+    {
+        switch (abs($base)) {
+            case 256:
+                $this->value = gmp_import($this->value);
+                if ($this->is_negative) {
+                    $this->value = -$this->value;
+                }
+                break;
+            case 16:
+                $temp = $this->is_negative ? '-0x' . $this->value : '0x' . $this->value;
+                $this->value = gmp_init($temp);
+                break;
+            case 10:
+                $this->value = gmp_init($this->value ?? '0');
+        }
+    }
+
+    /**
+     * Converts a BigInteger to a base-10 number.
+     */
+    public function toString(): string
+    {
+        return (string)$this->value;
+    }
+
+    /**
+     * Converts a BigInteger to a bit string (eg. base-2).
+     *
+     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
+     * saved as two's compliment.
+     */
+    public function toBits(bool $twos_compliment = false): string
+    {
+        $hex = $this->toHex($twos_compliment);
+
+        $bits = gmp_strval(gmp_init($hex, 16), 2);
+
+        if ($this->precision > 0) {
+            $bits = substr($bits, -$this->precision);
+        }
+
+        if ($twos_compliment && $this->compare(new static()) > 0 && $this->precision <= 0) {
+            return '0' . $bits;
+        }
+
+        return $bits;
+    }
+
+    /**
+     * Converts a BigInteger to a byte string (eg. base-256).
+     */
+    public function toBytes(bool $twos_compliment = false): string
+    {
+        if ($twos_compliment) {
+            return $this->toBytesHelper();
+        }
+
+        if (gmp_cmp($this->value, gmp_init(0)) == 0) {
+            return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
+        }
+
+        $temp = gmp_export($this->value);
+
+        return $this->precision > 0 ?
+            substr(str_pad($temp, $this->precision >> 3, chr(0), STR_PAD_LEFT), -($this->precision >> 3)) :
+            ltrim($temp, chr(0));
+    }
+
+    /**
+     * Adds two BigIntegers.
+     */
+    public function add(GMP $y): GMP
+    {
+        $temp = new self();
+        $temp->value = $this->value + $y->value;
+
+        return $this->normalize($temp);
+    }
+
+    /**
+     * Subtracts two BigIntegers.
+     */
+    public function subtract(GMP $y): GMP
+    {
+        $temp = new self();
+        $temp->value = $this->value - $y->value;
+
+        return $this->normalize($temp);
+    }
+
+    /**
+     * Multiplies two BigIntegers.
+     */
+    public function multiply(GMP $x): GMP
+    {
+        $temp = new self();
+        $temp->value = $this->value * $x->value;
+
+        return $this->normalize($temp);
+    }
+
+    /**
+     * Divides two BigIntegers.
+     *
+     * Returns an array whose first element contains the quotient and whose second element contains the
+     * "common residue".  If the remainder would be positive, the "common residue" and the remainder are the
+     * same.  If the remainder would be negative, the "common residue" is equal to the sum of the remainder
+     * and the divisor (basically, the "common residue" is the first positive modulo).
+     *
+     * @return array{GMP, GMP}
+     */
+    public function divide(GMP $y): array
+    {
+        $quotient = new self();
+        $remainder = new self();
+
+        [$quotient->value, $remainder->value] = gmp_div_qr($this->value, $y->value);
+
+        if (gmp_sign($remainder->value) < 0) {
+            $remainder->value = $remainder->value + gmp_abs($y->value);
+        }
+
+        return [$this->normalize($quotient), $this->normalize($remainder)];
+    }
+
+    /**
+     * Compares two numbers.
+     *
+     * Although one might think !$x->compare($y) means $x != $y, it, in fact, means the opposite.  The reason for this
+     * is demonstrated thusly:
+     *
+     * $x  > $y: $x->compare($y)  > 0
+     * $x  < $y: $x->compare($y)  < 0
+     * $x == $y: $x->compare($y) == 0
+     *
+     * Note how the same comparison operator is used.  If you want to test for equality, use $x->equals($y).
+     *
+     * {@internal Could return $this->subtract($x), but that's not as fast as what we do do.}
+     *
+     * @return int in case < 0 if $this is less than $y; > 0 if $this is greater than $y, and 0 if they are equal.
+     * @see self::equals()
+     */
+    public function compare(GMP $y): int
+    {
+        $r = gmp_cmp($this->value, $y->value);
+        if ($r < -1) {
+            $r = -1;
+        }
+        if ($r > 1) {
+            $r = 1;
+        }
+        return $r;
+    }
+
+    /**
+     * Tests the equality of two numbers.
+     *
+     * If you need to see if one number is greater than or less than another number, use BigInteger::compare()
+     */
+    public function equals(GMP $x): bool
+    {
+        return $this->value == $x->value;
+    }
+
+    /**
+     * Calculates modular inverses.
+     *
+     * Say you have (30 mod 17 * x mod 17) mod 17 == 1.  x can be found using modular inverses.
+     *
+     * @return false|GMP
+     */
+    public function modInverse(GMP $n)
+    {
+        $temp = new self();
+        $temp->value = gmp_invert($this->value, $n->value);
+
+        return $temp->value === false ? false : $this->normalize($temp);
+    }
+
+    /**
+     * Calculates the greatest common divisor and Bezout's identity.
+     *
+     * Say you have 693 and 609.  The GCD is 21.  Bezout's identity states that there exist integers x and y such that
+     * 693*x + 609*y == 21.  In point of fact, there are actually an infinite number of x and y combinations and which
+     * combination is returned is dependent upon which mode is in use.  See
+     * {@link http://en.wikipedia.org/wiki/B%C3%A9zout%27s_identity Bezout's identity - Wikipedia} for more information.
+     *
+     * @return GMP[]
+     */
+    public function extendedGCD(GMP $n): array
+    {
+        [
+            'g' => $g,
+            's' => $s,
+            't' => $t
+        ] = gmp_gcdext($this->value, $n->value);
+
+        return [
+            'gcd' => $this->normalize(new self($g)),
+            'x' => $this->normalize(new self($s)),
+            'y' => $this->normalize(new self($t)),
+        ];
+    }
+
+    /**
+     * Calculates the greatest common divisor
+     *
+     * Say you have 693 and 609.  The GCD is 21.
+     */
+    public function gcd(GMP $n): GMP
+    {
+        $r = gmp_gcd($this->value, $n->value);
+        return $this->normalize(new self($r));
+    }
+
+    /**
+     * Absolute value.
+     */
+    public function abs(): GMP
+    {
+        $temp = new self();
+        $temp->value = gmp_abs($this->value);
+
+        return $temp;
+    }
+
+    /**
+     * Logical And
+     */
+    public function bitwise_and(GMP $x): GMP
+    {
+        $temp = new self();
+        $temp->value = $this->value & $x->value;
+
+        return $this->normalize($temp);
+    }
+
+    /**
+     * Logical Or
+     */
+    public function bitwise_or(GMP $x): GMP
+    {
+        $temp = new self();
+        $temp->value = $this->value | $x->value;
+
+        return $this->normalize($temp);
+    }
+
+    /**
+     * Logical Exclusive Or
+     */
+    public function bitwise_xor(GMP $x): GMP
+    {
+        $temp = new self();
+        $temp->value = $this->value ^ $x->value;
+
+        return $this->normalize($temp);
+    }
+
+    /**
+     * Logical Right Shift
+     *
+     * Shifts BigInteger's by $shift bits, effectively dividing by 2**$shift.
+     */
+    public function bitwise_rightShift(int $shift): GMP
+    {
+        // 0xFFFFFFFF >> 2 == -1 (on 32-bit systems)
+        // gmp_init('0xFFFFFFFF') >> 2 == gmp_init('0x3FFFFFFF')
+
+        $temp = new self();
+        $temp->value = $this->value >> $shift;
+
+        return $this->normalize($temp);
+    }
+
+    /**
+     * Logical Left Shift
+     *
+     * Shifts BigInteger's by $shift bits, effectively multiplying by 2**$shift.
+     */
+    public function bitwise_leftShift(int $shift): GMP
+    {
+        $temp = new self();
+        $temp->value = $this->value << $shift;
+
+        return $this->normalize($temp);
+    }
+
+    /**
+     * Performs modular exponentiation.
+     */
+    public function modPow(GMP $e, GMP $n): GMP
+    {
+        return $this->powModOuter($e, $n);
+    }
+
+    /**
+     * Performs modular exponentiation.
+     *
+     * Alias for modPow().
+     */
+    public function powMod(GMP $e, GMP $n): GMP
+    {
+        return $this->powModOuter($e, $n);
+    }
+
+    /**
+     * Performs modular exponentiation.
+     */
+    protected function powModInner(GMP $e, GMP $n): GMP
+    {
+        $class = static::$modexpEngine[static::class];
+        return $class::powModHelper($this, $e, $n);
+    }
+
+    /**
+     * Normalize
+     *
+     * Removes leading zeros and truncates (if necessary) to maintain the appropriate precision
+     */
+    protected function normalize(GMP $result): GMP
+    {
+        $result->precision = $this->precision;
+        $result->bitmask = $this->bitmask;
+
+        if ($result->bitmask !== false) {
+            $flip = $result->value < 0;
+            if ($flip) {
+                $result->value = -$result->value;
+            }
+            $result->value = $result->value & $result->bitmask->value;
+            if ($flip) {
+                $result->value = -$result->value;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Performs some post-processing for randomRangePrime
+     *
+     * @return GMP
+     */
+    protected static function randomRangePrimeInner(Engine $x, Engine $min, Engine $max)
+    {
+        $p = gmp_nextprime($x->value);
+
+        if ($p <= $max->value) {
+            return new self($p);
+        }
+
+        if ($min->value != $x->value) {
+            $x = new self($x->value - 1);
+        }
+
+        return self::randomRangePrime($min, $x);
+    }
+
+    /**
+     * Generate a random prime number between a range
+     *
+     * If there's not a prime within the given range, false will be returned.
+     *
+     * @return false|GMP
+     */
+    public static function randomRangePrime(GMP $min, GMP $max)
+    {
+        return self::randomRangePrimeOuter($min, $max);
+    }
+
+    /**
+     * Generate a random number between a range
+     *
+     * Returns a random number between $min and $max where $min and $max
+     * can be defined using one of the two methods:
+     *
+     * BigInteger::randomRange($min, $max)
+     * BigInteger::randomRange($max, $min)
+     */
+    public static function randomRange(GMP $min, GMP $max): GMP
+    {
+        return self::randomRangeHelper($min, $max);
+    }
+
+    /**
+     * Make the current number odd
+     *
+     * If the current number is odd it'll be unchanged.  If it's even, one will be added to it.
+     *
+     * @see self::randomPrime()
+     */
+    protected function make_odd(): void
+    {
+        gmp_setbit($this->value, 0);
+    }
+
+    /**
+     * Tests Primality
+     */
+    protected function testPrimality(int $t): bool
+    {
+        return gmp_prob_prime($this->value, $t) != 0;
+    }
+
+    /**
+     * Calculates the nth root of a biginteger.
+     *
+     * Returns the nth root of a positive biginteger, where n defaults to 2
+     */
+    protected function rootInner(int $n): GMP
+    {
+        $root = new self();
+        $root->value = gmp_root($this->value, $n);
+        return $this->normalize($root);
+    }
+
+    /**
+     * Performs exponentiation.
+     */
+    public function pow(GMP $n): GMP
+    {
+        $temp = new self();
+        $temp->value = $this->value ** $n->value;
+
+        return $this->normalize($temp);
+    }
+
+    /**
+     * Return the minimum BigInteger between an arbitrary number of BigIntegers.
+     */
+    public static function min(GMP ...$nums): GMP
+    {
+        return self::minHelper($nums);
+    }
+
+    /**
+     * Return the maximum BigInteger between an arbitrary number of BigIntegers.
+     */
+    public static function max(GMP ...$nums): GMP
+    {
+        return self::maxHelper($nums);
+    }
+
+    /**
+     * Tests BigInteger to see if it is between two integers, inclusive
+     */
+    public function between(GMP $min, GMP $max): bool
+    {
+        return $this->compare($min) >= 0 && $this->compare($max) <= 0;
+    }
+
+    /**
+     * Create Recurring Modulo Function
+     *
+     * Sometimes it may be desirable to do repeated modulos with the same number outside of
+     * modular exponentiation
+     */
+    public function createRecurringModuloFunction(): \Closure
+    {
+        $temp = $this->value;
+        return fn (GMP $x) => new GMP($x->value % $temp);
+    }
+
+    /**
+     * Scan for 1 and right shift by that amount
+     *
+     * ie. $s = gmp_scan1($n, 0) and $r = gmp_div_q($n, gmp_pow(gmp_init('2'), $s));
+     */
+    public static function scan1divide(GMP $r): int
+    {
+        $s = gmp_scan1($r->value, 0);
+        $r->value >>= $s;
+        return $s;
+    }
+
+    /**
+     * Is Odd?
+     */
+    public function isOdd(): bool
+    {
+        return gmp_testbit($this->value, 0);
+    }
+
+    /**
+     * Tests if a bit is set
+     */
+    public function testBit($x): bool
+    {
+        return gmp_testbit($this->value, $x);
+    }
+
+    /**
+     * Is Negative?
+     */
+    public function isNegative(): bool
+    {
+        return gmp_sign($this->value) == -1;
+    }
+
+    /**
+     * Negate
+     *
+     * Given $k, returns -$k
+     */
+    public function negate(): GMP
+    {
+        $temp = clone $this;
+        $temp->value = -$this->value;
+
+        return $temp;
+    }
+}
diff --git a/phpseclib/Math/BigInteger/Engines/GMP/DefaultEngine.php b/phpseclib/Math/BigInteger/Engines/GMP/DefaultEngine.php
new file mode 100644
index 000000000..f8794137f
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/GMP/DefaultEngine.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * GMP Modular Exponentiation Engine
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines\GMP;
+
+use phpseclib3\Math\BigInteger\Engines\GMP;
+
+/**
+ * GMP Modular Exponentiation Engine
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class DefaultEngine extends GMP
+{
+    /**
+     * Performs modular exponentiation.
+     */
+    protected static function powModHelper(GMP $x, GMP $e, GMP $n): GMP
+    {
+        $temp = new GMP();
+        $temp->value = gmp_powm($x->value, $e->value, $n->value);
+
+        return $x->normalize($temp);
+    }
+}
diff --git a/phpseclib/Math/BigInteger/Engines/OpenSSL.php b/phpseclib/Math/BigInteger/Engines/OpenSSL.php
new file mode 100644
index 000000000..14509b5bb
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/OpenSSL.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * OpenSSL Modular Exponentiation Engine
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines;
+
+use phpseclib3\Crypt\RSA\Formats\Keys\PKCS8;
+use phpseclib3\Exception\OutOfRangeException;
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\Math\BigInteger;
+
+/**
+ * OpenSSL Modular Exponentiation Engine
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class OpenSSL
+{
+    /**
+     * Test for engine validity
+     */
+    public static function isValidEngine(): bool
+    {
+        return extension_loaded('openssl') && static::class != __CLASS__;
+    }
+
+    /**
+     * Performs modular exponentiation.
+     */
+    public static function powModHelper(Engine $x, Engine $e, Engine $n): Engine
+    {
+        if ($n->getLengthInBytes() < 31 || $n->getLengthInBytes() > 16384) {
+            throw new OutOfRangeException('Only modulo between 31 and 16384 bits are accepted');
+        }
+
+        $key = PKCS8::savePublicKey(
+            new BigInteger($n),
+            new BigInteger($e)
+        );
+
+        $plaintext = str_pad($x->toBytes(), $n->getLengthInBytes(), "\0", STR_PAD_LEFT);
+
+        // this is easily prone to failure. if the modulo is a multiple of 2 or 3 or whatever it
+        // won't work and you'll get a "failure: error:0906D06C:PEM routines:PEM_read_bio:no start line"
+        // error. i suppose, for even numbers, we could do what PHP\Montgomery.php does, but then what
+        // about odd numbers divisible by 3, by 5, etc?
+        if (!openssl_public_encrypt($plaintext, $result, $key, OPENSSL_NO_PADDING)) {
+            throw new UnexpectedValueException(openssl_error_string());
+        }
+
+        $class = $x::class;
+        return new $class($result, 256);
+    }
+}
diff --git a/phpseclib/Math/BigInteger/Engines/PHP.php b/phpseclib/Math/BigInteger/Engines/PHP.php
new file mode 100644
index 000000000..2d3aff137
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/PHP.php
@@ -0,0 +1,1265 @@
+<?php
+
+/**
+ * Pure-PHP BigInteger Engine
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Exception\BadConfigurationException;
+use phpseclib3\Exception\RuntimeException;
+
+/**
+ * Pure-PHP Engine.
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PHP extends Engine
+{
+    /**#@+
+     * Array constants
+     *
+     * Rather than create a thousands and thousands of new BigInteger objects in repeated function calls to add() and
+     * multiply() or whatever, we'll just work directly on arrays, taking them in as parameters and returning them.
+     *
+     */
+    /**
+     * $result[self::VALUE] contains the value.
+     */
+    public const VALUE = 0;
+    /**
+     * $result[self::SIGN] contains the sign.
+     */
+    public const SIGN = 1;
+    /**#@-*/
+
+    /**
+     * Karatsuba Cutoff
+     *
+     * At what point do we switch between Karatsuba multiplication and schoolbook long multiplication?
+     */
+    public const KARATSUBA_CUTOFF = 25;
+
+    /**
+     * Can Bitwise operations be done fast?
+     *
+     * @see parent::bitwise_leftRotate()
+     * @see parent::bitwise_rightRotate()
+     */
+    public const FAST_BITWISE = true;
+
+    /**
+     * Engine Directory
+     *
+     * @see parent::setModExpEngine
+     */
+    public const ENGINE_DIR = 'PHP';
+
+    /**
+     * Default constructor
+     *
+     * @param mixed $x integer Base-10 number or base-$base number if $base set.
+     * @return PHP
+     * @see parent::__construct()
+     */
+    public function __construct($x = 0, int $base = 10)
+    {
+        if (!isset(static::$isValidEngine[static::class])) {
+            static::$isValidEngine[static::class] = static::isValidEngine();
+        }
+        if (!static::$isValidEngine[static::class]) {
+            throw new BadConfigurationException(static::class . ' is not setup correctly on this system');
+        }
+
+        $this->value = [];
+        parent::__construct($x, $base);
+    }
+
+    /**
+     * Initialize a PHP BigInteger Engine instance
+     *
+     * @see parent::__construct()
+     */
+    protected function initialize(int $base): void
+    {
+        switch (abs($base)) {
+            case 16:
+                $x = (strlen($this->value) & 1) ? '0' . $this->value : $this->value;
+                $temp = new static(Strings::hex2bin($x), 256);
+                $this->value = $temp->value;
+                break;
+            case 10:
+                $temp = new static();
+
+                $multiplier = new static();
+                $multiplier->value = [static::MAX10];
+
+                $x = $this->value;
+
+                if ($x[0] == '-') {
+                    $this->is_negative = true;
+                    $x = substr($x, 1);
+                }
+
+                $x = str_pad(
+                    $x,
+                    strlen($x) + ((static::MAX10LEN - 1) * strlen($x)) % static::MAX10LEN,
+                    '0',
+                    STR_PAD_LEFT
+                );
+                while (strlen($x)) {
+                    $temp = $temp->multiply($multiplier);
+                    $temp = $temp->add(new static($this->int2bytes((int) substr($x, 0, static::MAX10LEN)), 256));
+                    $x = substr($x, static::MAX10LEN);
+                }
+
+                $this->value = $temp->value;
+        }
+    }
+
+    /**
+     * Pads strings so that unpack may be used on them
+     */
+    protected function pad(string $str): string
+    {
+        $length = strlen($str);
+
+        $pad = 4 - (strlen($str) % 4);
+
+        return str_pad($str, $length + $pad, "\0", STR_PAD_LEFT);
+    }
+
+    /**
+     * Converts a BigInteger to a base-10 number.
+     */
+    public function toString(): string
+    {
+        if (!count($this->value)) {
+            return '0';
+        }
+
+        $temp = clone $this;
+        $temp->bitmask = false;
+        $temp->is_negative = false;
+
+        $divisor = new static();
+        $divisor->value = [static::MAX10];
+        $result = '';
+        while (count($temp->value)) {
+            [$temp, $mod] = $temp->divide($divisor);
+            $result = str_pad(
+                (string) $mod->value[0] ?? '',
+                static::MAX10LEN,
+                '0',
+                STR_PAD_LEFT
+            ) . $result;
+        }
+        $result = ltrim($result, '0');
+        if (empty($result)) {
+            $result = '0';
+        }
+
+        if ($this->is_negative) {
+            $result = '-' . $result;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Converts a BigInteger to a byte string (eg. base-256).
+     */
+    public function toBytes(bool $twos_compliment = false): string
+    {
+        if ($twos_compliment) {
+            return $this->toBytesHelper();
+        }
+
+        if (!count($this->value)) {
+            return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
+        }
+
+        $result = $this->bitwise_small_split(8);
+        $result = implode('', array_map('chr', $result));
+
+        return $this->precision > 0 ?
+            str_pad(
+                substr($result, -(($this->precision + 7) >> 3)),
+                ($this->precision + 7) >> 3,
+                chr(0),
+                STR_PAD_LEFT
+            ) :
+            $result;
+    }
+
+    /**
+     * Performs addition.
+     */
+    protected static function addHelper(array $x_value, bool $x_negative, array $y_value, bool $y_negative): array
+    {
+        $x_size = count($x_value);
+        $y_size = count($y_value);
+
+        if ($x_size == 0) {
+            return [
+                self::VALUE => $y_value,
+                self::SIGN => $y_negative,
+            ];
+        } elseif ($y_size == 0) {
+            return [
+                self::VALUE => $x_value,
+                self::SIGN => $x_negative,
+            ];
+        }
+
+        // subtract, if appropriate
+        if ($x_negative != $y_negative) {
+            if ($x_value == $y_value) {
+                return [
+                    self::VALUE => [],
+                    self::SIGN => false,
+                ];
+            }
+
+            $temp = self::subtractHelper($x_value, false, $y_value, false);
+            $temp[self::SIGN] = self::compareHelper($x_value, false, $y_value, false) > 0 ?
+                $x_negative : $y_negative;
+
+            return $temp;
+        }
+
+        if ($x_size < $y_size) {
+            $size = $x_size;
+            $value = $y_value;
+        } else {
+            $size = $y_size;
+            $value = $x_value;
+        }
+
+        $value[count($value)] = 0; // just in case the carry adds an extra digit
+
+        $carry = 0;
+        for ($i = 0, $j = 1; $j < $size; $i += 2, $j += 2) {
+            //$sum = $x_value[$j] * static::BASE_FULL + $x_value[$i] + $y_value[$j] * static::BASE_FULL + $y_value[$i] + $carry;
+            $sum = ($x_value[$j] + $y_value[$j]) * static::BASE_FULL + $x_value[$i] + $y_value[$i] + $carry;
+            $carry = $sum >= static::MAX_DIGIT2; // eg. floor($sum / 2**52); only possible values (in any base) are 0 and 1
+            $sum = $carry ? $sum - static::MAX_DIGIT2 : $sum;
+
+            $temp = static::BASE === 26 ? intval($sum / 0x4000000) : ($sum >> 31);
+
+            $value[$i] = (int)($sum - static::BASE_FULL * $temp); // eg. a faster alternative to fmod($sum, 0x4000000)
+            $value[$j] = $temp;
+        }
+
+        if ($j == $size) { // ie. if $y_size is odd
+            $sum = $x_value[$i] + $y_value[$i] + $carry;
+            $carry = $sum >= static::BASE_FULL;
+            $value[$i] = $carry ? $sum - static::BASE_FULL : $sum;
+            ++$i; // ie. let $i = $j since we've just done $value[$i]
+        }
+
+        if ($carry) {
+            for (; $value[$i] == static::MAX_DIGIT; ++$i) {
+                $value[$i] = 0;
+            }
+            ++$value[$i];
+        }
+
+        return [
+            self::VALUE => self::trim($value),
+            self::SIGN => $x_negative,
+        ];
+    }
+
+    /**
+     * Performs subtraction.
+     */
+    public static function subtractHelper(array $x_value, bool $x_negative, array $y_value, bool $y_negative): array
+    {
+        $x_size = count($x_value);
+        $y_size = count($y_value);
+
+        if ($x_size == 0) {
+            return [
+                self::VALUE => $y_value,
+                self::SIGN => !$y_negative,
+            ];
+        } elseif ($y_size == 0) {
+            return [
+                self::VALUE => $x_value,
+                self::SIGN => $x_negative,
+            ];
+        }
+
+        // add, if appropriate (ie. -$x - +$y or +$x - -$y)
+        if ($x_negative != $y_negative) {
+            $temp = self::addHelper($x_value, false, $y_value, false);
+            $temp[self::SIGN] = $x_negative;
+
+            return $temp;
+        }
+
+        $diff = self::compareHelper($x_value, $x_negative, $y_value, $y_negative);
+
+        if (!$diff) {
+            return [
+                self::VALUE => [],
+                self::SIGN => false,
+            ];
+        }
+
+        // switch $x and $y around, if appropriate.
+        if ((!$x_negative && $diff < 0) || ($x_negative && $diff > 0)) {
+            $temp = $x_value;
+            $x_value = $y_value;
+            $y_value = $temp;
+
+            $x_negative = !$x_negative;
+
+            $x_size = count($x_value);
+            $y_size = count($y_value);
+        }
+
+        // at this point, $x_value should be at least as big as - if not bigger than - $y_value
+
+        $carry = 0;
+        for ($i = 0, $j = 1; $j < $y_size; $i += 2, $j += 2) {
+            $sum = ($x_value[$j] - $y_value[$j]) * static::BASE_FULL + $x_value[$i] - $y_value[$i] - $carry;
+
+            $carry = $sum < 0; // eg. floor($sum / 2**52); only possible values (in any base) are 0 and 1
+            $sum = $carry ? $sum + static::MAX_DIGIT2 : $sum;
+
+            $temp = static::BASE === 26 ? intval($sum / 0x4000000) : ($sum >> 31);
+
+            $x_value[$i] = (int)($sum - static::BASE_FULL * $temp);
+            $x_value[$j] = $temp;
+        }
+
+        if ($j == $y_size) { // ie. if $y_size is odd
+            $sum = $x_value[$i] - $y_value[$i] - $carry;
+            $carry = $sum < 0;
+            $x_value[$i] = $carry ? $sum + static::BASE_FULL : $sum;
+            ++$i;
+        }
+
+        if ($carry) {
+            for (; !$x_value[$i]; ++$i) {
+                $x_value[$i] = static::MAX_DIGIT;
+            }
+            --$x_value[$i];
+        }
+
+        return [
+            self::VALUE => self::trim($x_value),
+            self::SIGN => $x_negative,
+        ];
+    }
+
+    /**
+     * Performs multiplication.
+     */
+    protected static function multiplyHelper(array $x_value, bool $x_negative, array $y_value, bool $y_negative): array
+    {
+        //if ( $x_value == $y_value ) {
+        //    return [
+        //        self::VALUE => self::square($x_value),
+        //        self::SIGN => $x_sign != $y_value
+        //    ];
+        //}
+
+        $x_length = count($x_value);
+        $y_length = count($y_value);
+
+        if (!$x_length || !$y_length) { // a 0 is being multiplied
+            return [
+                self::VALUE => [],
+                self::SIGN => false,
+            ];
+        }
+
+        return [
+            self::VALUE => min($x_length, $y_length) < 2 * self::KARATSUBA_CUTOFF ?
+                self::trim(self::regularMultiply($x_value, $y_value)) :
+                self::trim(self::karatsuba($x_value, $y_value)),
+            self::SIGN => $x_negative != $y_negative,
+        ];
+    }
+
+    /**
+     * Performs Karatsuba multiplication on two BigIntegers
+     *
+     * See {@link http://en.wikipedia.org/wiki/Karatsuba_algorithm Karatsuba algorithm} and
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=120 MPM 5.2.3}.
+     */
+    private static function karatsuba(array $x_value, array $y_value): array
+    {
+        $m = min(count($x_value) >> 1, count($y_value) >> 1);
+
+        if ($m < self::KARATSUBA_CUTOFF) {
+            return self::regularMultiply($x_value, $y_value);
+        }
+
+        $x1 = array_slice($x_value, $m);
+        $x0 = array_slice($x_value, 0, $m);
+        $y1 = array_slice($y_value, $m);
+        $y0 = array_slice($y_value, 0, $m);
+
+        $z2 = self::karatsuba($x1, $y1);
+        $z0 = self::karatsuba($x0, $y0);
+
+        $z1 = self::addHelper($x1, false, $x0, false);
+        $temp = self::addHelper($y1, false, $y0, false);
+        $z1 = self::karatsuba($z1[self::VALUE], $temp[self::VALUE]);
+        $temp = self::addHelper($z2, false, $z0, false);
+        $z1 = self::subtractHelper($z1, false, $temp[self::VALUE], false);
+
+        $z2 = array_merge(array_fill(0, 2 * $m, 0), $z2);
+        $z1[self::VALUE] = array_merge(array_fill(0, $m, 0), $z1[self::VALUE]);
+
+        $xy = self::addHelper($z2, false, $z1[self::VALUE], $z1[self::SIGN]);
+        $xy = self::addHelper($xy[self::VALUE], $xy[self::SIGN], $z0, false);
+
+        return $xy[self::VALUE];
+    }
+
+    /**
+     * Performs long multiplication on two BigIntegers
+     *
+     * Modeled after 'multiply' in MutableBigInteger.java.
+     */
+    protected static function regularMultiply(array $x_value, array $y_value): array
+    {
+        $x_length = count($x_value);
+        $y_length = count($y_value);
+
+        if (!$x_length || !$y_length) { // a 0 is being multiplied
+            return [];
+        }
+
+        $product_value = self::array_repeat(0, $x_length + $y_length);
+
+        // the following for loop could be removed if the for loop following it
+        // (the one with nested for loops) initially set $i to 0, but
+        // doing so would also make the result in one set of unnecessary adds,
+        // since on the outermost loops first pass, $product->value[$k] is going
+        // to always be 0
+
+        $carry = 0;
+        for ($j = 0; $j < $x_length; ++$j) { // ie. $i = 0
+            $temp = $x_value[$j] * $y_value[0] + $carry; // $product_value[$k] == 0
+            $carry = static::BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
+            $product_value[$j] = (int)($temp - static::BASE_FULL * $carry);
+        }
+
+        $product_value[$j] = $carry;
+
+        // the above for loop is what the previous comment was talking about.  the
+        // following for loop is the "one with nested for loops"
+        for ($i = 1; $i < $y_length; ++$i) {
+            $carry = 0;
+
+            for ($j = 0, $k = $i; $j < $x_length; ++$j, ++$k) {
+                $temp = $product_value[$k] + $x_value[$j] * $y_value[$i] + $carry;
+                $carry = static::BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
+                $product_value[$k] = (int)($temp - static::BASE_FULL * $carry);
+            }
+
+            $product_value[$k] = $carry;
+        }
+
+        return $product_value;
+    }
+
+    /**
+     * Divides two BigIntegers.
+     *
+     * Returns an array whose first element contains the quotient and whose second element contains the
+     * "common residue".  If the remainder would be positive, the "common residue" and the remainder are the
+     * same.  If the remainder would be negative, the "common residue" is equal to the sum of the remainder
+     * and the divisor (basically, the "common residue" is the first positive modulo).
+     *
+     * @return array{static, static}
+     * @internal This function is based off of
+     *     {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=9 HAC 14.20}.
+     */
+    protected function divideHelper(PHP $y): array
+    {
+        if (count($y->value) == 1) {
+            [$q, $r] = $this->divide_digit($this->value, $y->value[0]);
+            $quotient = new static();
+            $remainder = new static();
+            $quotient->value = $q;
+            $remainder->value = [$r];
+            $quotient->is_negative = $this->is_negative != $y->is_negative;
+            return [$this->normalize($quotient), $this->normalize($remainder)];
+        }
+
+        $x = clone $this;
+        $y = clone $y;
+
+        $x_sign = $x->is_negative;
+        $y_sign = $y->is_negative;
+
+        $x->is_negative = $y->is_negative = false;
+
+        $diff = $x->compare($y);
+
+        if (!$diff) {
+            $temp = new static();
+            $temp->value = [1];
+            $temp->is_negative = $x_sign != $y_sign;
+            return [$this->normalize($temp), $this->normalize(static::$zero[static::class])];
+        }
+
+        if ($diff < 0) {
+            // if $x is negative, "add" $y.
+            if ($x_sign) {
+                $x = $y->subtract($x);
+            }
+            return [$this->normalize(static::$zero[static::class]), $this->normalize($x)];
+        }
+
+        // normalize $x and $y as described in HAC 14.23 / 14.24
+        $msb = $y->value[count($y->value) - 1];
+        for ($shift = 0; !($msb & static::MSB); ++$shift) {
+            $msb <<= 1;
+        }
+        $x->lshift($shift);
+        $y->lshift($shift);
+        $y_value = &$y->value;
+
+        $x_max = count($x->value) - 1;
+        $y_max = count($y->value) - 1;
+
+        $quotient = new static();
+        $quotient_value = &$quotient->value;
+        $quotient_value = self::array_repeat(0, $x_max - $y_max + 1);
+
+        static $temp, $lhs, $rhs;
+        if (!isset($temp)) {
+            $temp = new static();
+            $lhs = new static();
+            $rhs = new static();
+        }
+        if (static::class != $temp::class) {
+            $temp = new static();
+            $lhs = new static();
+            $rhs = new static();
+        }
+        $temp_value = &$temp->value;
+        $rhs_value =  &$rhs->value;
+
+        // $temp = $y << ($x_max - $y_max-1) in base 2**26
+        $temp_value = array_merge(self::array_repeat(0, $x_max - $y_max), $y_value);
+
+        while ($x->compare($temp) >= 0) {
+            // calculate the "common residue"
+            ++$quotient_value[$x_max - $y_max];
+            $x = $x->subtract($temp);
+            $x_max = count($x->value) - 1;
+        }
+
+        for ($i = $x_max; $i >= $y_max + 1; --$i) {
+            $x_value = &$x->value;
+            $x_window = [
+                $x_value[$i] ?? 0,
+                $x_value[$i - 1] ?? 0,
+                $x_value[$i - 2] ?? 0,
+            ];
+            $y_window = [
+                $y_value[$y_max],
+                ($y_max > 0) ? $y_value[$y_max - 1] : 0,
+            ];
+
+            $q_index = $i - $y_max - 1;
+            if ($x_window[0] == $y_window[0]) {
+                $quotient_value[$q_index] = static::MAX_DIGIT;
+            } else {
+                $quotient_value[$q_index] = self::safe_divide(
+                    $x_window[0] * static::BASE_FULL + $x_window[1],
+                    $y_window[0]
+                );
+            }
+
+            $temp_value = [$y_window[1], $y_window[0]];
+
+            $lhs->value = [$quotient_value[$q_index]];
+            $lhs = $lhs->multiply($temp);
+
+            $rhs_value = [$x_window[2], $x_window[1], $x_window[0]];
+
+            while ($lhs->compare($rhs) > 0) {
+                --$quotient_value[$q_index];
+
+                $lhs->value = [$quotient_value[$q_index]];
+                $lhs = $lhs->multiply($temp);
+            }
+
+            $adjust = self::array_repeat(0, $q_index);
+            $temp_value = [$quotient_value[$q_index]];
+            $temp = $temp->multiply($y);
+            $temp_value = &$temp->value;
+            if (count($temp_value)) {
+                $temp_value = array_merge($adjust, $temp_value);
+            }
+
+            $x = $x->subtract($temp);
+
+            if ($x->compare(static::$zero[static::class]) < 0) {
+                $temp_value = array_merge($adjust, $y_value);
+                $x = $x->add($temp);
+
+                --$quotient_value[$q_index];
+            }
+
+            $x_max = count($x_value) - 1;
+        }
+
+        // unnormalize the remainder
+        $x->rshift($shift);
+
+        $quotient->is_negative = $x_sign != $y_sign;
+
+        // calculate the "common residue", if appropriate
+        if ($x_sign) {
+            $y->rshift($shift);
+            $x = $y->subtract($x);
+        }
+
+        return [$this->normalize($quotient), $this->normalize($x)];
+    }
+
+    /**
+     * Divides a BigInteger by a regular integer
+     *
+     * abc / x = a00 / x + b0 / x + c / x
+     */
+    private static function divide_digit(array $dividend, int $divisor): array
+    {
+        $carry = 0;
+        $result = [];
+
+        for ($i = count($dividend) - 1; $i >= 0; --$i) {
+            $temp = static::BASE_FULL * $carry + (int) $dividend[$i];
+            $result[$i] = self::safe_divide($temp, $divisor);
+            $carry = (int)($temp - $divisor * $result[$i]);
+        }
+
+        return [$result, $carry];
+    }
+
+    /**
+     * Single digit division
+     *
+     * Even if int64 is being used the division operator will return a float64 value
+     * if the dividend is not evenly divisible by the divisor. Since a float64 doesn't
+     * have the precision of int64 this is a problem so, when int64 is being used,
+     * we'll guarantee that the dividend is divisible by first subtracting the remainder.
+     */
+    private static function safe_divide(int $x, int $y): int
+    {
+        if (static::BASE === 26) {
+            return (int)($x / $y);
+        }
+
+        // static::BASE === 31
+        /** @var int */
+        return ($x - ($x % $y)) / $y;
+    }
+
+    /**
+     * Convert an array / boolean to a PHP BigInteger object
+     *
+     * @return static
+     */
+    protected function convertToObj(array $arr): PHP
+    {
+        $result = new static();
+        $result->value = $arr[self::VALUE];
+        $result->is_negative = $arr[self::SIGN];
+
+        return $this->normalize($result);
+    }
+
+    /**
+     * Normalize
+     *
+     * Removes leading zeros and truncates (if necessary) to maintain the appropriate precision
+     *
+     * @return static
+     */
+    protected function normalize(PHP $result): PHP
+    {
+        $result->precision = $this->precision;
+        $result->bitmask = $this->bitmask;
+
+        $value = &$result->value;
+
+        if (!count($value)) {
+            $result->is_negative = false;
+            return $result;
+        }
+
+        $value = static::trim($value);
+
+        if (!empty($result->bitmask->value)) {
+            $length = min(count($value), count($result->bitmask->value));
+            $value = array_slice($value, 0, $length);
+
+            for ($i = 0; $i < $length; ++$i) {
+                $value[$i] = $value[$i] & $result->bitmask->value[$i];
+            }
+
+            $value = static::trim($value);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Compares two numbers.
+     *
+     * @see static::compare()
+     */
+    protected static function compareHelper(array $x_value, bool $x_negative, array $y_value, bool $y_negative): int
+    {
+        if ($x_negative != $y_negative) {
+            return (!$x_negative && $y_negative) ? 1 : -1;
+        }
+
+        $result = $x_negative ? -1 : 1;
+
+        if (count($x_value) != count($y_value)) {
+            return (count($x_value) > count($y_value)) ? $result : -$result;
+        }
+        $size = max(count($x_value), count($y_value));
+
+        $x_value = array_pad($x_value, $size, 0);
+        $y_value = array_pad($y_value, $size, 0);
+
+        for ($i = count($x_value) - 1; $i >= 0; --$i) {
+            if ($x_value[$i] != $y_value[$i]) {
+                return ($x_value[$i] > $y_value[$i]) ? $result : -$result;
+            }
+        }
+
+        return 0;
+    }
+
+    /**
+     * Absolute value.
+     */
+    public function abs(): PHP
+    {
+        $temp = new static();
+        $temp->value = $this->value;
+
+        return $temp;
+    }
+
+    /**
+     * Trim
+     *
+     * Removes leading zeros
+     *
+     * @param list<static> $value
+     * @return list<static>
+     */
+    protected static function trim(array $value): array
+    {
+        for ($i = count($value) - 1; $i >= 0; --$i) {
+            if ($value[$i]) {
+                break;
+            }
+            unset($value[$i]);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Logical Right Shift
+     *
+     * Shifts BigInteger's by $shift bits, effectively dividing by 2**$shift.
+     */
+    public function bitwise_rightShift(int $shift): PHP
+    {
+        $temp = new static();
+
+        // could just replace lshift with this, but then all lshift() calls would need to be rewritten
+        // and I don't want to do that...
+        $temp->value = $this->value;
+        $temp->rshift($shift);
+
+        return $this->normalize($temp);
+    }
+
+    /**
+     * Logical Left Shift
+     *
+     * Shifts BigInteger's by $shift bits, effectively multiplying by 2**$shift.
+     */
+    public function bitwise_leftShift(int $shift): PHP
+    {
+        $temp = new static();
+        // could just replace _rshift with this, but then all _lshift() calls would need to be rewritten
+        // and I don't want to do that...
+        $temp->value = $this->value;
+        $temp->lshift($shift);
+
+        return $this->normalize($temp);
+    }
+
+    /**
+     * Converts 32-bit integers to bytes.
+     */
+    private static function int2bytes(int $x): string
+    {
+        return ltrim(pack('N', $x), chr(0));
+    }
+
+    /**
+     * Array Repeat
+     */
+    protected static function array_repeat(int $input, int $multiplier): array
+    {
+        return $multiplier ? array_fill(0, $multiplier, $input) : [];
+    }
+
+    /**
+     * Logical Left Shift
+     *
+     * Shifts BigInteger's by $shift bits.
+     */
+    protected function lshift(int $shift): void
+    {
+        if ($shift == 0) {
+            return;
+        }
+
+        $num_digits = (int)($shift / static::BASE);
+        $shift %= static::BASE;
+        $shift = 1 << $shift;
+
+        $carry = 0;
+
+        for ($i = 0; $i < count($this->value); ++$i) {
+            $temp = $this->value[$i] * $shift + $carry;
+            $carry = static::BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
+            $this->value[$i] = (int)($temp - $carry * static::BASE_FULL);
+        }
+
+        if ($carry) {
+            $this->value[count($this->value)] = $carry;
+        }
+
+        while ($num_digits--) {
+            array_unshift($this->value, 0);
+        }
+    }
+
+    /**
+     * Logical Right Shift
+     *
+     * Shifts BigInteger's by $shift bits.
+     */
+    protected function rshift(int $shift): void
+    {
+        if ($shift == 0) {
+            return;
+        }
+
+        $num_digits = (int)($shift / static::BASE);
+        $shift %= static::BASE;
+        $carry_shift = static::BASE - $shift;
+        $carry_mask = (1 << $shift) - 1;
+
+        if ($num_digits) {
+            $this->value = array_slice($this->value, $num_digits);
+        }
+
+        $carry = 0;
+
+        for ($i = count($this->value) - 1; $i >= 0; --$i) {
+            $temp = $this->value[$i] >> $shift | $carry;
+            $carry = ($this->value[$i] & $carry_mask) << $carry_shift;
+            $this->value[$i] = $temp;
+        }
+
+        $this->value = static::trim($this->value);
+    }
+
+    /**
+     * Performs modular exponentiation.
+     */
+    protected function powModInner(PHP $e, PHP $n): PHP
+    {
+        try {
+            $class = static::$modexpEngine[static::class];
+            return $class::powModHelper($this, $e, $n, static::class);
+        } catch (\Exception $err) {
+            return PHP\DefaultEngine::powModHelper($this, $e, $n, static::class);
+        }
+    }
+
+    /**
+     * Performs squaring
+     *
+     * @param list<static> $x
+     * @return list<static>
+     */
+    protected static function square(array $x): array
+    {
+        return count($x) < 2 * self::KARATSUBA_CUTOFF ?
+            self::trim(self::baseSquare($x)) :
+            self::trim(self::karatsubaSquare($x));
+    }
+
+    /**
+     * Performs traditional squaring on two BigIntegers
+     *
+     * Squaring can be done faster than multiplying a number by itself can be.  See
+     * {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=7 HAC 14.2.4} /
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=141 MPM 5.3} for more information.
+     */
+    protected static function baseSquare(array $value): array
+    {
+        if (empty($value)) {
+            return [];
+        }
+        $square_value = self::array_repeat(0, 2 * count($value));
+
+        for ($i = 0, $max_index = count($value) - 1; $i <= $max_index; ++$i) {
+            $i2 = $i << 1;
+
+            $temp = $square_value[$i2] + $value[$i] * $value[$i];
+            $carry = static::BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
+            $square_value[$i2] = (int)($temp - static::BASE_FULL * $carry);
+
+            // note how we start from $i+1 instead of 0 as we do in multiplication.
+            for ($j = $i + 1, $k = $i2 + 1; $j <= $max_index; ++$j, ++$k) {
+                $temp = $square_value[$k] + 2 * $value[$j] * $value[$i] + $carry;
+                $carry = static::BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
+                $square_value[$k] = (int)($temp - static::BASE_FULL * $carry);
+            }
+
+            // the following line can yield values larger 2**15.  at this point, PHP should switch
+            // over to floats.
+            $square_value[$i + $max_index + 1] = $carry;
+        }
+
+        return $square_value;
+    }
+
+    /**
+     * Performs Karatsuba "squaring" on two BigIntegers
+     *
+     * See {@link http://en.wikipedia.org/wiki/Karatsuba_algorithm Karatsuba algorithm} and
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=151 MPM 5.3.4}.
+     */
+    protected static function karatsubaSquare(array $value): array
+    {
+        $m = count($value) >> 1;
+
+        if ($m < self::KARATSUBA_CUTOFF) {
+            return self::baseSquare($value);
+        }
+
+        $x1 = array_slice($value, $m);
+        $x0 = array_slice($value, 0, $m);
+
+        $z2 = self::karatsubaSquare($x1);
+        $z0 = self::karatsubaSquare($x0);
+
+        $z1 = self::addHelper($x1, false, $x0, false);
+        $z1 = self::karatsubaSquare($z1[self::VALUE]);
+        $temp = self::addHelper($z2, false, $z0, false);
+        $z1 = self::subtractHelper($z1, false, $temp[self::VALUE], false);
+
+        $z2 = array_merge(array_fill(0, 2 * $m, 0), $z2);
+        $z1[self::VALUE] = array_merge(array_fill(0, $m, 0), $z1[self::VALUE]);
+
+        $xx = self::addHelper($z2, false, $z1[self::VALUE], $z1[self::SIGN]);
+        $xx = self::addHelper($xx[self::VALUE], $xx[self::SIGN], $z0, false);
+
+        return $xx[self::VALUE];
+    }
+
+    /**
+     * Make the current number odd
+     *
+     * If the current number is odd it'll be unchanged.  If it's even, one will be added to it.
+     *
+     * @see self::randomPrime()
+     */
+    protected function make_odd(): void
+    {
+        $this->value[0] |= 1;
+    }
+
+    /**
+     * Test the number against small primes.
+     *
+     * @see self::isPrime()
+     */
+    protected function testSmallPrimes(): bool
+    {
+        if ($this->value == [1]) {
+            return false;
+        }
+        if ($this->value == [2]) {
+            return true;
+        }
+        if (~$this->value[0] & 1) {
+            return false;
+        }
+
+        $value = $this->value;
+        foreach (static::PRIMES as $prime) {
+            [, $r] = self::divide_digit($value, $prime);
+            if (!$r) {
+                return count($value) == 1 && $value[0] == $prime;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Scan for 1 and right shift by that amount
+     *
+     * ie. $s = gmp_scan1($n, 0) and $r = gmp_div_q($n, gmp_pow(gmp_init('2'), $s));
+     *
+     * @return int
+     * @see self::isPrime()
+     */
+    public static function scan1divide(PHP $r)
+    {
+        $r_value = &$r->value;
+        for ($i = 0, $r_length = count($r_value); $i < $r_length; ++$i) {
+            $temp = ~$r_value[$i] & static::MAX_DIGIT;
+            for ($j = 1; ($temp >> $j) & 1; ++$j) {
+            }
+            if ($j <= static::BASE) {
+                break;
+            }
+        }
+        $s = static::BASE * $i + $j;
+        $r->rshift($s);
+        return $s;
+    }
+
+    /**
+     * Performs exponentiation.
+     */
+    protected function powHelper(PHP $n): PHP
+    {
+        if ($n->compare(static::$zero[static::class]) == 0) {
+            return new static(1);
+        } // n^0 = 1
+
+        $temp = clone $this;
+        while (!$n->equals(static::$one[static::class])) {
+            $temp = $temp->multiply($this);
+            $n = $n->subtract(static::$one[static::class]);
+        }
+
+        return $temp;
+    }
+
+    /**
+     * Is Odd?
+     */
+    public function isOdd(): bool
+    {
+        return (bool)($this->value[0] & 1);
+    }
+
+    /**
+     * Tests if a bit is set
+     */
+    public function testBit($x): bool
+    {
+        $digit = (int) floor($x / static::BASE);
+        $bit = $x % static::BASE;
+
+        if (!isset($this->value[$digit])) {
+            return false;
+        }
+
+        return (bool)($this->value[$digit] & (1 << $bit));
+    }
+
+    /**
+     * Is Negative?
+     */
+    public function isNegative(): bool
+    {
+        return $this->is_negative;
+    }
+
+    /**
+     * Negate
+     *
+     * Given $k, returns -$k
+     *
+     * @return static
+     */
+    public function negate(): PHP
+    {
+        $temp = clone $this;
+        $temp->is_negative = !$temp->is_negative;
+
+        return $temp;
+    }
+
+    /**
+     * Bitwise Split
+     *
+     * Splits BigInteger's into chunks of $split bits
+     *
+     * @return list<static>
+     */
+    public function bitwise_split(int $split): array
+    {
+        if ($split < 1) {
+            throw new RuntimeException('Offset must be greater than 1');
+        }
+
+        $width = (int)($split / static::BASE);
+        if (!$width) {
+            $arr = $this->bitwise_small_split($split);
+            return array_map(function ($digit) {
+                $temp = new static();
+                $temp->value = $digit != 0 ? [$digit] : [];
+                return $temp;
+            }, $arr);
+        }
+
+        $vals = [];
+        $val = $this->value;
+
+        $i = $overflow = 0;
+        $len = count($val);
+        while ($i < $len) {
+            $digit = [];
+            if (!$overflow) {
+                $digit = array_slice($val, $i, $width);
+                $i += $width;
+                $overflow = $split % static::BASE;
+                if ($overflow) {
+                    $mask = (1 << $overflow) - 1;
+                    $temp = $val[$i] ?? 0;
+                    $digit[] = $temp & $mask;
+                }
+            } else {
+                $remaining = static::BASE - $overflow;
+                $tempsplit = $split - $remaining;
+                $tempwidth = (int)($tempsplit / static::BASE + 1);
+                $digit = array_slice($val, $i, $tempwidth);
+                $i += $tempwidth;
+                $tempoverflow = $tempsplit % static::BASE;
+                if ($tempoverflow) {
+                    $tempmask = (1 << $tempoverflow) - 1;
+                    $temp = $val[$i] ?? 0;
+                    $digit[] = $temp & $tempmask;
+                }
+                $newbits = 0;
+                for ($j = count($digit) - 1; $j >= 0; $j--) {
+                    $temp = $digit[$j] & $mask;
+                    $digit[$j] = ($digit[$j] >> $overflow) | ($newbits << $remaining);
+                    $newbits = $temp;
+                }
+                $overflow = $tempoverflow;
+                $mask = $tempmask;
+            }
+            $temp = new static();
+            $temp->value = static::trim($digit);
+            $vals[] = $temp;
+        }
+
+        return array_reverse($vals);
+    }
+
+    /**
+     * Bitwise Split where $split < static::BASE
+     *
+     * @return list<int>
+     */
+    private function bitwise_small_split(int $split): array
+    {
+        $vals = [];
+        $val = $this->value;
+
+        $mask = (1 << $split) - 1;
+
+        $i = $overflow = 0;
+        $len = count($val);
+        $val[] = 0;
+        $remaining = static::BASE;
+        while ($i != $len) {
+            $digit = $val[$i] & $mask;
+            $val[$i] >>= $split;
+            if (!$overflow) {
+                $remaining -= $split;
+                $overflow = $split <= $remaining ? 0 : $split - $remaining;
+
+                if (!$remaining) {
+                    $i++;
+                    $remaining = static::BASE;
+                    $overflow = 0;
+                }
+            } elseif (++$i != $len) {
+                $tempmask = (1 << $overflow) - 1;
+                $digit |= ($val[$i] & $tempmask) << $remaining;
+                $val[$i] >>= $overflow;
+                $remaining = static::BASE - $overflow;
+                $overflow = $split <= $remaining ? 0 : $split - $remaining;
+            }
+
+            $vals[] = $digit;
+        }
+
+        while ($vals[count($vals) - 1] == 0) {
+            unset($vals[count($vals) - 1]);
+        }
+
+        return array_reverse($vals);
+    }
+
+    /**
+     * @return bool
+     */
+    protected static function testJITOnWindows()
+    {
+        // see https://github.com/php/php-src/issues/11917
+        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' && function_exists('opcache_get_status') && PHP_VERSION_ID < 80213 && !defined('PHPSECLIB_ALLOW_JIT')) {
+            $status = opcache_get_status();
+            if ($status && isset($status['jit']) && $status['jit']['enabled'] && $status['jit']['on']) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Return the size of a BigInteger in bits
+     */
+    public function getLength(): int
+    {
+        $max = count($this->value) - 1;
+        return $max != -1 ?
+            $max * static::BASE + intval(ceil(log($this->value[$max] + 1, 2))) :
+            0;
+    }
+}
diff --git a/phpseclib/Math/BigInteger/Engines/PHP/Base.php b/phpseclib/Math/BigInteger/Engines/PHP/Base.php
new file mode 100644
index 000000000..cc4da2a19
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/PHP/Base.php
@@ -0,0 +1,122 @@
+<?php
+
+/**
+ * PHP Modular Exponentiation Engine
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines\PHP;
+
+use phpseclib3\Math\BigInteger\Engines\PHP;
+
+/**
+ * PHP Modular Exponentiation Engine
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Base extends PHP
+{
+    /**
+     * Cache constants
+     *
+     * $cache[self::VARIABLE] tells us whether or not the cached data is still valid.
+     */
+    public const VARIABLE = 0;
+    /**
+     * $cache[self::DATA] contains the cached data.
+     */
+    public const DATA = 1;
+
+    /**
+     * Test for engine validity
+     */
+    public static function isValidEngine(): bool
+    {
+        return static::class != __CLASS__;
+    }
+
+    /**
+     * Performs modular exponentiation.
+     *
+     * The most naive approach to modular exponentiation has very unreasonable requirements, and
+     * and although the approach involving repeated squaring does vastly better, it, too, is impractical
+     * for our purposes.  The reason being that division - by far the most complicated and time-consuming
+     * of the basic operations (eg. +,-,*,/) - occurs multiple times within it.
+     *
+     * Modular reductions resolve this issue.  Although an individual modular reduction takes more time
+     * then an individual division, when performed in succession (with the same modulo), they're a lot faster.
+     *
+     * The two most commonly used modular reductions are Barrett and Montgomery reduction.  Montgomery reduction,
+     * although faster, only works when the gcd of the modulo and of the base being used is 1.  In RSA, when the
+     * base is a power of two, the modulo - a product of two primes - is always going to have a gcd of 1 (because
+     * the product of two odd numbers is odd), but what about when RSA isn't used?
+     *
+     * In contrast, Barrett reduction has no such constraint.  As such, some bigint implementations perform a
+     * Barrett reduction after every operation in the modpow function.  Others perform Barrett reductions when the
+     * modulo is even and Montgomery reductions when the modulo is odd.  BigInteger.java's modPow method, however,
+     * uses a trick involving the Chinese Remainder Theorem to factor the even modulo into two numbers - one odd and
+     * the other, a power of two - and recombine them, later.  This is the method that this modPow function uses.
+     * {@link http://islab.oregonstate.edu/papers/j34monex.pdf Montgomery Reduction with Even Modulus} elaborates.
+     */
+    protected static function powModHelper(PHP $x, PHP $e, PHP $n, string $class): PHP
+    {
+        if (empty($e->value)) {
+            $temp = new $class();
+            $temp->value = [1];
+            return $x->normalize($temp);
+        }
+
+        if ($e->value == [1]) {
+            [, $temp] = $x->divide($n);
+            return $x->normalize($temp);
+        }
+
+        if ($e->value == [2]) {
+            $temp = new $class();
+            $temp->value = $class::square($x->value);
+            [, $temp] = $temp->divide($n);
+            return $x->normalize($temp);
+        }
+
+        return $x->normalize(static::slidingWindow($x, $e, $n, $class));
+    }
+
+    /**
+     * Modular reduction preparation
+     *
+     * @see self::slidingWindow()
+     */
+    protected static function prepareReduce(array $x, array $n, string $class): array
+    {
+        return static::reduce($x, $n, $class);
+    }
+
+    /**
+     * Modular multiply
+     *
+     * @see self::slidingWindow()
+     */
+    protected static function multiplyReduce(array $x, array $y, array $n, string $class): array
+    {
+        $temp = $class::multiplyHelper($x, false, $y, false);
+        return static::reduce($temp[self::VALUE], $n, $class);
+    }
+
+    /**
+     * Modular square
+     *
+     * @see self::slidingWindow()
+     */
+    protected static function squareReduce(array $x, array $n, string $class): array
+    {
+        return static::reduce($class::square($x), $n, $class);
+    }
+}
diff --git a/phpseclib/Math/BigInteger/Engines/PHP/DefaultEngine.php b/phpseclib/Math/BigInteger/Engines/PHP/DefaultEngine.php
new file mode 100644
index 000000000..fdce27f8f
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/PHP/DefaultEngine.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * PHP Default Modular Exponentiation Engine
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines\PHP;
+
+use phpseclib3\Math\BigInteger\Engines\PHP\Reductions\EvalBarrett;
+
+/**
+ * PHP Default Modular Exponentiation Engine
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class DefaultEngine extends EvalBarrett
+{
+}
diff --git a/phpseclib/Math/BigInteger/Engines/PHP/Montgomery.php b/phpseclib/Math/BigInteger/Engines/PHP/Montgomery.php
new file mode 100644
index 000000000..40ddb0ab2
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/PHP/Montgomery.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * PHP Montgomery Modular Exponentiation Engine
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines\PHP;
+
+use phpseclib3\Math\BigInteger\Engines\Engine;
+use phpseclib3\Math\BigInteger\Engines\PHP;
+use phpseclib3\Math\BigInteger\Engines\PHP\Reductions\PowerOfTwo;
+
+/**
+ * PHP Montgomery Modular Exponentiation Engine
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Montgomery extends Base
+{
+    /**
+     * Test for engine validity
+     */
+    public static function isValidEngine(): bool
+    {
+        return static::class != __CLASS__;
+    }
+
+    /**
+     * Performs modular exponentiation.
+     *
+     * @template T of Engine
+     * @param class-string<T> $class
+     * @return T
+     */
+    protected static function slidingWindow(Engine $x, Engine $e, Engine $n, string $class)
+    {
+        // is the modulo odd?
+        if ($n->value[0] & 1) {
+            return parent::slidingWindow($x, $e, $n, $class);
+        }
+        // if it's not, it's even
+
+        // find the lowest set bit (eg. the max pow of 2 that divides $n)
+        for ($i = 0; $i < count($n->value); ++$i) {
+            if ($n->value[$i]) {
+                $temp = decbin($n->value[$i]);
+                $j = strlen($temp) - strrpos($temp, '1') - 1;
+                $j += $class::BASE * $i;
+                break;
+            }
+        }
+        // at this point, 2^$j * $n/(2^$j) == $n
+
+        $mod1 = clone $n;
+        $mod1->rshift($j);
+        $mod2 = new $class();
+        $mod2->value = [1];
+        $mod2->lshift($j);
+
+        $part1 = $mod1->value != [1] ? parent::slidingWindow($x, $e, $mod1, $class) : new $class();
+        $part2 = PowerOfTwo::slidingWindow($x, $e, $mod2, $class);
+
+        $y1 = $mod2->modInverse($mod1);
+        $y2 = $mod1->modInverse($mod2);
+
+        $result = $part1->multiply($mod2);
+        $result = $result->multiply($y1);
+
+        $temp = $part2->multiply($mod1);
+        $temp = $temp->multiply($y2);
+
+        $result = $result->add($temp);
+        [, $result] = $result->divide($n);
+
+        return $result;
+    }
+}
diff --git a/phpseclib/Math/BigInteger/Engines/PHP/OpenSSL.php b/phpseclib/Math/BigInteger/Engines/PHP/OpenSSL.php
new file mode 100644
index 000000000..7b721c75e
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/PHP/OpenSSL.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * OpenSSL Modular Exponentiation Engine
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines\PHP;
+
+use phpseclib3\Math\BigInteger\Engines\OpenSSL as Progenitor;
+
+/**
+ * OpenSSL Modular Exponentiation Engine
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class OpenSSL extends Progenitor
+{
+}
diff --git a/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Barrett.php b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Barrett.php
new file mode 100644
index 000000000..50d19307c
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Barrett.php
@@ -0,0 +1,284 @@
+<?php
+
+/**
+ * PHP Barrett Modular Exponentiation Engine
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines\PHP\Reductions;
+
+use phpseclib3\Math\BigInteger\Engines\PHP;
+use phpseclib3\Math\BigInteger\Engines\PHP\Base;
+
+/**
+ * PHP Barrett Modular Exponentiation Engine
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Barrett extends Base
+{
+    /**
+     * Barrett Modular Reduction
+     *
+     * See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=14 HAC 14.3.3} /
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=165 MPM 6.2.5} for more information.  Modified slightly,
+     * so as not to require negative numbers (initially, this script didn't support negative numbers).
+     *
+     * Employs "folding", as described at
+     * {@link http://www.cosic.esat.kuleuven.be/publications/thesis-149.pdf#page=66 thesis-149.pdf#page=66}.  To quote from
+     * it, "the idea [behind folding] is to find a value x' such that x (mod m) = x' (mod m), with x' being smaller than x."
+     *
+     * Unfortunately, the "Barrett Reduction with Folding" algorithm described in thesis-149.pdf is not, as written, all that
+     * usable on account of (1) its not using reasonable radix points as discussed in
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=162 MPM 6.2.2} and (2) the fact that, even with reasonable
+     * radix points, it only works when there are an even number of digits in the denominator.  The reason for (2) is that
+     * (x >> 1) + (x >> 1) != x / 2 + x / 2.  If x is even, they're the same, but if x is odd, they're not.  See the in-line
+     * comments for details.
+     *
+     * @param class-string<PHP> $class
+     */
+    protected static function reduce(array $n, array $m, string $class): array
+    {
+        static $cache = [
+            self::VARIABLE => [],
+            self::DATA => [],
+        ];
+
+        $m_length = count($m);
+
+        // if (self::compareHelper($n, $static::square($m)) >= 0) {
+        if (count($n) > 2 * $m_length) {
+            $lhs = new $class();
+            $rhs = new $class();
+            $lhs->value = $n;
+            $rhs->value = $m;
+            [, $temp] = $lhs->divide($rhs);
+            return $temp->value;
+        }
+
+        // if (m.length >> 1) + 2 <= m.length then m is too small and n can't be reduced
+        if ($m_length < 5) {
+            return self::regularBarrett($n, $m, $class);
+        }
+        // n = 2 * m.length
+        $correctionNeeded = false;
+        if ($m_length & 1) {
+            $correctionNeeded = true;
+            array_unshift($n, 0);
+            array_unshift($m, 0);
+            $m_length++;
+        }
+
+        if (($key = array_search($m, $cache[self::VARIABLE])) === false) {
+            $key = count($cache[self::VARIABLE]);
+            $cache[self::VARIABLE][] = $m;
+
+            $lhs = new $class();
+            $lhs_value = &$lhs->value;
+            $lhs_value = self::array_repeat(0, $m_length + ($m_length >> 1));
+            $lhs_value[] = 1;
+            $rhs = new $class();
+            $rhs->value = $m;
+
+            [$u, $m1] = $lhs->divide($rhs);
+            $u = $u->value;
+            $m1 = $m1->value;
+
+            $cache[self::DATA][] = [
+                'u' => $u, // m.length >> 1 (technically (m.length >> 1) + 1)
+                'm1' => $m1, // m.length
+            ];
+        } else {
+            [
+                'u' => $u,
+                'm1' => $m1
+            ] = $cache[self::DATA][$key];
+        }
+
+        $cutoff = $m_length + ($m_length >> 1);
+        $lsd = array_slice($n, 0, $cutoff); // m.length + (m.length >> 1)
+        $msd = array_slice($n, $cutoff);    // m.length >> 1
+
+        $lsd = self::trim($lsd);
+        $temp = $class::multiplyHelper($msd, false, $m1, false); // m.length + (m.length >> 1)
+        $n = $class::addHelper($lsd, false, $temp[self::VALUE], false); // m.length + (m.length >> 1) + 1 (so basically we're adding two same length numbers)
+        //if ($m_length & 1) {
+        //    return self::regularBarrett($n[self::VALUE], $m, $class);
+        //}
+
+        // (m.length + (m.length >> 1) + 1) - (m.length - 1) == (m.length >> 1) + 2
+        $temp = array_slice($n[self::VALUE], $m_length - 1);
+        // if even: ((m.length >> 1) + 2) + (m.length >> 1) == m.length + 2
+        // if odd:  ((m.length >> 1) + 2) + (m.length >> 1) == (m.length - 1) + 2 == m.length + 1
+        // note that these are upper bounds. let's say m.length is 2. then you'd be multiplying a
+        // 3 digit number by a 1 digit number. if you're doing 999 * 9 (in base 10) the result will
+        // be a 4 digit number. but if you're multiplying 111 * 1 then the result will be a 3 digit
+        // number.
+        $temp = $class::multiplyHelper($temp, false, $u, false);
+        // if even: (m.length + 2) - ((m.length >> 1) + 1) = m.length - (m.length >> 1) + 1
+        // if odd:  (m.length + 1) - ((m.length >> 1) + 1) = m.length - (m.length >> 1)
+        $temp = array_slice($temp[self::VALUE], ($m_length >> 1) + 1);
+        // if even: (m.length - (m.length >> 1) + 1) + m.length = 2 * m.length - (m.length >> 1) + 1
+        // if odd:  (m.length - (m.length >> 1)) + m.length     = 2 * m.length - (m.length >> 1)
+        $temp = $class::multiplyHelper($temp, false, $m, false);
+        // at this point, if m had an odd number of digits, we'd (probably) be subtracting a 2 * m.length - (m.length >> 1)
+        // digit number from a m.length + (m.length >> 1) + 1 digit number.  ie. there'd be an extra digit and the while loop
+        // following this comment would loop a lot (hence our calling _regularBarrett() in that situation).
+        $result = $class::subtractHelper($n[self::VALUE], false, $temp[self::VALUE], false);
+
+        while (self::compareHelper($result[self::VALUE], $result[self::SIGN], $m, false) >= 0) {
+            $result = $class::subtractHelper($result[self::VALUE], $result[self::SIGN], $m, false);
+        }
+
+        if ($correctionNeeded) {
+            array_shift($result[self::VALUE]);
+        }
+
+        return $result[self::VALUE];
+    }
+
+    /**
+     * (Regular) Barrett Modular Reduction
+     *
+     * For numbers with more than four digits BigInteger::_barrett() is faster.  The difference between that and this
+     * is that this function does not fold the denominator into a smaller form.
+     */
+    private static function regularBarrett(array $x, array $n, string $class): array
+    {
+        static $cache = [
+            self::VARIABLE => [],
+            self::DATA => [],
+        ];
+
+        $n_length = count($n);
+
+        if (count($x) > 2 * $n_length) {
+            $lhs = new $class();
+            $rhs = new $class();
+            $lhs->value = $x;
+            $rhs->value = $n;
+            [, $temp] = $lhs->divide($rhs);
+            return $temp->value;
+        }
+
+        if (($key = array_search($n, $cache[self::VARIABLE])) === false) {
+            $key = count($cache[self::VARIABLE]);
+            $cache[self::VARIABLE][] = $n;
+            $lhs = new $class();
+            $lhs_value = &$lhs->value;
+            $lhs_value = self::array_repeat(0, 2 * $n_length);
+            $lhs_value[] = 1;
+            $rhs = new $class();
+            $rhs->value = $n;
+            [$temp, ] = $lhs->divide($rhs); // m.length
+            $cache[self::DATA][] = $temp->value;
+        }
+
+        // 2 * m.length - (m.length - 1) = m.length + 1
+        $temp = array_slice($x, $n_length - 1);
+        // (m.length + 1) + m.length = 2 * m.length + 1
+        $temp = $class::multiplyHelper($temp, false, $cache[self::DATA][$key], false);
+        // (2 * m.length + 1) - (m.length - 1) = m.length + 2
+        $temp = array_slice($temp[self::VALUE], $n_length + 1);
+
+        // m.length + 1
+        $result = array_slice($x, 0, $n_length + 1);
+        // m.length + 1
+        $temp = self::multiplyLower($temp, false, $n, false, $n_length + 1, $class);
+        // $temp == array_slice($class::regularMultiply($temp, false, $n, false)->value, 0, $n_length + 1)
+
+        if (self::compareHelper($result, false, $temp[self::VALUE], $temp[self::SIGN]) < 0) {
+            $corrector_value = self::array_repeat(0, $n_length + 1);
+            $corrector_value[count($corrector_value)] = 1;
+            $result = $class::addHelper($result, false, $corrector_value, false);
+            $result = $result[self::VALUE];
+        }
+
+        // at this point, we're subtracting a number with m.length + 1 digits from another number with m.length + 1 digits
+        $result = $class::subtractHelper($result, false, $temp[self::VALUE], $temp[self::SIGN]);
+        while (self::compareHelper($result[self::VALUE], $result[self::SIGN], $n, false) > 0) {
+            $result = $class::subtractHelper($result[self::VALUE], $result[self::SIGN], $n, false);
+        }
+
+        return $result[self::VALUE];
+    }
+
+    /**
+     * Performs long multiplication up to $stop digits
+     *
+     * If you're going to be doing array_slice($product->value, 0, $stop), some cycles can be saved.
+     *
+     * @see self::regularBarrett()
+     */
+    private static function multiplyLower(array $x_value, bool $x_negative, array $y_value, bool $y_negative, int $stop, string $class): array
+    {
+        $x_length = count($x_value);
+        $y_length = count($y_value);
+
+        if (!$x_length || !$y_length) { // a 0 is being multiplied
+            return [
+                self::VALUE => [],
+                self::SIGN => false,
+            ];
+        }
+
+        if ($x_length < $y_length) {
+            $temp = $x_value;
+            $x_value = $y_value;
+            $y_value = $temp;
+
+            $x_length = count($x_value);
+            $y_length = count($y_value);
+        }
+
+        $product_value = self::array_repeat(0, $x_length + $y_length);
+
+        // the following for loop could be removed if the for loop following it
+        // (the one with nested for loops) initially set $i to 0, but
+        // doing so would also make the result in one set of unnecessary adds,
+        // since on the outermost loops first pass, $product->value[$k] is going
+        // to always be 0
+
+        $carry = 0;
+
+        for ($j = 0; $j < $x_length; ++$j) { // ie. $i = 0, $k = $i
+            $temp = $x_value[$j] * $y_value[0] + $carry; // $product_value[$k] == 0
+            $carry = $class::BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
+            $product_value[$j] = (int) ($temp - $class::BASE_FULL * $carry);
+        }
+
+        if ($j < $stop) {
+            $product_value[$j] = $carry;
+        }
+
+        // the above for loop is what the previous comment was talking about.  the
+        // following for loop is the "one with nested for loops"
+
+        for ($i = 1; $i < $y_length; ++$i) {
+            $carry = 0;
+
+            for ($j = 0, $k = $i; $j < $x_length && $k < $stop; ++$j, ++$k) {
+                $temp = $product_value[$k] + $x_value[$j] * $y_value[$i] + $carry;
+                $carry = $class::BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
+                $product_value[$k] = (int) ($temp - $class::BASE_FULL * $carry);
+            }
+
+            if ($k < $stop) {
+                $product_value[$k] = $carry;
+            }
+        }
+
+        return [
+            self::VALUE => self::trim($product_value),
+            self::SIGN => $x_negative != $y_negative,
+        ];
+    }
+}
diff --git a/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Classic.php b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Classic.php
new file mode 100644
index 000000000..537a9d24d
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Classic.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * PHP Classic Modular Exponentiation Engine
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines\PHP\Reductions;
+
+use phpseclib3\Math\BigInteger\Engines\PHP\Base;
+
+/**
+ * PHP Classic Modular Exponentiation Engine
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Classic extends Base
+{
+    /**
+     * Regular Division
+     */
+    protected static function reduce(array $x, array $n, string $class): array
+    {
+        $lhs = new $class();
+        $lhs->value = $x;
+        $rhs = new $class();
+        $rhs->value = $n;
+        [, $temp] = $lhs->divide($rhs);
+        return $temp->value;
+    }
+}
diff --git a/phpseclib/Math/BigInteger/Engines/PHP/Reductions/EvalBarrett.php b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/EvalBarrett.php
new file mode 100644
index 000000000..a49d3443a
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/EvalBarrett.php
@@ -0,0 +1,460 @@
+<?php
+
+/**
+ * PHP Dynamic Barrett Modular Exponentiation Engine
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines\PHP\Reductions;
+
+use phpseclib3\Math\BigInteger\Engines\PHP;
+use phpseclib3\Math\BigInteger\Engines\PHP\Base;
+
+/**
+ * PHP Dynamic Barrett Modular Exponentiation Engine
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class EvalBarrett extends Base
+{
+    /**
+     * Custom Reduction Function
+     *
+     * @see self::generateCustomReduction
+     */
+    private static $custom_reduction;
+
+    /**
+     * Barrett Modular Reduction
+     *
+     * This calls a dynamically generated loop unrolled function that's specific to a given modulo.
+     * Array lookups are avoided as are if statements testing for how many bits the host OS supports, etc.
+     */
+    protected static function reduce(array $n, array $m, string $class): array
+    {
+        $inline = self::$custom_reduction;
+        return $inline($n);
+    }
+
+    /**
+     * Generate Custom Reduction
+     */
+    protected static function generateCustomReduction(PHP $m, string $class): callable
+    {
+        $m_length = count($m->value);
+
+        if ($m_length < 5) {
+            $code = '
+                $lhs = new ' . $class . '();
+                $lhs->value = $x;
+                $rhs = new ' . $class . '();
+                $rhs->value = [' .
+                implode(',', array_map(self::class . '::float2string', $m->value)) . '];
+                list(, $temp) = $lhs->divide($rhs);
+                return $temp->value;
+            ';
+            eval('$func = function ($x) { ' . $code . '};');
+            self::$custom_reduction = $func;
+            //self::$custom_reduction = \Closure::bind($func, $m, $class);
+            return $func;
+        }
+
+        $correctionNeeded = false;
+        if ($m_length & 1) {
+            $correctionNeeded = true;
+            $m = clone $m;
+            array_unshift($m->value, 0);
+            $m_length++;
+        }
+
+        $lhs = new $class();
+        $lhs_value = &$lhs->value;
+
+        $lhs_value = self::array_repeat(0, $m_length + ($m_length >> 1));
+        $lhs_value[] = 1;
+        $rhs = new $class();
+
+        [$u, $m1] = $lhs->divide($m);
+
+        if ($class::BASE != 26) {
+            $u = $u->value;
+        } else {
+            $lhs_value = self::array_repeat(0, 2 * $m_length);
+            $lhs_value[] = 1;
+            $rhs = new $class();
+
+            [$u] = $lhs->divide($m);
+            $u = $u->value;
+        }
+
+        $m = $m->value;
+        $m1 = $m1->value;
+
+        $cutoff = count($m) + (count($m) >> 1);
+
+        $code = $correctionNeeded ?
+            'array_unshift($n, 0);' :
+            '';
+
+        $code .= '
+            if (count($n) > ' . (2 * count($m)) . ') {
+                $lhs = new ' . $class . '();
+                $rhs = new ' . $class . '();
+                $lhs->value = $n;
+                $rhs->value = [' .
+                implode(',', array_map(self::class . '::float2string', $m)) . '];
+                list(, $temp) = $lhs->divide($rhs);
+                return $temp->value;
+            }
+
+            $lsd = array_slice($n, 0, ' . $cutoff . ');
+            $msd = array_slice($n, ' . $cutoff . ');';
+
+        $code .= self::generateInlineTrim('msd');
+        $code .= self::generateInlineMultiply('msd', $m1, 'temp', $class);
+        $code .= self::generateInlineAdd('lsd', 'temp', 'n', $class);
+
+        $code .= '$temp = array_slice($n, ' . (count($m) - 1) . ');';
+        $code .= self::generateInlineMultiply('temp', $u, 'temp2', $class);
+        $code .= self::generateInlineTrim('temp2');
+
+        $code .= $class::BASE == 26 ?
+            '$temp = array_slice($temp2, ' . (count($m) + 1) . ');' :
+            '$temp = array_slice($temp2, ' . ((count($m) >> 1) + 1) . ');';
+        $code .= self::generateInlineMultiply('temp', $m, 'temp2', $class);
+        $code .= self::generateInlineTrim('temp2');
+
+        /*
+        if ($class::BASE == 26) {
+            $code.= '$n = array_slice($n, 0, ' . (count($m) + 1) . ');
+                     $temp2 = array_slice($temp2, 0, ' . (count($m) + 1) . ');';
+        }
+        */
+
+        $code .= self::generateInlineSubtract2('n', 'temp2', 'temp', $class);
+
+        $subcode = self::generateInlineSubtract1('temp', $m, 'temp2', $class);
+        $subcode .= '$temp = $temp2;';
+
+        $code .= self::generateInlineCompare($m, 'temp', $subcode);
+
+        if ($correctionNeeded) {
+            $code .= 'array_shift($temp);';
+        }
+
+        $code .= 'return $temp;';
+
+        eval('$func = function ($n) { ' . $code . '};');
+
+        self::$custom_reduction = $func;
+
+        return $func;
+
+        //self::$custom_reduction = \Closure::bind($func, $m, $class);
+    }
+
+    /**
+     * Inline Trim
+     *
+     * Removes leading zeros
+     */
+    private static function generateInlineTrim(string $name): string
+    {
+        return '
+            for ($i = count($' . $name . ') - 1; $i >= 0; --$i) {
+                if ($' . $name . '[$i]) {
+                    break;
+                }
+                unset($' . $name . '[$i]);
+            }';
+    }
+
+    /**
+     * Inline Multiply (unknown, known)
+     */
+    private static function generateInlineMultiply(string $input, array $arr, string $output, string $class): string
+    {
+        if (!count($arr)) {
+            return 'return [];';
+        }
+
+        $regular = '
+            $length = count($' . $input . ');
+            if (!$length) {
+                $' . $output . ' = [];
+            }else{
+            $' . $output . ' = array_fill(0, $length + ' . count($arr) . ', 0);
+            $carry = 0;';
+
+        for ($i = 0; $i < count($arr); $i++) {
+            $regular .= '
+                $subtemp = $' . $input . '[0] * ' . $arr[$i];
+            $regular .= $i ? ' + $carry;' : ';';
+
+            $regular .= '$carry = ';
+            $regular .= $class::BASE === 26 ?
+            'intval($subtemp / 0x4000000);' :
+            '$subtemp >> 31;';
+            $regular .=
+            '$' . $output . '[' . $i . '] = ';
+            if ($class::BASE === 26) {
+                $regular .= '(int) (';
+            }
+            $regular .= '$subtemp - ' . $class::BASE_FULL . ' * $carry';
+            $regular .= $class::BASE === 26 ? ');' : ';';
+        }
+
+        $regular .= '$' . $output . '[' . count($arr) . '] = $carry;';
+
+        $regular .= '
+            for ($i = 1; $i < $length; ++$i) {';
+
+        for ($j = 0; $j < count($arr); $j++) {
+            $regular .= $j ? '$k++;' : '$k = $i;';
+            $regular .= '
+                $subtemp = $' . $output . '[$k] + $' . $input . '[$i] * ' . $arr[$j];
+            $regular .= $j ? ' + $carry;' : ';';
+
+            $regular .= '$carry = ';
+            $regular .= $class::BASE === 26 ?
+                'intval($subtemp / 0x4000000);' :
+                '$subtemp >> 31;';
+            $regular .=
+                '$' . $output . '[$k] = ';
+            if ($class::BASE === 26) {
+                $regular .= '(int) (';
+            }
+            $regular .= '$subtemp - ' . $class::BASE_FULL . ' * $carry';
+            $regular .= $class::BASE === 26 ? ');' : ';';
+        }
+
+        $regular .= '$' . $output . '[++$k] = $carry; $carry = 0;';
+
+        $regular .= '}}';
+
+        //if (count($arr) < 2 * self::KARATSUBA_CUTOFF) {
+        //}
+
+        return $regular;
+    }
+
+    /**
+     * Inline Addition
+     */
+    private static function generateInlineAdd(string $x, string $y, string $result, string $class): string
+    {
+        $code = '
+            $length = max(count($' . $x . '), count($' . $y . '));
+            $' . $result . ' = array_pad($' . $x . ', $length + 1, 0);
+            $_' . $y . ' = array_pad($' . $y . ', $length, 0);
+            $carry = 0;
+            for ($i = 0, $j = 1; $j < $length; $i+=2, $j+=2) {
+                $sum = ($' . $result . '[$j] + $_' . $y . '[$j]) * ' . $class::BASE_FULL . '
+                           + $' . $result . '[$i] + $_' . $y . '[$i] +
+                           $carry;
+                $carry = $sum >= ' . self::float2string($class::MAX_DIGIT2) . ';
+                $sum = $carry ? $sum - ' . self::float2string($class::MAX_DIGIT2) . ' : $sum;';
+
+            $code .= $class::BASE === 26 ?
+                '$upper = intval($sum / 0x4000000); $' . $result . '[$i] = (int) ($sum - ' . $class::BASE_FULL . ' * $upper);' :
+                '$upper = $sum >> 31; $' . $result . '[$i] = $sum - ' . $class::BASE_FULL . ' * $upper;';
+            $code .= '
+                $' . $result . '[$j] = $upper;
+            }
+            if ($j == $length) {
+                $sum = $' . $result . '[$i] + $_' . $y . '[$i] + $carry;
+                $carry = $sum >= ' . self::float2string($class::BASE_FULL) . ';
+                $' . $result . '[$i] = $carry ? $sum - ' . self::float2string($class::BASE_FULL) . ' : $sum;
+                ++$i;
+            }
+            if ($carry) {
+                for (; $' . $result . '[$i] == ' . $class::MAX_DIGIT . '; ++$i) {
+                    $' . $result . '[$i] = 0;
+                }
+                ++$' . $result . '[$i];
+            }';
+            $code .= self::generateInlineTrim($result);
+
+            return $code;
+    }
+
+    /**
+     * Inline Subtraction 2
+     *
+     * For when $known is more digits than $unknown. This is the harder use case to optimize for.
+     */
+    private static function generateInlineSubtract2(string $known, string $unknown, string $result, string $class): string
+    {
+        $code = '
+            $' . $result . ' = $' . $known . ';
+            $carry = 0;
+            $size = count($' . $unknown . ');
+            for ($i = 0, $j = 1; $j < $size; $i+= 2, $j+= 2) {
+                $sum = ($' . $known . '[$j] - $' . $unknown . '[$j]) * ' . $class::BASE_FULL . ' + $' . $known . '[$i]
+                    - $' . $unknown . '[$i]
+                    - $carry;
+                $carry = $sum < 0;
+                if ($carry) {
+                    $sum+= ' . self::float2string($class::MAX_DIGIT2) . ';
+                }
+                $subtemp = ';
+        $code .= $class::BASE === 26 ?
+            'intval($sum / 0x4000000);' :
+            '$sum >> 31;';
+        $code .= '$' . $result . '[$i] = ';
+        if ($class::BASE === 26) {
+            $code .= '(int) (';
+        }
+        $code .= '$sum - ' . $class::BASE_FULL . ' * $subtemp';
+        if ($class::BASE === 26) {
+            $code .= ')';
+        }
+        $code .= ';
+                $' . $result . '[$j] = $subtemp;
+            }
+            if ($j == $size) {
+                $sum = $' . $known . '[$i] - $' . $unknown . '[$i] - $carry;
+                $carry = $sum < 0;
+                $' . $result . '[$i] = $carry ? $sum + ' . $class::BASE_FULL . ' : $sum;
+                ++$i;
+            }
+
+            if ($carry) {
+                for (; !$' . $result . '[$i]; ++$i) {
+                    $' . $result . '[$i] = ' . $class::MAX_DIGIT . ';
+                }
+                --$' . $result . '[$i];
+            }';
+
+        $code .= self::generateInlineTrim($result);
+
+        return $code;
+    }
+
+    /**
+     * Inline Subtraction 1
+     *
+     * For when $unknown is more digits than $known. This is the easier use case to optimize for.
+     */
+    private static function generateInlineSubtract1(string $unknown, array $known, string $result, string $class): string
+    {
+        $code = '$' . $result . ' = $' . $unknown . ';';
+        for ($i = 0, $j = 1; $j < count($known); $i += 2, $j += 2) {
+            $code .= '$sum = $' . $unknown . '[' . $j . '] * ' . $class::BASE_FULL . ' + $' . $unknown . '[' . $i . '] - ';
+            $code .= self::float2string($known[$j] * $class::BASE_FULL + $known[$i]);
+            if ($i != 0) {
+                $code .= ' - $carry';
+            }
+
+            $code .= ';
+                if ($carry = $sum < 0) {
+                    $sum+= ' . self::float2string($class::MAX_DIGIT2) . ';
+                }
+                $subtemp = ';
+            $code .= $class::BASE === 26 ?
+                'intval($sum / 0x4000000);' :
+                '$sum >> 31;';
+            $code .= '
+                $' . $result . '[' . $i . '] = ';
+            if ($class::BASE === 26) {
+                $code .= ' (int) (';
+            }
+            $code .= '$sum - ' . $class::BASE_FULL . ' * $subtemp';
+            if ($class::BASE === 26) {
+                $code .= ')';
+            }
+            $code .= ';
+                $' . $result . '[' . $j . '] = $subtemp;';
+        }
+
+        $code .= '$i = ' . $i . ';';
+
+        if ($j == count($known)) {
+            $code .= '
+                $sum = $' . $unknown . '[' . $i . '] - ' . $known[$i] . ' - $carry;
+                $carry = $sum < 0;
+                $' . $result . '[' . $i . '] = $carry ? $sum + ' . $class::BASE_FULL . ' : $sum;
+                ++$i;';
+        }
+
+        $code .= '
+            if ($carry) {
+                for (; !$' . $result . '[$i]; ++$i) {
+                    $' . $result . '[$i] = ' . $class::MAX_DIGIT . ';
+                }
+                --$' . $result . '[$i];
+            }';
+        $code .= self::generateInlineTrim($result);
+
+        return $code;
+    }
+
+    /**
+     * Inline Comparison
+     *
+     * If $unknown >= $known then loop
+     */
+    private static function generateInlineCompare(array $known, string $unknown, string $subcode): string
+    {
+        $uniqid = uniqid();
+        $code = 'loop_' . $uniqid . ':
+            $clength = count($' . $unknown . ');
+            switch (true) {
+                case $clength < ' . count($known) . ':
+                    goto end_' . $uniqid . ';
+                case $clength > ' . count($known) . ':';
+        for ($i = count($known) - 1; $i >= 0; $i--) {
+            $code .= '
+                case $' . $unknown . '[' . $i . '] > ' . $known[$i] . ':
+                    goto subcode_' . $uniqid . ';
+                case $' . $unknown . '[' . $i . '] < ' . $known[$i] . ':
+                    goto end_' . $uniqid . ';';
+        }
+        $code .= '
+                default:
+                    // do subcode
+            }
+
+            subcode_' . $uniqid . ':' . $subcode . '
+            goto loop_' . $uniqid . ';
+
+            end_' . $uniqid . ':';
+
+        return $code;
+    }
+
+    /**
+     * Convert a float to a string
+     *
+     * If you do echo floatval(pow(2, 52)) you'll get 4.6116860184274E+18. It /can/ be displayed without a loss of
+     * precision but displayed in this way there will be precision loss, hence the need for this method.
+     *
+     * @param int|float $num
+     */
+    private static function float2string($num): string
+    {
+        if (!is_float($num)) {
+            return (string) $num;
+        }
+
+        if ($num < 0) {
+            return '-' . self::float2string(abs($num));
+        }
+
+        $temp = '';
+        while ($num) {
+            $temp = fmod($num, 10) . $temp;
+            $num = floor($num / 10);
+        }
+
+        return $temp;
+    }
+}
diff --git a/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Montgomery.php b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Montgomery.php
new file mode 100644
index 000000000..d7a38b637
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Montgomery.php
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * PHP Montgomery Modular Exponentiation Engine
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines\PHP\Reductions;
+
+use phpseclib3\Math\BigInteger\Engines\PHP\Montgomery as Progenitor;
+
+/**
+ * PHP Montgomery Modular Exponentiation Engine
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Montgomery extends Progenitor
+{
+    /**
+     * Prepare a number for use in Montgomery Modular Reductions
+     */
+    protected static function prepareReduce(array $x, array $n, string $class): array
+    {
+        $lhs = new $class();
+        $lhs->value = array_merge(self::array_repeat(0, count($n)), $x);
+        $rhs = new $class();
+        $rhs->value = $n;
+
+        [, $temp] = $lhs->divide($rhs);
+        return $temp->value;
+    }
+
+    /**
+     * Montgomery Multiply
+     *
+     * Interleaves the montgomery reduction and long multiplication algorithms together as described in
+     * {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=13 HAC 14.36}
+     */
+    protected static function reduce(array $x, array $n, string $class): array
+    {
+        static $cache = [
+            self::VARIABLE => [],
+            self::DATA => [],
+        ];
+
+        if (($key = array_search($n, $cache[self::VARIABLE])) === false) {
+            $key = count($cache[self::VARIABLE]);
+            $cache[self::VARIABLE][] = $x;
+            $cache[self::DATA][] = self::modInverse67108864($n, $class);
+        }
+
+        $k = count($n);
+
+        $result = [self::VALUE => $x];
+
+        for ($i = 0; $i < $k; ++$i) {
+            $temp = $result[self::VALUE][$i] * $cache[self::DATA][$key];
+            $temp = $temp - $class::BASE_FULL * ($class::BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31));
+            $temp = $class::regularMultiply([$temp], $n);
+            $temp = array_merge(self::array_repeat(0, $i), $temp);
+            $result = $class::addHelper($result[self::VALUE], false, $temp, false);
+        }
+
+        $result[self::VALUE] = array_slice($result[self::VALUE], $k);
+
+        if (self::compareHelper($result, false, $n, false) >= 0) {
+            $result = $class::subtractHelper($result[self::VALUE], false, $n, false);
+        }
+
+        return $result[self::VALUE];
+    }
+
+    /**
+     * Modular Inverse of a number mod 2**26 (eg. 67108864)
+     *
+     * Based off of the bnpInvDigit function implemented and justified in the following URL:
+     *
+     * {@link http://www-cs-students.stanford.edu/~tjw/jsbn/jsbn.js}
+     *
+     * The following URL provides more info:
+     *
+     * {@link http://groups.google.com/group/sci.crypt/msg/7a137205c1be7d85}
+     *
+     * As for why we do all the bitmasking...  strange things can happen when converting from floats to ints. For
+     * instance, on some computers, var_dump((int) -4294967297) yields int(-1) and on others, it yields
+     * int(-2147483648).  To avoid problems stemming from this, we use bitmasks to guarantee that ints aren't
+     * auto-converted to floats.  The outermost bitmask is present because without it, there's no guarantee that
+     * the "residue" returned would be the so-called "common residue".  We use fmod, in the last step, because the
+     * maximum possible $x is 26 bits and the maximum $result is 16 bits.  Thus, we have to be able to handle up to
+     * 40 bits, which only 64-bit floating points will support.
+     *
+     * Thanks to Pedro Gimeno Fortea for input!
+     */
+    protected static function modInverse67108864(array $x, string $class): int // 2**26 == 67,108,864
+    {
+        $x = -$x[0];
+        $result = $x & 0x3; // x**-1 mod 2**2
+        $result = ($result * (2 - $x * $result)) & 0xF; // x**-1 mod 2**4
+        $result = ($result * (2 - ($x & 0xFF) * $result))  & 0xFF; // x**-1 mod 2**8
+        $result = ($result * ((2 - ($x & 0xFFFF) * $result) & 0xFFFF)) & 0xFFFF; // x**-1 mod 2**16
+        $result = $class::BASE == 26 ?
+            fmod($result * (2 - fmod($x * $result, $class::BASE_FULL)), $class::BASE_FULL) : // x**-1 mod 2**26
+            ($result * (2 - ($x * $result) % $class::BASE_FULL)) % $class::BASE_FULL;
+        return $result & $class::MAX_DIGIT;
+    }
+}
diff --git a/phpseclib/Math/BigInteger/Engines/PHP/Reductions/MontgomeryMult.php b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/MontgomeryMult.php
new file mode 100644
index 000000000..03877c082
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/MontgomeryMult.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * PHP Montgomery Modular Exponentiation Engine with interleaved multiplication
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines\PHP\Reductions;
+
+use phpseclib3\Math\BigInteger\Engines\PHP;
+
+/**
+ * PHP Montgomery Modular Exponentiation Engine with interleaved multiplication
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class MontgomeryMult extends Montgomery
+{
+    /**
+     * Montgomery Multiply
+     *
+     * Interleaves the montgomery reduction and long multiplication algorithms together as described in
+     * {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=13 HAC 14.36}
+     *
+     * @param class-string<PHP> $class
+     * @see self::_prepMontgomery()
+          * @see self::_montgomery()
+     */
+    public static function multiplyReduce(array $x, array $y, array $m, string $class): array
+    {
+        // the following code, although not callable, can be run independently of the above code
+        // although the above code performed better in my benchmarks the following could might
+        // perform better under different circumstances. in lieu of deleting it it's just been
+        // made uncallable
+
+        static $cache = [
+            self::VARIABLE => [],
+            self::DATA => [],
+        ];
+
+        if (($key = array_search($m, $cache[self::VARIABLE])) === false) {
+            $key = count($cache[self::VARIABLE]);
+            $cache[self::VARIABLE][] = $m;
+            $cache[self::DATA][] = self::modInverse67108864($m, $class);
+        }
+
+        $n = max(count($x), count($y), count($m));
+        $x = array_pad($x, $n, 0);
+        $y = array_pad($y, $n, 0);
+        $m = array_pad($m, $n, 0);
+        $a = [self::VALUE => self::array_repeat(0, $n + 1)];
+        for ($i = 0; $i < $n; ++$i) {
+            $temp = $a[self::VALUE][0] + $x[$i] * $y[0];
+            $temp = $temp - $class::BASE_FULL * ($class::BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31));
+            $temp = $temp * $cache[self::DATA][$key];
+            $temp = $temp - $class::BASE_FULL * ($class::BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31));
+            $temp = $class::addHelper($class::regularMultiply([$x[$i]], $y), false, $class::regularMultiply([$temp], $m), false);
+            $a = $class::addHelper($a[self::VALUE], false, $temp[self::VALUE], false);
+            $a[self::VALUE] = array_slice($a[self::VALUE], 1);
+        }
+        if (self::compareHelper($a[self::VALUE], false, $m, false) >= 0) {
+            $a = $class::subtractHelper($a[self::VALUE], false, $m, false);
+        }
+        return $a[self::VALUE];
+    }
+}
diff --git a/phpseclib/Math/BigInteger/Engines/PHP/Reductions/PowerOfTwo.php b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/PowerOfTwo.php
new file mode 100644
index 000000000..16caf01b8
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/PowerOfTwo.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * PHP Power of Two Modular Exponentiation Engine
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines\PHP\Reductions;
+
+use phpseclib3\Math\BigInteger\Engines\PHP\Base;
+
+/**
+ * PHP Power Of Two Modular Exponentiation Engine
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class PowerOfTwo extends Base
+{
+    /**
+     * Prepare a number for use in Montgomery Modular Reductions
+     */
+    protected static function prepareReduce(array $x, array $n, string $class): array
+    {
+        return self::reduce($x, $n, $class);
+    }
+
+    /**
+     * Power Of Two Reduction
+     */
+    protected static function reduce(array $x, array $n, string $class): array
+    {
+        $lhs = new $class();
+        $lhs->value = $x;
+        $rhs = new $class();
+        $rhs->value = $n;
+
+        $temp = new $class();
+        $temp->value = [1];
+
+        $result = $lhs->bitwise_and($rhs->subtract($temp));
+        return $result->value;
+    }
+}
diff --git a/phpseclib/Math/BigInteger/Engines/PHP32.php b/phpseclib/Math/BigInteger/Engines/PHP32.php
new file mode 100644
index 000000000..21c40845d
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/PHP32.php
@@ -0,0 +1,317 @@
+<?php
+
+/**
+ * Pure-PHP 32-bit BigInteger Engine
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines;
+
+/**
+ * Pure-PHP 32-bit Engine.
+ *
+ * Uses 64-bit floats if int size is 4 bits
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class PHP32 extends PHP
+{
+    // Constants used by PHP.php
+    public const BASE = 26;
+    public const BASE_FULL = 0x4000000;
+    public const MAX_DIGIT = 0x3FFFFFF;
+    public const MSB = 0x2000000;
+
+    /**
+     * MAX10 in greatest MAX10LEN satisfying
+     * MAX10 = 10**MAX10LEN <= 2**BASE.
+     */
+    public const MAX10 = 10000000;
+
+    /**
+     * MAX10LEN in greatest MAX10LEN satisfying
+     * MAX10 = 10**MAX10LEN <= 2**BASE.
+     */
+    public const MAX10LEN = 7;
+    public const MAX_DIGIT2 = 4503599627370496;
+
+    /**
+     * Initialize a PHP32 BigInteger Engine instance
+     *
+     * @see parent::initialize()
+     */
+    protected function initialize(int $base): void
+    {
+        if ($base != 256 && $base != -256) {
+            parent::initialize($base);
+            return;
+        }
+
+        $val = $this->value;
+        $this->value = [];
+        $vals = &$this->value;
+        $i = strlen($val);
+        if (!$i) {
+            return;
+        }
+
+        while (true) {
+            $i -= 4;
+            if ($i < 0) {
+                if ($i == -4) {
+                    break;
+                }
+                $val = substr($val, 0, 4 + $i);
+                $val = str_pad($val, 4, "\0", STR_PAD_LEFT);
+                if ($val == "\0\0\0\0") {
+                    break;
+                }
+                $i = 0;
+            }
+            [, $digit] = unpack('N', substr($val, $i, 4));
+            if ($digit < 0) {
+                $digit += 0xFFFFFFFF + 1;
+            }
+            $step = count($vals) & 3;
+            if ($step) {
+                $digit = (int) floor($digit / 2 ** (2 * $step));
+            }
+            if ($step != 3) {
+                $digit = (int) fmod($digit, static::BASE_FULL);
+                $i++;
+            }
+            $vals[] = $digit;
+        }
+        while (end($vals) === 0) {
+            array_pop($vals);
+        }
+        reset($vals);
+    }
+
+    /**
+     * Test for engine validity
+     *
+     * @see parent::__construct()
+     */
+    public static function isValidEngine(): bool
+    {
+        return PHP_INT_SIZE >= 4 && !self::testJITOnWindows();
+    }
+
+    /**
+     * Adds two BigIntegers.
+     */
+    public function add(PHP32 $y): PHP32
+    {
+        $temp = self::addHelper($this->value, $this->is_negative, $y->value, $y->is_negative);
+
+        return $this->convertToObj($temp);
+    }
+
+    /**
+     * Subtracts two BigIntegers.
+     */
+    public function subtract(PHP32 $y): PHP32
+    {
+        $temp = self::subtractHelper($this->value, $this->is_negative, $y->value, $y->is_negative);
+
+        return $this->convertToObj($temp);
+    }
+
+    /**
+     * Multiplies two BigIntegers.
+     */
+    public function multiply(PHP32 $y): PHP32
+    {
+        $temp = self::multiplyHelper($this->value, $this->is_negative, $y->value, $y->is_negative);
+
+        return $this->convertToObj($temp);
+    }
+
+    /**
+     * Divides two BigIntegers.
+     *
+     * Returns an array whose first element contains the quotient and whose second element contains the
+     * "common residue".  If the remainder would be positive, the "common residue" and the remainder are the
+     * same.  If the remainder would be negative, the "common residue" is equal to the sum of the remainder
+     * and the divisor (basically, the "common residue" is the first positive modulo).
+     *
+     * @return array{PHP32, PHP32}
+     */
+    public function divide(PHP32 $y): array
+    {
+        return $this->divideHelper($y);
+    }
+
+    /**
+     * Calculates modular inverses.
+     *
+     * Say you have (30 mod 17 * x mod 17) mod 17 == 1.  x can be found using modular inverses.
+     * @return false|PHP32
+     */
+    public function modInverse(PHP32 $n)
+    {
+        return $this->modInverseHelper($n);
+    }
+
+    /**
+     * Calculates modular inverses.
+     *
+     * Say you have (30 mod 17 * x mod 17) mod 17 == 1.  x can be found using modular inverses.
+     * @return PHP32[]
+     */
+    public function extendedGCD(PHP32 $n): array
+    {
+        return $this->extendedGCDHelper($n);
+    }
+
+    /**
+     * Calculates the greatest common divisor
+     *
+     * Say you have 693 and 609.  The GCD is 21.
+     */
+    public function gcd(PHP32 $n): PHP32
+    {
+        return $this->extendedGCD($n)['gcd'];
+    }
+
+    /**
+     * Logical And
+     */
+    public function bitwise_and(PHP32 $x): PHP32
+    {
+        return $this->bitwiseAndHelper($x);
+    }
+
+    /**
+     * Logical Or
+     */
+    public function bitwise_or(PHP32 $x): PHP32
+    {
+        return $this->bitwiseOrHelper($x);
+    }
+
+    /**
+     * Logical Exclusive Or
+     */
+    public function bitwise_xor(PHP32 $x): PHP32
+    {
+        return $this->bitwiseXorHelper($x);
+    }
+
+    /**
+     * Compares two numbers.
+     *
+     * Although one might think !$x->compare($y) means $x != $y, it, in fact, means the opposite.  The reason for this is
+     * demonstrated thusly:
+     *
+     * $x  > $y: $x->compare($y)  > 0
+     * $x  < $y: $x->compare($y)  < 0
+     * $x == $y: $x->compare($y) == 0
+     *
+     * Note how the same comparison operator is used.  If you want to test for equality, use $x->equals($y).
+     *
+     * {@internal Could return $this->subtract($x), but that's not as fast as what we do do.}
+     *
+     * @return int in case < 0 if $this is less than $y; > 0 if $this is greater than $y, and 0 if they are equal.
+     * @see self::equals()
+     */
+    public function compare(PHP32 $y): int
+    {
+        return $this->compareHelper($this->value, $this->is_negative, $y->value, $y->is_negative);
+    }
+
+    /**
+     * Tests the equality of two numbers.
+     *
+     * If you need to see if one number is greater than or less than another number, use BigInteger::compare()
+     */
+    public function equals(PHP32 $x): bool
+    {
+        return $this->value === $x->value && $this->is_negative == $x->is_negative;
+    }
+
+    /**
+     * Performs modular exponentiation.
+     */
+    public function modPow(PHP32 $e, PHP32 $n): PHP32
+    {
+        return $this->powModOuter($e, $n);
+    }
+
+    /**
+     * Performs modular exponentiation.
+     *
+     * Alias for modPow().
+     */
+    public function powMod(PHP32 $e, PHP32 $n): PHP32
+    {
+        return $this->powModOuter($e, $n);
+    }
+
+    /**
+     * Generate a random prime number between a range
+     *
+     * If there's not a prime within the given range, false will be returned.
+     *
+     * @return false|PHP32
+     */
+    public static function randomRangePrime(PHP32 $min, PHP32 $max)
+    {
+        return self::randomRangePrimeOuter($min, $max);
+    }
+
+    /**
+     * Generate a random number between a range
+     *
+     * Returns a random number between $min and $max where $min and $max
+     * can be defined using one of the two methods:
+     *
+     * BigInteger::randomRange($min, $max)
+     * BigInteger::randomRange($max, $min)
+     */
+    public static function randomRange(PHP32 $min, PHP32 $max): PHP32
+    {
+        return self::randomRangeHelper($min, $max);
+    }
+
+    /**
+     * Performs exponentiation.
+     */
+    public function pow(PHP32 $n): PHP32
+    {
+        return $this->powHelper($n);
+    }
+
+    /**
+     * Return the minimum BigInteger between an arbitrary number of BigIntegers.
+     */
+    public static function min(PHP32 ...$nums): PHP32
+    {
+        return self::minHelper($nums);
+    }
+
+    /**
+     * Return the maximum BigInteger between an arbitrary number of BigIntegers.
+     */
+    public static function max(PHP32 ...$nums): PHP32
+    {
+        return self::maxHelper($nums);
+    }
+
+    /**
+     * Tests BigInteger to see if it is between two integers, inclusive
+     */
+    public function between(PHP32 $min, PHP32 $max): bool
+    {
+        return $this->compare($min) >= 0 && $this->compare($max) <= 0;
+    }
+}
diff --git a/phpseclib/Math/BigInteger/Engines/PHP64.php b/phpseclib/Math/BigInteger/Engines/PHP64.php
new file mode 100644
index 000000000..7c4ee54ff
--- /dev/null
+++ b/phpseclib/Math/BigInteger/Engines/PHP64.php
@@ -0,0 +1,320 @@
+<?php
+
+/**
+ * Pure-PHP 64-bit BigInteger Engine
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BigInteger\Engines;
+
+/**
+ * Pure-PHP 64-bit Engine.
+ *
+ * Uses 64-bit integers if int size is 8 bits
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class PHP64 extends PHP
+{
+    // Constants used by PHP.php
+    public const BASE = 31;
+    public const BASE_FULL = 0x80000000;
+    public const MAX_DIGIT = 0x7FFFFFFF;
+    public const MSB = 0x40000000;
+
+    /**
+     * MAX10 in greatest MAX10LEN satisfying
+     * MAX10 = 10**MAX10LEN <= 2**BASE.
+     */
+    public const MAX10 = 1000000000;
+
+    /**
+     * MAX10LEN in greatest MAX10LEN satisfying
+     * MAX10 = 10**MAX10LEN <= 2**BASE.
+     */
+    public const MAX10LEN = 9;
+    public const MAX_DIGIT2 = 4611686018427387904;
+
+    /**
+     * Initialize a PHP64 BigInteger Engine instance
+     *
+     * @see parent::initialize()
+     */
+    protected function initialize(int $base): void
+    {
+        if ($base != 256 && $base != -256) {
+            parent::initialize($base);
+            return;
+        }
+
+        $val = $this->value;
+        $this->value = [];
+        $vals = &$this->value;
+        $i = strlen($val);
+        if (!$i) {
+            return;
+        }
+
+        while (true) {
+            $i -= 4;
+            if ($i < 0) {
+                if ($i == -4) {
+                    break;
+                }
+                $val = substr($val, 0, 4 + $i);
+                $val = str_pad($val, 4, "\0", STR_PAD_LEFT);
+                if ($val == "\0\0\0\0") {
+                    break;
+                }
+                $i = 0;
+            }
+            [, $digit] = unpack('N', substr($val, $i, 4));
+            $step = count($vals) & 7;
+            if (!$step) {
+                $digit &= static::MAX_DIGIT;
+                $i++;
+            } else {
+                $shift = 8 - $step;
+                $digit >>= $shift;
+                $shift = 32 - $shift;
+                $digit &= (1 << $shift) - 1;
+                $temp = $i > 0 ? ord($val[$i - 1]) : 0;
+                $digit |= ($temp << $shift) & 0x7F000000;
+            }
+            $vals[] = $digit;
+        }
+        while (end($vals) === 0) {
+            array_pop($vals);
+        }
+        reset($vals);
+    }
+
+    /**
+     * Test for engine validity
+     *
+     * @see parent::__construct()
+     */
+    public static function isValidEngine(): bool
+    {
+        return PHP_INT_SIZE >= 8 && !self::testJITOnWindows();
+    }
+
+    /**
+     * Adds two BigIntegers.
+     */
+    public function add(PHP64 $y): PHP64
+    {
+        $temp = self::addHelper($this->value, $this->is_negative, $y->value, $y->is_negative);
+
+        return $this->convertToObj($temp);
+    }
+
+    /**
+     * Subtracts two BigIntegers.
+     */
+    public function subtract(PHP64 $y): PHP64
+    {
+        $temp = self::subtractHelper($this->value, $this->is_negative, $y->value, $y->is_negative);
+
+        return $this->convertToObj($temp);
+    }
+
+    /**
+     * Multiplies two BigIntegers.
+     */
+    public function multiply(PHP64 $y): PHP64
+    {
+        $temp = self::multiplyHelper($this->value, $this->is_negative, $y->value, $y->is_negative);
+
+        return $this->convertToObj($temp);
+    }
+
+    /**
+     * Divides two BigIntegers.
+     *
+     * Returns an array whose first element contains the quotient and whose second element contains the
+     * "common residue".  If the remainder would be positive, the "common residue" and the remainder are the
+     * same.  If the remainder would be negative, the "common residue" is equal to the sum of the remainder
+     * and the divisor (basically, the "common residue" is the first positive modulo).
+     *
+     * @return array{PHP64, PHP64}
+     */
+    public function divide(PHP64 $y): array
+    {
+        return $this->divideHelper($y);
+    }
+
+    /**
+     * Calculates modular inverses.
+     *
+     * Say you have (30 mod 17 * x mod 17) mod 17 == 1.  x can be found using modular inverses.
+     * @return false|PHP64
+     */
+    public function modInverse(PHP64 $n)
+    {
+        return $this->modInverseHelper($n);
+    }
+
+    /**
+     * Calculates modular inverses.
+     *
+     * Say you have (30 mod 17 * x mod 17) mod 17 == 1.  x can be found using modular inverses.
+     * @return PHP64[]
+     */
+    public function extendedGCD(PHP64 $n): array
+    {
+        return $this->extendedGCDHelper($n);
+    }
+
+    /**
+     * Calculates the greatest common divisor
+     *
+     * Say you have 693 and 609.  The GCD is 21.
+     */
+    public function gcd(PHP64 $n): PHP64
+    {
+        return $this->extendedGCD($n)['gcd'];
+    }
+
+    /**
+     * Logical And
+     */
+    public function bitwise_and(PHP64 $x): PHP64
+    {
+        return $this->bitwiseAndHelper($x);
+    }
+
+    /**
+     * Logical Or
+     */
+    public function bitwise_or(PHP64 $x): PHP64
+    {
+        return $this->bitwiseOrHelper($x);
+    }
+
+    /**
+     * Logical Exclusive Or
+     */
+    public function bitwise_xor(PHP64 $x): PHP64
+    {
+        return $this->bitwiseXorHelper($x);
+    }
+
+    /**
+     * Compares two numbers.
+     *
+     * Although one might think !$x->compare($y) means $x != $y, it, in fact, means the opposite.  The reason for this is
+     * demonstrated thusly:
+     *
+     * $x  > $y: $x->compare($y)  > 0
+     * $x  < $y: $x->compare($y)  < 0
+     * $x == $y: $x->compare($y) == 0
+     *
+     * Note how the same comparison operator is used.  If you want to test for equality, use $x->equals($y).
+     *
+     * {@internal Could return $this->subtract($x), but that's not as fast as what we do do.}
+     *
+     * @return int in case < 0 if $this is less than $y; > 0 if $this is greater than $y, and 0 if they are equal.
+     * @see self::equals()
+     */
+    public function compare(PHP64 $y): int
+    {
+        return parent::compareHelper($this->value, $this->is_negative, $y->value, $y->is_negative);
+    }
+
+    /**
+     * Tests the equality of two numbers.
+     *
+     * If you need to see if one number is greater than or less than another number, use BigInteger::compare()
+     */
+    public function equals(PHP64 $x): bool
+    {
+        return $this->value === $x->value && $this->is_negative == $x->is_negative;
+    }
+
+    /**
+     * Performs modular exponentiation.
+     */
+    public function modPow(PHP64 $e, PHP64 $n): PHP64
+    {
+        return $this->powModOuter($e, $n);
+    }
+
+    /**
+     * Performs modular exponentiation.
+     *
+     * Alias for modPow().
+     *
+     * @return PHP64|false
+     */
+    public function powMod(PHP64 $e, PHP64 $n)
+    {
+        return $this->powModOuter($e, $n);
+    }
+
+    /**
+     * Generate a random prime number between a range
+     *
+     * If there's not a prime within the given range, false will be returned.
+     *
+     * @return false|PHP64
+     */
+    public static function randomRangePrime(PHP64 $min, PHP64 $max)
+    {
+        return self::randomRangePrimeOuter($min, $max);
+    }
+
+    /**
+     * Generate a random number between a range
+     *
+     * Returns a random number between $min and $max where $min and $max
+     * can be defined using one of the two methods:
+     *
+     * BigInteger::randomRange($min, $max)
+     * BigInteger::randomRange($max, $min)
+     */
+    public static function randomRange(PHP64 $min, PHP64 $max): PHP64
+    {
+        return self::randomRangeHelper($min, $max);
+    }
+
+    /**
+     * Performs exponentiation.
+     */
+    public function pow(PHP64 $n): PHP64
+    {
+        return $this->powHelper($n);
+    }
+
+    /**
+     * Return the minimum BigInteger between an arbitrary number of BigIntegers.
+     */
+    public static function min(PHP64 ...$nums): PHP64
+    {
+        return self::minHelper($nums);
+    }
+
+    /**
+     * Return the maximum BigInteger between an arbitrary number of BigIntegers.
+     */
+    public static function max(PHP64 ...$nums): PHP64
+    {
+        return self::maxHelper($nums);
+    }
+
+    /**
+     * Tests BigInteger to see if it is between two integers, inclusive
+     */
+    public function between(PHP64 $min, PHP64 $max): bool
+    {
+        return $this->compare($min) >= 0 && $this->compare($max) <= 0;
+    }
+}
diff --git a/phpseclib/Math/BinaryField.php b/phpseclib/Math/BinaryField.php
new file mode 100644
index 000000000..ef92142be
--- /dev/null
+++ b/phpseclib/Math/BinaryField.php
@@ -0,0 +1,192 @@
+<?php
+
+/**
+ * Binary Finite Fields
+ *
+ * Utilizes the factory design pattern
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Exception\OutOfBoundsException;
+use phpseclib3\Math\BinaryField\Integer;
+use phpseclib3\Math\Common\FiniteField;
+
+/**
+ * Binary Finite Fields
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class BinaryField extends FiniteField
+{
+    /**
+     * Instance Counter
+     *
+     * @var int
+     */
+    private static $instanceCounter = 0;
+
+    /**
+     * Keeps track of current instance
+     *
+     * @var int
+     */
+    protected $instanceID;
+
+    /** @var BigInteger */
+    private $randomMax;
+
+    /**
+     * Default constructor
+     */
+    public function __construct(...$indices)
+    {
+        $m = array_shift($indices);
+        if ($m > 571) {
+            /* sect571r1 and sect571k1 are the largest binary curves that https://www.secg.org/sec2-v2.pdf defines
+               altho theoretically there may be legit reasons to use binary finite fields with larger degrees
+               imposing a limit on the maximum size is both reasonable and precedented. in particular,
+               http://tools.ietf.org/html/rfc4253#section-6.1 (The Secure Shell (SSH) Transport Layer Protocol) says
+               "implementations SHOULD check that the packet length is reasonable in order for the implementation to
+                avoid denial of service and/or buffer overflow attacks" */
+            throw new OutOfBoundsException('Degrees larger than 571 are not supported');
+        }
+        $val = str_repeat('0', $m) . '1';
+        foreach ($indices as $index) {
+            $val[$index] = '1';
+        }
+        $modulo = static::base2ToBase256(strrev($val));
+
+        $mStart = 2 * $m - 2;
+        $t = (int) ceil($m / 8);
+        $finalMask = chr((1 << ($m % 8)) - 1);
+        if ($finalMask == "\0") {
+            $finalMask = "\xFF";
+        }
+        $bitLen = $mStart + 1;
+        $pad = (int) ceil($bitLen / 8);
+        $h = $bitLen & 7;
+        $h = $h ? 8 - $h : 0;
+
+        $r = rtrim(substr($val, 0, -1), '0');
+        $u = [static::base2ToBase256(strrev($r))];
+        for ($i = 1; $i < 8; $i++) {
+            $u[] = static::base2ToBase256(strrev(str_repeat('0', $i) . $r));
+        }
+
+        // implements algorithm 2.40 (in section 2.3.5) in "Guide to Elliptic Curve Cryptography"
+        // with W = 8
+        $reduce = function ($c) use ($u, $mStart, $m, $t, $finalMask, $pad, $h) {
+            $c = str_pad($c, $pad, "\0", STR_PAD_LEFT);
+            for ($i = $mStart; $i >= $m;) {
+                $g = $h >> 3;
+                $mask = $h & 7;
+                $mask = $mask ? 1 << (7 - $mask) : 0x80;
+                for (; $mask > 0; $mask >>= 1, $i--, $h++) {
+                    if (ord($c[$g]) & $mask) {
+                        $temp = $i - $m;
+                        $j = $temp >> 3;
+                        $k = $temp & 7;
+                        $t1 = $j ? substr($c, 0, -$j) : $c;
+                        $length = strlen($t1);
+                        if ($length) {
+                            $t2 = str_pad($u[$k], $length, "\0", STR_PAD_LEFT);
+                            $temp = $t1 ^ $t2;
+                            $c = $j ? substr_replace($c, $temp, 0, $length) : $temp;
+                        }
+                    }
+                }
+            }
+            $c = substr($c, -$t);
+            if (strlen($c) == $t) {
+                $c[0] = $c[0] & $finalMask;
+            }
+            return ltrim($c, "\0");
+        };
+
+        $this->instanceID = self::$instanceCounter++;
+        Integer::setModulo($this->instanceID, $modulo);
+        Integer::setRecurringModuloFunction($this->instanceID, $reduce);
+
+        $this->randomMax = new BigInteger($modulo, 2);
+    }
+
+    /**
+     * Returns an instance of a dynamically generated PrimeFieldInteger class
+     *
+     * @param BigInteger|string $num
+     */
+    public function newInteger($num): Integer
+    {
+        return new Integer($this->instanceID, $num instanceof BigInteger ? $num->toBytes() : $num);
+    }
+
+    /**
+     * Returns an integer on the finite field between one and the prime modulo
+     */
+    public function randomInteger(): Integer
+    {
+        static $one;
+        if (!isset($one)) {
+            $one = new BigInteger(1);
+        }
+
+        return new Integer($this->instanceID, BigInteger::randomRange($one, $this->randomMax)->toBytes());
+    }
+
+    /**
+     * Returns the length of the modulo in bytes
+     */
+    public function getLengthInBytes(): int
+    {
+        return strlen(Integer::getModulo($this->instanceID));
+    }
+
+    /**
+     * Returns the length of the modulo in bits
+     */
+    public function getLength(): int
+    {
+        return strlen(Integer::getModulo($this->instanceID)) << 3;
+    }
+
+    /**
+     * Converts a base-2 string to a base-256 string
+     */
+    public static function base2ToBase256(string $x, ?int $size = null): string
+    {
+        $str = Strings::bits2bin($x);
+
+        $pad = strlen($x) >> 3;
+        if (strlen($x) & 3) {
+            $pad++;
+        }
+        $str = str_pad($str, $pad, "\0", STR_PAD_LEFT);
+        if (isset($size)) {
+            $str = str_pad($str, $size, "\0", STR_PAD_LEFT);
+        }
+
+        return $str;
+    }
+
+    /**
+     * Converts a base-256 string to a base-2 string
+     */
+    public static function base256ToBase2(string $x): string
+    {
+        if (function_exists('gmp_import')) {
+            return gmp_strval(gmp_import($x), 2);
+        }
+
+        return Strings::bin2bits($x);
+    }
+}
diff --git a/phpseclib/Math/BinaryField/Integer.php b/phpseclib/Math/BinaryField/Integer.php
new file mode 100644
index 000000000..ea3b208da
--- /dev/null
+++ b/phpseclib/Math/BinaryField/Integer.php
@@ -0,0 +1,489 @@
+<?php
+
+/**
+ * Binary Finite Fields
+ *
+ * In a binary finite field numbers are actually polynomial equations. If you
+ * represent the number as a sequence of bits you get a sequence of 1's or 0's.
+ * These 1's or 0's represent the coefficients of the x**n, where n is the
+ * location of the given bit. When you add numbers over a binary finite field
+ * the result should have a coefficient of 1 or 0 as well. Hence addition
+ * and subtraction become the same operation as XOR.
+ * eg. 1 + 1 + 1 == 3 % 2 == 1 or 0 - 1 == -1 % 2 == 1
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math\BinaryField;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Math\BinaryField;
+use phpseclib3\Math\Common\FiniteField\Integer as Base;
+
+/**
+ * Binary Finite Fields
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class Integer extends Base
+{
+    /**
+     * Holds the BinaryField's value
+     *
+     * @var string
+     */
+    protected $value;
+
+    /**
+     * Keeps track of current instance
+     *
+     * @var int
+     */
+    protected $instanceID;
+
+    /**
+     * Holds the PrimeField's modulo
+     *
+     * @var array<int, string>
+     */
+    protected static $modulo;
+
+    /**
+     * Holds a pre-generated function to perform modulo reductions
+     *
+     * @var callable[]
+     */
+    protected static $reduce;
+
+    /**
+     * Default constructor
+     */
+    public function __construct($instanceID, $num = '')
+    {
+        $this->instanceID = $instanceID;
+        if (!strlen($num)) {
+            $this->value = '';
+        } else {
+            $reduce = static::$reduce[$instanceID];
+            $this->value = $reduce($num);
+        }
+    }
+
+    /**
+     * Set the modulo for a given instance
+     */
+    public static function setModulo(int $instanceID, string $modulo): void
+    {
+        static::$modulo[$instanceID] = $modulo;
+    }
+
+    /**
+     * Set the modulo for a given instance
+     */
+    public static function setRecurringModuloFunction($instanceID, callable $function): void
+    {
+        static::$reduce[$instanceID] = $function;
+    }
+
+    /**
+     * Tests a parameter to see if it's of the right instance
+     *
+     * Throws an exception if the incorrect class is being utilized
+     */
+    private static function checkInstance(self $x, self $y): void
+    {
+        if ($x->instanceID != $y->instanceID) {
+            throw new UnexpectedValueException('The instances of the two BinaryField\Integer objects do not match');
+        }
+    }
+
+    /**
+     * Tests the equality of two numbers.
+     */
+    public function equals(self $x): bool
+    {
+        static::checkInstance($this, $x);
+
+        return $this->value == $x->value;
+    }
+
+    /**
+     * Compares two numbers.
+     */
+    public function compare(self $x): int
+    {
+        static::checkInstance($this, $x);
+
+        $a = $this->value;
+        $b = $x->value;
+
+        $length = max(strlen($a), strlen($b));
+
+        $a = str_pad($a, $length, "\0", STR_PAD_LEFT);
+        $b = str_pad($b, $length, "\0", STR_PAD_LEFT);
+
+        return strcmp($a, $b);
+    }
+
+    /**
+     * Returns the degree of the polynomial
+     *
+     * @return int
+     */
+    private static function deg(string $x)
+    {
+        $x = ltrim($x, "\0");
+        $xbit = decbin(ord($x[0]));
+        $xlen = $xbit == '0' ? 0 : strlen($xbit);
+        $len = strlen($x);
+        if (!$len) {
+            return -1;
+        }
+        return 8 * strlen($x) - 9 + $xlen;
+    }
+
+    /**
+     * Perform polynomial division
+     *
+     * @return string[]
+     * @link https://en.wikipedia.org/wiki/Polynomial_greatest_common_divisor#Euclidean_division
+     */
+    private static function polynomialDivide(string $x, string $y): array
+    {
+        // in wikipedia's description of the algorithm, lc() is the leading coefficient. over a binary field that's
+        // always going to be 1.
+
+        $q = chr(0);
+        $d = static::deg($y);
+        $r = $x;
+        while (($degr = static::deg($r)) >= $d) {
+            $s = '1' . str_repeat('0', $degr - $d);
+            $s = BinaryField::base2ToBase256($s);
+            $length = max(strlen($s), strlen($q));
+            $q = !isset($q) ? $s :
+                str_pad($q, $length, "\0", STR_PAD_LEFT) ^
+                str_pad($s, $length, "\0", STR_PAD_LEFT);
+            $s = static::polynomialMultiply($s, $y);
+            $length = max(strlen($r), strlen($s));
+            $r = str_pad($r, $length, "\0", STR_PAD_LEFT) ^
+                 str_pad($s, $length, "\0", STR_PAD_LEFT);
+        }
+
+        return [ltrim($q, "\0"), ltrim($r, "\0")];
+    }
+
+    /**
+     * Perform polynomial multiplation in the traditional way
+     *
+     * @link https://en.wikipedia.org/wiki/Finite_field_arithmetic#Multiplication
+     */
+    private static function regularPolynomialMultiply(string $x, string $y): string
+    {
+        $precomputed = [ltrim($x, "\0")];
+        $x = strrev(BinaryField::base256ToBase2($x));
+        $y = strrev(BinaryField::base256ToBase2($y));
+        if (strlen($x) == strlen($y)) {
+            $length = strlen($x);
+        } else {
+            $length = max(strlen($x), strlen($y));
+            $x = str_pad($x, $length, '0');
+            $y = str_pad($y, $length, '0');
+        }
+        $result = str_repeat('0', 2 * $length - 1);
+        $result = BinaryField::base2ToBase256($result);
+        $size = strlen($result);
+        $x = strrev($x);
+
+        // precompute left shift 1 through 7
+        for ($i = 1; $i < 8; $i++) {
+            $precomputed[$i] = BinaryField::base2ToBase256($x . str_repeat('0', $i));
+        }
+        for ($i = 0; $i < strlen($y); $i++) {
+            if ($y[$i] == '1') {
+                $temp = $precomputed[$i & 7] . str_repeat("\0", $i >> 3);
+                $result ^= str_pad($temp, $size, "\0", STR_PAD_LEFT);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Perform polynomial multiplation
+     *
+     * Uses karatsuba multiplication to reduce x-bit multiplications to a series of 32-bit multiplications
+     *
+     * @link https://en.wikipedia.org/wiki/Karatsuba_algorithm
+     */
+    private static function polynomialMultiply(string $x, string $y): string
+    {
+        if (strlen($x) == strlen($y)) {
+            $length = strlen($x);
+        } else {
+            $length = max(strlen($x), strlen($y));
+            $x = str_pad($x, $length, "\0", STR_PAD_LEFT);
+            $y = str_pad($y, $length, "\0", STR_PAD_LEFT);
+        }
+
+        switch (true) {
+            case PHP_INT_SIZE == 8 && $length <= 4:
+                return $length != 4 ?
+                    self::subMultiply(str_pad($x, 4, "\0", STR_PAD_LEFT), str_pad($y, 4, "\0", STR_PAD_LEFT)) :
+                    self::subMultiply($x, $y);
+            case PHP_INT_SIZE == 4 || $length > 32:
+                return self::regularPolynomialMultiply($x, $y);
+        }
+
+        $m = $length >> 1;
+
+        $x1 = substr($x, 0, -$m);
+        $x0 = substr($x, -$m);
+        $y1 = substr($y, 0, -$m);
+        $y0 = substr($y, -$m);
+
+        $z2 = self::polynomialMultiply($x1, $y1);
+        $z0 = self::polynomialMultiply($x0, $y0);
+        $z1 = self::polynomialMultiply(
+            self::subAdd2($x1, $x0),
+            self::subAdd2($y1, $y0)
+        );
+
+        $z1 = self::subAdd3($z1, $z2, $z0);
+
+        $xy = self::subAdd3(
+            $z2 . str_repeat("\0", 2 * $m),
+            $z1 . str_repeat("\0", $m),
+            $z0
+        );
+
+        return ltrim($xy, "\0");
+    }
+
+    /**
+     * Perform polynomial multiplication on 2x 32-bit numbers, returning
+     * a 64-bit number
+     *
+     * @link https://www.bearssl.org/constanttime.html#ghash-for-gcm
+     */
+    private static function subMultiply(string $x, string $y): string
+    {
+        $x = unpack('N', $x)[1];
+        $y = unpack('N', $y)[1];
+
+        $x0 = $x & 0x11111111;
+        $x1 = $x & 0x22222222;
+        $x2 = $x & 0x44444444;
+        $x3 = $x & 0x88888888;
+
+        $y0 = $y & 0x11111111;
+        $y1 = $y & 0x22222222;
+        $y2 = $y & 0x44444444;
+        $y3 = $y & 0x88888888;
+
+        $z0 = ($x0 * $y0) ^ ($x1 * $y3) ^ ($x2 * $y2) ^ ($x3 * $y1);
+        $z1 = ($x0 * $y1) ^ ($x1 * $y0) ^ ($x2 * $y3) ^ ($x3 * $y2);
+        $z2 = ($x0 * $y2) ^ ($x1 * $y1) ^ ($x2 * $y0) ^ ($x3 * $y3);
+        $z3 = ($x0 * $y3) ^ ($x1 * $y2) ^ ($x2 * $y1) ^ ($x3 * $y0);
+
+        $z0 &= 0x1111111111111111;
+        $z1 &= 0x2222222222222222;
+        $z2 &= 0x4444444444444444;
+        $z3 &= -8608480567731124088; // 0x8888888888888888 gets interpreted as a float
+
+        $z = $z0 | $z1 | $z2 | $z3;
+
+        return pack('J', $z);
+    }
+
+    /**
+     * Adds two numbers
+     */
+    private static function subAdd2(string $x, string $y): string
+    {
+        $length = max(strlen($x), strlen($y));
+        $x = str_pad($x, $length, "\0", STR_PAD_LEFT);
+        $y = str_pad($y, $length, "\0", STR_PAD_LEFT);
+        return $x ^ $y;
+    }
+
+    /**
+     * Adds three numbers
+     */
+    private static function subAdd3(string $x, string $y, $z): string
+    {
+        $length = max(strlen($x), strlen($y), strlen($z));
+        $x = str_pad($x, $length, "\0", STR_PAD_LEFT);
+        $y = str_pad($y, $length, "\0", STR_PAD_LEFT);
+        $z = str_pad($z, $length, "\0", STR_PAD_LEFT);
+        return $x ^ $y ^ $z;
+    }
+
+    /**
+     * Adds two BinaryFieldIntegers.
+     *
+     * @return static
+     */
+    public function add(self $y): Integer
+    {
+        static::checkInstance($this, $y);
+
+        $length = strlen(static::$modulo[$this->instanceID]);
+
+        $x = str_pad($this->value, $length, "\0", STR_PAD_LEFT);
+        $y = str_pad($y->value, $length, "\0", STR_PAD_LEFT);
+
+        return new static($this->instanceID, $x ^ $y);
+    }
+
+    /**
+     * Subtracts two BinaryFieldIntegers.
+     *
+     * @return static
+     */
+    public function subtract(self $x): Integer
+    {
+        return $this->add($x);
+    }
+
+    /**
+     * Multiplies two BinaryFieldIntegers.
+     *
+     * @return static
+     */
+    public function multiply(self $y): Integer
+    {
+        static::checkInstance($this, $y);
+
+        return new static($this->instanceID, static::polynomialMultiply($this->value, $y->value));
+    }
+
+    /**
+     * Returns the modular inverse of a BinaryFieldInteger
+     *
+     * @return static
+     */
+    public function modInverse(): Integer
+    {
+        $remainder0 = static::$modulo[$this->instanceID];
+        $remainder1 = $this->value;
+
+        if ($remainder1 == '') {
+            return new static($this->instanceID);
+        }
+
+        $aux0 = "\0";
+        $aux1 = "\1";
+        while ($remainder1 != "\1") {
+            [$q, $r] = static::polynomialDivide($remainder0, $remainder1);
+            $remainder0 = $remainder1;
+            $remainder1 = $r;
+            // the auxiliary in row n is given by the sum of the auxiliary in
+            // row n-2 and the product of the quotient and the auxiliary in row
+            // n-1
+            $temp = static::polynomialMultiply($aux1, $q);
+            $aux = str_pad($aux0, strlen($temp), "\0", STR_PAD_LEFT) ^
+                   str_pad($temp, strlen($aux0), "\0", STR_PAD_LEFT);
+            $aux0 = $aux1;
+            $aux1 = $aux;
+        }
+
+        $temp = new static($this->instanceID);
+        $temp->value = ltrim($aux1, "\0");
+        return $temp;
+    }
+
+    /**
+     * Divides two PrimeFieldIntegers.
+     *
+     * @return static
+     */
+    public function divide(self $x): Integer
+    {
+        static::checkInstance($this, $x);
+
+        $x = $x->modInverse();
+        return $this->multiply($x);
+    }
+
+    /**
+     * Negate
+     *
+     * A negative number can be written as 0-12. With modulos, 0 is the same thing as the modulo
+     * so 0-12 is the same thing as modulo-12
+     *
+     * @return object
+     */
+    public function negate()
+    {
+        $x = str_pad($this->value, strlen(static::$modulo[$this->instanceID]), "\0", STR_PAD_LEFT);
+
+        return new static($this->instanceID, $x ^ static::$modulo[$this->instanceID]);
+    }
+
+    /**
+     * Returns the modulo
+     */
+    public static function getModulo(int $instanceID): string
+    {
+        return static::$modulo[$instanceID];
+    }
+
+    /**
+     * Converts an Integer to a byte string (eg. base-256).
+     */
+    public function toBytes(): string
+    {
+        return str_pad($this->value, strlen(static::$modulo[$this->instanceID]), "\0", STR_PAD_LEFT);
+    }
+
+    /**
+     * Converts an Integer to a hex string (eg. base-16).
+     */
+    public function toHex(): string
+    {
+        return Strings::bin2hex($this->toBytes());
+    }
+
+    /**
+     * Converts an Integer to a bit string (eg. base-2).
+     */
+    public function toBits(): string
+    {
+        //return str_pad(BinaryField::base256ToBase2($this->value), strlen(static::$modulo[$this->instanceID]), '0', STR_PAD_LEFT);
+        return BinaryField::base256ToBase2($this->value);
+    }
+
+    /**
+     * Converts an Integer to a BigInteger
+     *
+     * @return string
+     */
+    public function toBigInteger()
+    {
+        return new BigInteger($this->value, 256);
+    }
+
+    /**
+     *  __toString() magic method
+     */
+    public function __toString()
+    {
+        return (string) $this->toBigInteger();
+    }
+
+    /**
+     *  __debugInfo() magic method
+     */
+    public function __debugInfo()
+    {
+        return ['value' => $this->toHex()];
+    }
+}
diff --git a/phpseclib/Math/Common/FiniteField.php b/phpseclib/Math/Common/FiniteField.php
new file mode 100644
index 000000000..6e097c8d0
--- /dev/null
+++ b/phpseclib/Math/Common/FiniteField.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Finite Fields Base Class
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+namespace phpseclib3\Math\Common;
+
+/**
+ * Finite Fields
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class FiniteField
+{
+}
diff --git a/phpseclib/Math/Common/FiniteField/Integer.php b/phpseclib/Math/Common/FiniteField/Integer.php
new file mode 100644
index 000000000..615a03e04
--- /dev/null
+++ b/phpseclib/Math/Common/FiniteField/Integer.php
@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Finite Field Integer Base Class
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+namespace phpseclib3\Math\Common\FiniteField;
+
+/**
+ * Finite Field Integer
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class Integer implements \JsonSerializable
+{
+    /**
+     * JSON Serialize
+     *
+     * Will be called, automatically, when json_encode() is called on a BigInteger object.
+     *
+     * PHP Serialize isn't supported because unserializing would require the factory be
+     * serialized as well and that just sounds like too much
+     *
+     * @return array{hex: string}
+     */
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize(): array
+    {
+        return ['hex' => $this->toHex(true)];
+    }
+
+    /**
+     * Converts an Integer to a hex string (eg. base-16).
+     */
+    abstract public function toHex(): string;
+}
diff --git a/phpseclib/Math/PrimeField.php b/phpseclib/Math/PrimeField.php
new file mode 100644
index 000000000..289cfcbb2
--- /dev/null
+++ b/phpseclib/Math/PrimeField.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * Prime Finite Fields
+ *
+ * Utilizes the factory design pattern
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Math;
+
+use phpseclib3\Math\Common\FiniteField;
+use phpseclib3\Math\PrimeField\Integer;
+
+/**
+ * Prime Finite Fields
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class PrimeField extends FiniteField
+{
+    /**
+     * Instance Counter
+     *
+     * @var int
+     */
+    private static $instanceCounter = 0;
+
+    /**
+     * Keeps track of current instance
+     *
+     * @var int
+     */
+    protected $instanceID;
+
+    /**
+     * Default constructor
+     */
+    public function __construct(BigInteger $modulo)
+    {
+        if (!$modulo->isPrime()) {
+            throw new \phpseclib3\Exception\UnexpectedValueException('PrimeField requires a prime number be passed to the constructor');
+        }
+
+        $this->instanceID = self::$instanceCounter++;
+        Integer::setModulo($this->instanceID, $modulo);
+        Integer::setRecurringModuloFunction($this->instanceID, $modulo->createRecurringModuloFunction());
+    }
+
+    /**
+     * Use a custom defined modular reduction function
+     */
+    public function setReduction(\Closure $func): void
+    {
+        $this->reduce = $func->bindTo($this, $this);
+    }
+
+    /**
+     * Returns an instance of a dynamically generated PrimeFieldInteger class
+     */
+    public function newInteger(BigInteger $num): Integer
+    {
+        return new Integer($this->instanceID, $num);
+    }
+
+    /**
+     * Returns an integer on the finite field between one and the prime modulo
+     */
+    public function randomInteger(): Integer
+    {
+        static $one;
+        if (!isset($one)) {
+            $one = new BigInteger(1);
+        }
+
+        return new Integer($this->instanceID, BigInteger::randomRange($one, Integer::getModulo($this->instanceID)));
+    }
+
+    /**
+     * Returns the length of the modulo in bytes
+     */
+    public function getLengthInBytes(): int
+    {
+        return Integer::getModulo($this->instanceID)->getLengthInBytes();
+    }
+
+    /**
+     * Returns the length of the modulo in bits
+     */
+    public function getLength(): int
+    {
+        return Integer::getModulo($this->instanceID)->getLength();
+    }
+
+    /**
+     *  Destructor
+     */
+    public function __destruct()
+    {
+        Integer::cleanupCache($this->instanceID);
+    }
+}
diff --git a/phpseclib/Math/PrimeField/Integer.php b/phpseclib/Math/PrimeField/Integer.php
new file mode 100644
index 000000000..5e5ec754b
--- /dev/null
+++ b/phpseclib/Math/PrimeField/Integer.php
@@ -0,0 +1,395 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Prime Finite Fields
+ *
+ * PHP version 5 and 7
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+namespace phpseclib3\Math\PrimeField;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Math\Common\FiniteField\Integer as Base;
+
+/**
+ * Prime Finite Fields
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+class Integer extends Base
+{
+    /**
+     * Holds the PrimeField's value
+     *
+     * @var BigInteger
+     */
+    protected $value;
+
+    /**
+     * Keeps track of current instance
+     *
+     * @var int
+     */
+    protected $instanceID;
+
+    /**
+     * Holds the PrimeField's modulo
+     *
+     * @var array<int, BigInteger>
+     */
+    protected static $modulo;
+
+    /**
+     * Holds a pre-generated function to perform modulo reductions
+     *
+     * @var array<int, callable(BigInteger):BigInteger>
+     */
+    protected static $reduce;
+
+    /**
+     * Zero
+     *
+     * @var BigInteger
+     */
+    protected static $zero;
+
+    /**
+     * Default constructor
+     */
+    public function __construct(int $instanceID, ?BigInteger $num = null)
+    {
+        $this->instanceID = $instanceID;
+        if (!isset($num)) {
+            $this->value = clone static::$zero[static::class];
+        } else {
+            $reduce = static::$reduce[$instanceID];
+            $this->value = $reduce($num);
+        }
+    }
+
+    /**
+     * Set the modulo for a given instance
+     */
+    public static function setModulo(int $instanceID, BigInteger $modulo): void
+    {
+        static::$modulo[$instanceID] = $modulo;
+    }
+
+    /**
+     * Set the modulo for a given instance
+     */
+    public static function setRecurringModuloFunction(int $instanceID, callable $function): void
+    {
+        static::$reduce[$instanceID] = $function;
+        if (!isset(static::$zero[static::class])) {
+            static::$zero[static::class] = new BigInteger();
+        }
+    }
+
+    /**
+     * Delete the modulo for a given instance
+     */
+    public static function cleanupCache(int $instanceID): void
+    {
+        unset(static::$modulo[$instanceID]);
+        unset(static::$reduce[$instanceID]);
+    }
+
+    /**
+     * Returns the modulo
+     */
+    public static function getModulo(int $instanceID): BigInteger
+    {
+        return static::$modulo[$instanceID];
+    }
+
+    /**
+     * Tests a parameter to see if it's of the right instance
+     *
+     * Throws an exception if the incorrect class is being utilized
+     */
+    public static function checkInstance(self $x, self $y): void
+    {
+        if ($x->instanceID != $y->instanceID) {
+            throw new UnexpectedValueException('The instances of the two PrimeField\Integer objects do not match');
+        }
+    }
+
+    /**
+     * Tests the equality of two numbers.
+     */
+    public function equals(self $x): bool
+    {
+        static::checkInstance($this, $x);
+
+        return $this->value->equals($x->value);
+    }
+
+    /**
+     * Compares two numbers.
+     */
+    public function compare(self $x): int
+    {
+        static::checkInstance($this, $x);
+
+        return $this->value->compare($x->value);
+    }
+
+    /**
+     * Adds two PrimeFieldIntegers.
+     *
+     * @return static
+     */
+    public function add(self $x): Integer
+    {
+        static::checkInstance($this, $x);
+
+        $temp = new static($this->instanceID);
+        $temp->value = $this->value->add($x->value);
+        if ($temp->value->compare(static::$modulo[$this->instanceID]) >= 0) {
+            $temp->value = $temp->value->subtract(static::$modulo[$this->instanceID]);
+        }
+
+        return $temp;
+    }
+
+    /**
+     * Subtracts two PrimeFieldIntegers.
+     *
+     * @return static
+     */
+    public function subtract(self $x): Integer
+    {
+        static::checkInstance($this, $x);
+
+        $temp = new static($this->instanceID);
+        $temp->value = $this->value->subtract($x->value);
+        if ($temp->value->isNegative()) {
+            $temp->value = $temp->value->add(static::$modulo[$this->instanceID]);
+        }
+
+        return $temp;
+    }
+
+    /**
+     * Multiplies two PrimeFieldIntegers.
+     *
+     * @return static
+     */
+    public function multiply(self $x): Integer
+    {
+        static::checkInstance($this, $x);
+
+        return new static($this->instanceID, $this->value->multiply($x->value));
+    }
+
+    /**
+     * Divides two PrimeFieldIntegers.
+     *
+     * @return static
+     */
+    public function divide(self $x): Integer
+    {
+        static::checkInstance($this, $x);
+
+        $denominator = $x->value->modInverse(static::$modulo[$this->instanceID]);
+        return new static($this->instanceID, $this->value->multiply($denominator));
+    }
+
+    /**
+     * Performs power operation on a PrimeFieldInteger.
+     *
+     * @return static
+     */
+    public function pow(BigInteger $x): Integer
+    {
+        $temp = new static($this->instanceID);
+        $temp->value = $this->value->powMod($x, static::$modulo[$this->instanceID]);
+
+        return $temp;
+    }
+
+    /**
+     * Calculates the square root
+     *
+     * @link https://en.wikipedia.org/wiki/Tonelli%E2%80%93Shanks_algorithm
+     * @return static|false
+     */
+    public function squareRoot()
+    {
+        static $one, $two;
+        if (!isset($one)) {
+            $one = new BigInteger(1);
+            $two = new BigInteger(2);
+        }
+        $reduce = static::$reduce[$this->instanceID];
+        $p_1 = static::$modulo[$this->instanceID]->subtract($one);
+        $q = clone $p_1;
+        $s = BigInteger::scan1divide($q);
+        [$pow] = $p_1->divide($two);
+        for ($z = $one; !$z->equals(static::$modulo[$this->instanceID]); $z = $z->add($one)) {
+            $temp = $z->powMod($pow, static::$modulo[$this->instanceID]);
+            if ($temp->equals($p_1)) {
+                break;
+            }
+        }
+
+        $m = new BigInteger($s);
+        $c = $z->powMod($q, static::$modulo[$this->instanceID]);
+        $t = $this->value->powMod($q, static::$modulo[$this->instanceID]);
+        [$temp] = $q->add($one)->divide($two);
+        $r = $this->value->powMod($temp, static::$modulo[$this->instanceID]);
+
+        while (!$t->equals($one)) {
+            for ($i = clone $one; $i->compare($m) < 0; $i = $i->add($one)) {
+                if ($t->powMod($two->pow($i), static::$modulo[$this->instanceID])->equals($one)) {
+                    break;
+                }
+            }
+
+            if ($i->compare($m) == 0) {
+                return false;
+            }
+            $b = $c->powMod($two->pow($m->subtract($i)->subtract($one)), static::$modulo[$this->instanceID]);
+            $m = $i;
+            $c = $reduce($b->multiply($b));
+            $t = $reduce($t->multiply($c));
+            $r = $reduce($r->multiply($b));
+        }
+
+        return new static($this->instanceID, $r);
+    }
+
+    /**
+     * Is Odd?
+     */
+    public function isOdd(): bool
+    {
+        return $this->value->isOdd();
+    }
+
+    /**
+     * Negate
+     *
+     * A negative number can be written as 0-12. With modulos, 0 is the same thing as the modulo
+     * so 0-12 is the same thing as modulo-12
+     *
+     * @return static
+     */
+    public function negate(): Integer
+    {
+        return new static($this->instanceID, static::$modulo[$this->instanceID]->subtract($this->value));
+    }
+
+    /**
+     * Converts an Integer to a byte string (eg. base-256).
+     */
+    public function toBytes(): string
+    {
+        if (isset(static::$modulo[$this->instanceID])) {
+            $length = static::$modulo[$this->instanceID]->getLengthInBytes();
+            return str_pad($this->value->toBytes(), $length, "\0", STR_PAD_LEFT);
+        }
+        return $this->value->toBytes();
+    }
+
+    /**
+     * Converts an Integer to a hex string (eg. base-16).
+     */
+    public function toHex(): string
+    {
+        return Strings::bin2hex($this->toBytes());
+    }
+
+    /**
+     * Converts an Integer to a bit string (eg. base-2).
+     */
+    public function toBits(): string
+    {
+        // return $this->value->toBits();
+        static $length;
+        if (!isset($length)) {
+            $length = static::$modulo[$this->instanceID]->getLength();
+        }
+
+        return str_pad($this->value->toBits(), $length, '0', STR_PAD_LEFT);
+    }
+
+    /**
+     * Returns the w-ary non-adjacent form (wNAF)
+     *
+     * @param int $w optional
+     * @return array<int, int>
+     */
+    public function getNAF(int $w = 1): array
+    {
+        $w++;
+
+        $mask = new BigInteger((1 << $w) - 1);
+        $sub = new BigInteger(1 << $w);
+        //$sub = new BigInteger(1 << ($w - 1));
+        $d = $this->toBigInteger();
+        $d_i = [];
+
+        $i = 0;
+        while ($d->compare(static::$zero[static::class]) > 0) {
+            if ($d->isOdd()) {
+                // start mods
+
+                $bigInteger = $d->testBit($w - 1) ?
+                    $d->bitwise_and($mask)->subtract($sub) :
+                    //$sub->subtract($d->bitwise_and($mask)) :
+                    $d->bitwise_and($mask);
+                // end mods
+                $d = $d->subtract($bigInteger);
+                $d_i[$i] = (int) $bigInteger->toString();
+            } else {
+                $d_i[$i] = 0;
+            }
+            $shift = !$d->equals(static::$zero[static::class]) && $d->bitwise_and($mask)->equals(static::$zero[static::class]) ? $w : 1; // $w or $w + 1?
+            $d = $d->bitwise_rightShift($shift);
+            while (--$shift > 0) {
+                $d_i[++$i] = 0;
+            }
+            $i++;
+        }
+
+        return $d_i;
+    }
+
+    /**
+     * Converts an Integer to a BigInteger
+     */
+    public function toBigInteger(): BigInteger
+    {
+        return clone $this->value;
+    }
+
+    /**
+     *  __toString() magic method
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return (string) $this->value;
+    }
+
+    /**
+     *  __debugInfo() magic method
+     *
+     * @return array
+     */
+    public function __debugInfo()
+    {
+        return ['value' => $this->toHex()];
+    }
+}
diff --git a/phpseclib/Net/SCP.php b/phpseclib/Net/SCP.php
deleted file mode 100644
index a2818970f..000000000
--- a/phpseclib/Net/SCP.php
+++ /dev/null
@@ -1,340 +0,0 @@
-<?php
-
-/**
- * Pure-PHP implementation of SCP.
- *
- * PHP version 5
- *
- * The API for this library is modeled after the API from PHP's {@link http://php.net/book.ftp FTP extension}.
- *
- * Here's a short example of how to use this library:
- * <code>
- * <?php
- *    include 'vendor/autoload.php';
- *
- *    $ssh = new \phpseclib\Net\SSH2('www.domain.tld');
- *    if (!$ssh->login('username', 'password')) {
- *        exit('bad login');
- *    }
- *    $scp = new \phpseclib\Net\SCP($ssh);
- *
- *    $scp->put('abcd', str_repeat('x', 1024*1024));
- * ?>
- * </code>
- *
- * @category  Net
- * @package   SCP
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2010 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Net;
-
-use phpseclib\Net\SSH1;
-use phpseclib\Net\SSH2;
-use phpseclib\Exception\FileNotFoundException;
-
-/**
- * Pure-PHP implementations of SCP.
- *
- * @package SCP
- * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
- */
-class SCP
-{
-    /**#@+
-     * @access public
-     * @see \phpseclib\Net\SCP::put()
-     */
-    /**
-     * Reads data from a local file.
-     */
-    const SOURCE_LOCAL_FILE = 1;
-    /**
-     * Reads data from a string.
-     */
-    const SOURCE_STRING = 2;
-    /**#@-*/
-
-    /**#@+
-     * @access private
-     * @see \phpseclib\Net\SCP::_send()
-     * @see \phpseclib\Net\SCP::_receive()
-    */
-    /**
-     * SSH1 is being used.
-     */
-    const MODE_SSH1 = 1;
-    /**
-     * SSH2 is being used.
-     */
-    const MODE_SSH2 =  2;
-    /**#@-*/
-
-    /**
-     * SSH Object
-     *
-     * @var object
-     * @access private
-     */
-    var $ssh;
-
-    /**
-     * Packet Size
-     *
-     * @var int
-     * @access private
-     */
-    var $packet_size;
-
-    /**
-     * Mode
-     *
-     * @var int
-     * @access private
-     */
-    var $mode;
-
-    /**
-     * Default Constructor.
-     *
-     * Connects to an SSH server
-     *
-     * @param string $host
-     * @param int $port
-     * @param int $timeout
-     * @return \phpseclib\Net\SCP
-     * @access public
-     */
-    function __construct($ssh)
-    {
-        if ($ssh instanceof SSH2) {
-            $this->mode = self::MODE_SSH2;
-        } elseif ($ssh instanceof SSH1) {
-            $this->packet_size = 50000;
-            $this->mode = self::MODE_SSH1;
-        } else {
-            return;
-        }
-
-        $this->ssh = $ssh;
-    }
-
-    /**
-     * Uploads a file to the SCP server.
-     *
-     * By default, \phpseclib\Net\SCP::put() does not read from the local filesystem.  $data is dumped directly into $remote_file.
-     * So, for example, if you set $data to 'filename.ext' and then do \phpseclib\Net\SCP::get(), you will get a file, twelve bytes
-     * long, containing 'filename.ext' as its contents.
-     *
-     * Setting $mode to self::SOURCE_LOCAL_FILE will change the above behavior.  With self::SOURCE_LOCAL_FILE, $remote_file will
-     * contain as many bytes as filename.ext does on your local filesystem.  If your filename.ext is 1MB then that is how
-     * large $remote_file will be, as well.
-     *
-     * Currently, only binary mode is supported.  As such, if the line endings need to be adjusted, you will need to take
-     * care of that, yourself.
-     *
-     * @param string $remote_file
-     * @param string $data
-     * @param int $mode
-     * @param callable $callback
-     * @throws \phpseclib\Exception\FileNotFoundException if you're uploading via a file and the file doesn't exist
-     * @return bool
-     * @access public
-     */
-    function put($remote_file, $data, $mode = self::SOURCE_STRING, $callback = null)
-    {
-        if (!isset($this->ssh)) {
-            return false;
-        }
-
-        if (!$this->ssh->exec('scp -t ' . escapeshellarg($remote_file), false)) { // -t = to
-            return false;
-        }
-
-        $temp = $this->_receive();
-        if ($temp !== chr(0)) {
-            return false;
-        }
-
-        if ($this->mode == self::MODE_SSH2) {
-            $this->packet_size = $this->ssh->packet_size_client_to_server[SSH2::CHANNEL_EXEC] - 4;
-        }
-
-        $remote_file = basename($remote_file);
-
-        if ($mode == self::SOURCE_STRING) {
-            $size = strlen($data);
-        } else {
-            if (!is_file($data)) {
-                throw new FileNotFoundException("$data is not a valid file");
-            }
-
-            $fp = @fopen($data, 'rb');
-            if (!$fp) {
-                return false;
-            }
-            $size = filesize($data);
-        }
-
-        $this->_send('C0644 ' . $size . ' ' . $remote_file . "\n");
-
-        $temp = $this->_receive();
-        if ($temp !== chr(0)) {
-            return false;
-        }
-
-        $sent = 0;
-        while ($sent < $size) {
-            $temp = $mode & self::SOURCE_STRING ? substr($data, $sent, $this->packet_size) : fread($fp, $this->packet_size);
-            $this->_send($temp);
-            $sent+= strlen($temp);
-
-            if (is_callable($callback)) {
-                call_user_func($callback, $sent);
-            }
-        }
-        $this->_close();
-
-        if ($mode != self::SOURCE_STRING) {
-            fclose($fp);
-        }
-
-        return true;
-    }
-
-    /**
-     * Downloads a file from the SCP server.
-     *
-     * Returns a string containing the contents of $remote_file if $local_file is left undefined or a boolean false if
-     * the operation was unsuccessful.  If $local_file is defined, returns true or false depending on the success of the
-     * operation
-     *
-     * @param string $remote_file
-     * @param string $local_file
-     * @return mixed
-     * @access public
-     */
-    function get($remote_file, $local_file = false)
-    {
-        if (!isset($this->ssh)) {
-            return false;
-        }
-
-        if (!$this->ssh->exec('scp -f ' . escapeshellarg($remote_file), false)) { // -f = from
-            return false;
-        }
-
-        $this->_send("\0");
-
-        if (!preg_match('#(?<perms>[^ ]+) (?<size>\d+) (?<name>.+)#', rtrim($this->_receive()), $info)) {
-            return false;
-        }
-
-        $this->_send("\0");
-
-        $size = 0;
-
-        if ($local_file !== false) {
-            $fp = @fopen($local_file, 'wb');
-            if (!$fp) {
-                return false;
-            }
-        }
-
-        $content = '';
-        while ($size < $info['size']) {
-            $data = $this->_receive();
-            // SCP usually seems to split stuff out into 16k chunks
-            $size+= strlen($data);
-
-            if ($local_file === false) {
-                $content.= $data;
-            } else {
-                fputs($fp, $data);
-            }
-        }
-
-        $this->_close();
-
-        if ($local_file !== false) {
-            fclose($fp);
-            return true;
-        }
-
-        return $content;
-    }
-
-    /**
-     * Sends a packet to an SSH server
-     *
-     * @param string $data
-     * @access private
-     */
-    function _send($data)
-    {
-        switch ($this->mode) {
-            case self::MODE_SSH2:
-                $this->ssh->_send_channel_packet(SSH2::CHANNEL_EXEC, $data);
-                break;
-            case self::MODE_SSH1:
-                $data = pack('CNa*', NET_SSH1_CMSG_STDIN_DATA, strlen($data), $data);
-                $this->ssh->_send_binary_packet($data);
-        }
-    }
-
-    /**
-     * Receives a packet from an SSH server
-     *
-     * @return string
-     * @throws \UnexpectedValueException on receipt of an unexpected packet
-     * @access private
-     */
-    function _receive()
-    {
-        switch ($this->mode) {
-            case self::MODE_SSH2:
-                return $this->ssh->_get_channel_packet(SSH2::CHANNEL_EXEC, true);
-            case self::MODE_SSH1:
-                if (!$this->ssh->bitmap) {
-                    return false;
-                }
-                while (true) {
-                    $response = $this->ssh->_get_binary_packet();
-                    switch ($response[SSH1::RESPONSE_TYPE]) {
-                        case NET_SSH1_SMSG_STDOUT_DATA:
-                            extract(unpack('Nlength', $response[SSH1::RESPONSE_DATA]));
-                            return $this->ssh->_string_shift($response[SSH1::RESPONSE_DATA], $length);
-                        case NET_SSH1_SMSG_STDERR_DATA:
-                            break;
-                        case NET_SSH1_SMSG_EXITSTATUS:
-                            $this->ssh->_send_binary_packet(chr(NET_SSH1_CMSG_EXIT_CONFIRMATION));
-                            fclose($this->ssh->fsock);
-                            $this->ssh->bitmap = 0;
-                            return false;
-                        default:
-                            throw new \UnexpectedValueException('Unknown packet received');
-                    }
-                }
-        }
-    }
-
-    /**
-     * Closes the connection to an SSH server
-     *
-     * @access private
-     */
-    function _close()
-    {
-        switch ($this->mode) {
-            case self::MODE_SSH2:
-                $this->ssh->_close_channel(SSH2::CHANNEL_EXEC, true);
-                break;
-            case self::MODE_SSH1:
-                $this->ssh->disconnect();
-        }
-    }
-}
diff --git a/phpseclib/Net/SFTP.php b/phpseclib/Net/SFTP.php
index 3c92ae3d8..67a542197 100644
--- a/phpseclib/Net/SFTP.php
+++ b/phpseclib/Net/SFTP.php
@@ -5,9 +5,7 @@
  *
  * PHP version 5
  *
- * Currently only supports SFTPv2 and v3, which, according to wikipedia.org, "is the most widely used version,
- * implemented by the popular OpenSSH SFTP server".  If you want SFTPv4/5/6 support, provide me with access
- * to an SFTPv4/5/6 server.
+ * Supports SFTPv2/3/4/5/6. Defaults to v3.
  *
  * The API for this library is modeled after the API from PHP's {@link http://php.net/book.ftp FTP extension}.
  *
@@ -16,7 +14,7 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $sftp = new \phpseclib\Net\SFTP('www.domain.tld');
+ *    $sftp = new \phpseclib3\Net\SFTP('www.domain.tld');
  *    if (!$sftp->login('username', 'password')) {
  *        exit('Login Failed');
  *    }
@@ -27,84 +25,79 @@
  * ?>
  * </code>
  *
- * @category  Net
- * @package   SFTP
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2009 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\Net;
+declare(strict_types=1);
 
-use phpseclib\Net\SSH2;
-use phpseclib\Exception\FileNotFoundException;
+namespace phpseclib3\Net;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Exception\BadFunctionCallException;
+use phpseclib3\Exception\FileNotFoundException;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\Net\SFTP\Attribute;
+use phpseclib3\Net\SFTP\FileType;
+use phpseclib3\Net\SFTP\OpenFlag;
+use phpseclib3\Net\SFTP\OpenFlag5;
+use phpseclib3\Net\SFTP\PacketType;
+use phpseclib3\Net\SFTP\PacketType as SFTPPacketType;
+use phpseclib3\Net\SFTP\StatusCode;
+use phpseclib3\Net\SSH2\MessageType as SSH2MessageType;
 
 /**
  * Pure-PHP implementations of SFTP.
  *
- * @package SFTP
- * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
+ * @author Jim Wigginton <terrafrost@php.net>
  */
 class SFTP extends SSH2
 {
     /**
      * SFTP channel constant
      *
-     * \phpseclib\Net\SSH2::exec() uses 0 and \phpseclib\Net\SSH2::read() / \phpseclib\Net\SSH2::write() use 1.
+     * \phpseclib3\Net\SSH2::exec() uses 0 and \phpseclib3\Net\SSH2::read() / \phpseclib3\Net\SSH2::write() use 1.
      *
-     * @see \phpseclib\Net\SSH2::_send_channel_packet()
-     * @see \phpseclib\Net\SSH2::_get_channel_packet()
-     * @access private
+     * @see \phpseclib3\Net\SSH2::send_channel_packet()
+     * @see \phpseclib3\Net\SSH2::get_channel_packet()
      */
-    const CHANNEL = 0x100;
+    public const CHANNEL = 0x100;
 
-    /**#@+
-     * @access public
-     * @see \phpseclib\Net\SFTP::put()
-    */
     /**
      * Reads data from a local file.
+     *
+     * @see \phpseclib3\Net\SFTP::put()
      */
-    const SOURCE_LOCAL_FILE = 1;
+    public const SOURCE_LOCAL_FILE = 1;
     /**
      * Reads data from a string.
+     *
+     * @see \phpseclib3\Net\SFTP::put()
      */
     // this value isn't really used anymore but i'm keeping it reserved for historical reasons
-    const SOURCE_STRING = 2;
+    public const SOURCE_STRING = 2;
     /**
      * Reads data from callback:
      * function callback($length) returns string to proceed, null for EOF
+     *
+     * @see \phpseclib3\Net\SFTP::put()
      */
-    const SOURCE_CALLBACK = 16;
+    public const SOURCE_CALLBACK = 16;
     /**
      * Resumes an upload
-     */
-    const RESUME = 4;
-    /**
-     * Append a local file to an already existing remote file
-     */
-    const RESUME_START = 8;
-    /**#@-*/
-
-    /**
-     * Packet Types
      *
-     * @see self::__construct()
-     * @var array
-     * @access private
+     * @see \phpseclib3\Net\SFTP::put()
      */
-    var $packet_types = array();
-
+    public const RESUME = 4;
     /**
-     * Status Codes
+     * Append a local file to an already existing remote file
      *
-     * @see self::__construct()
-     * @var array
-     * @access private
+     * @see \phpseclib3\Net\SFTP::put()
      */
-    var $status_codes = array();
+    public const RESUME_START = 8;
 
     /**
      * The Request ID
@@ -112,11 +105,9 @@ class SFTP extends SSH2
      * The request ID exists in the off chance that a packet is sent out-of-order.  Of course, this library doesn't support
      * concurrent actions, so it's somewhat academic, here.
      *
-     * @var int
      * @see self::_send_sftp_packet()
-     * @access private
      */
-    var $request_id = false;
+    private bool $use_request_id = false;
 
     /**
      * The Packet Type
@@ -124,76 +115,103 @@ class SFTP extends SSH2
      * The request ID exists in the off chance that a packet is sent out-of-order.  Of course, this library doesn't support
      * concurrent actions, so it's somewhat academic, here.
      *
-     * @var int
      * @see self::_get_sftp_packet()
-     * @access private
      */
-    var $packet_type = -1;
+    private int $packet_type = -1;
 
     /**
      * Packet Buffer
      *
-     * @var string
      * @see self::_get_sftp_packet()
-     * @access private
      */
-    var $packet_buffer = '';
+    private string $packet_buffer = '';
 
     /**
      * Extensions supported by the server
      *
-     * @var array
      * @see self::_initChannel()
-     * @access private
      */
-    var $extensions = array();
+    private array $extensions = [];
 
     /**
      * Server SFTP version
      *
-     * @var int
      * @see self::_initChannel()
-     * @access private
      */
-    var $version;
+    private int $version;
+
+    /**
+     * Default Server SFTP version
+     *
+     * @see self::_initChannel()
+     */
+    private int $defaultVersion;
+
+    /**
+     * Preferred SFTP version
+     *
+     * @see self::_initChannel()
+     */
+    private int $preferredVersion = 3;
 
     /**
      * Current working directory
      *
-     * @var string
-     * @see self::_realpath()
+     * @see self::realpath()
      * @see self::chdir()
-     * @access private
      */
-    var $pwd = false;
+    private string|bool $pwd = false;
 
     /**
      * Packet Type Log
      *
      * @see self::getLog()
-     * @var array
-     * @access private
      */
-    var $packet_type_log = array();
+    private array $packet_type_log = [];
 
     /**
      * Packet Log
      *
      * @see self::getLog()
-     * @var array
-     * @access private
      */
-    var $packet_log = array();
+    private array $packet_log = [];
+
+    /**
+     * Real-time log file pointer
+     *
+     * @see self::_append_log()
+     * @var resource|closed-resource
+     */
+    private $realtime_log_file;
+
+    /**
+     * Real-time log file size
+     *
+     * @see self::_append_log()
+     */
+    private int $realtime_log_size;
+
+    /**
+     * Real-time log file wrap boolean
+     *
+     * @see self::_append_log()
+     */
+    private bool $realtime_log_wrap;
+
+    /**
+     * Current log size
+     *
+     * Should never exceed self::LOG_MAX_SIZE
+     */
+    private int $log_size;
 
     /**
      * Error information
      *
      * @see self::getSFTPErrors()
      * @see self::getLastSFTPError()
-     * @var string
-     * @access private
      */
-    var $sftp_errors = array();
+    private array $sftp_errors = [];
 
     /**
      * Stat Cache
@@ -204,237 +222,149 @@ class SFTP extends SSH2
      * @see self::_update_stat_cache()
      * @see self::_remove_from_stat_cache()
      * @see self::_query_stat_cache()
-     * @var array
-     * @access private
      */
-    var $stat_cache = array();
+    private array $stat_cache = [];
 
     /**
      * Max SFTP Packet Size
      *
      * @see self::__construct()
      * @see self::get()
-     * @var array
-     * @access private
      */
-    var $max_sftp_packet;
+    private int $max_sftp_packet;
 
     /**
      * Stat Cache Flag
      *
      * @see self::disableStatCache()
      * @see self::enableStatCache()
-     * @var bool
-     * @access private
      */
-    var $use_stat_cache = true;
+    private bool $use_stat_cache = true;
 
     /**
      * Sort Options
      *
      * @see self::_comparator()
      * @see self::setListOrder()
-     * @var array
-     * @access private
      */
-    var $sortOptions = array();
+    private array $sortOptions = [];
+
+    /**
+     * Canonicalization Flag
+     *
+     * Determines whether or not paths should be canonicalized before being
+     * passed on to the remote server.
+     *
+     * @see self::enablePathCanonicalization()
+     * @see self::disablePathCanonicalization()
+     * @see self::realpath()
+     */
+    private bool $canonicalize_paths = true;
+
+    /**
+     * Request Buffers
+     *
+     * @see self::_get_sftp_packet()
+     */
+    private array $requestBuffer = [];
+
+    /**
+     * Preserve timestamps on file downloads / uploads
+     *
+     * @see self::get()
+     * @see self::put()
+     */
+    private bool $preserveTime = false;
+
+    /**
+     * Arbitrary Length Packets Flag
+     *
+     * Determines whether or not packets of any length should be allowed,
+     * in cases where the server chooses the packet length (such as
+     * directory listings). By default, packets are only allowed to be
+     * 256 * 1024 bytes (SFTP_MAX_MSG_LENGTH from OpenSSH's sftp-common.h)
+     *
+     * @see self::enableArbitraryLengthPackets()
+     * @see self::_get_sftp_packet()
+     */
+    private bool $allow_arbitrary_length_packets = false;
+
+    /**
+     * Was the last packet due to the channels being closed or not?
+     *
+     * @see self::get()
+     * @see self::get_sftp_packet()
+     */
+    private bool $channel_close = false;
+
+    /**
+     * Has the SFTP channel been partially negotiated?
+     */
+    private bool $partial_init = false;
+
+    private int $queueSize = 32;
+    private int $uploadQueueSize = 1024;
 
     /**
      * Default Constructor.
      *
      * Connects to an SFTP server
-     *
-     * @param string $host
-     * @param int $port
-     * @param int $timeout
-     * @return \phpseclib\Net\SFTP
-     * @access public
      */
-    function __construct($host, $port = 22, $timeout = 10)
+    public function __construct($host, int $port = 22, int $timeout = 10)
     {
         parent::__construct($host, $port, $timeout);
 
         $this->max_sftp_packet = 1 << 15;
 
-        $this->packet_types = array(
-            1  => 'NET_SFTP_INIT',
-            2  => 'NET_SFTP_VERSION',
-            /* the format of SSH_FXP_OPEN changed between SFTPv4 and SFTPv5+:
-                   SFTPv5+: http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.1.1
-               pre-SFTPv5 : http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.3 */
-            3  => 'NET_SFTP_OPEN',
-            4  => 'NET_SFTP_CLOSE',
-            5  => 'NET_SFTP_READ',
-            6  => 'NET_SFTP_WRITE',
-            7  => 'NET_SFTP_LSTAT',
-            9  => 'NET_SFTP_SETSTAT',
-            11 => 'NET_SFTP_OPENDIR',
-            12 => 'NET_SFTP_READDIR',
-            13 => 'NET_SFTP_REMOVE',
-            14 => 'NET_SFTP_MKDIR',
-            15 => 'NET_SFTP_RMDIR',
-            16 => 'NET_SFTP_REALPATH',
-            17 => 'NET_SFTP_STAT',
-            /* the format of SSH_FXP_RENAME changed between SFTPv4 and SFTPv5+:
-                   SFTPv5+: http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.3
-               pre-SFTPv5 : http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.5 */
-            18 => 'NET_SFTP_RENAME',
-            19 => 'NET_SFTP_READLINK',
-            20 => 'NET_SFTP_SYMLINK',
-
-            101=> 'NET_SFTP_STATUS',
-            102=> 'NET_SFTP_HANDLE',
-            /* the format of SSH_FXP_NAME changed between SFTPv3 and SFTPv4+:
-                   SFTPv4+: http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-9.4
-               pre-SFTPv4 : http://tools.ietf.org/html/draft-ietf-secsh-filexfer-02#section-7 */
-            103=> 'NET_SFTP_DATA',
-            104=> 'NET_SFTP_NAME',
-            105=> 'NET_SFTP_ATTRS',
-
-            200=> 'NET_SFTP_EXTENDED'
-        );
-        $this->status_codes = array(
-            0 => 'NET_SFTP_STATUS_OK',
-            1 => 'NET_SFTP_STATUS_EOF',
-            2 => 'NET_SFTP_STATUS_NO_SUCH_FILE',
-            3 => 'NET_SFTP_STATUS_PERMISSION_DENIED',
-            4 => 'NET_SFTP_STATUS_FAILURE',
-            5 => 'NET_SFTP_STATUS_BAD_MESSAGE',
-            6 => 'NET_SFTP_STATUS_NO_CONNECTION',
-            7 => 'NET_SFTP_STATUS_CONNECTION_LOST',
-            8 => 'NET_SFTP_STATUS_OP_UNSUPPORTED',
-            9 => 'NET_SFTP_STATUS_INVALID_HANDLE',
-            10 => 'NET_SFTP_STATUS_NO_SUCH_PATH',
-            11 => 'NET_SFTP_STATUS_FILE_ALREADY_EXISTS',
-            12 => 'NET_SFTP_STATUS_WRITE_PROTECT',
-            13 => 'NET_SFTP_STATUS_NO_MEDIA',
-            14 => 'NET_SFTP_STATUS_NO_SPACE_ON_FILESYSTEM',
-            15 => 'NET_SFTP_STATUS_QUOTA_EXCEEDED',
-            16 => 'NET_SFTP_STATUS_UNKNOWN_PRINCIPAL',
-            17 => 'NET_SFTP_STATUS_LOCK_CONFLICT',
-            18 => 'NET_SFTP_STATUS_DIR_NOT_EMPTY',
-            19 => 'NET_SFTP_STATUS_NOT_A_DIRECTORY',
-            20 => 'NET_SFTP_STATUS_INVALID_FILENAME',
-            21 => 'NET_SFTP_STATUS_LINK_LOOP',
-            22 => 'NET_SFTP_STATUS_CANNOT_DELETE',
-            23 => 'NET_SFTP_STATUS_INVALID_PARAMETER',
-            24 => 'NET_SFTP_STATUS_FILE_IS_A_DIRECTORY',
-            25 => 'NET_SFTP_STATUS_BYTE_RANGE_LOCK_CONFLICT',
-            26 => 'NET_SFTP_STATUS_BYTE_RANGE_LOCK_REFUSED',
-            27 => 'NET_SFTP_STATUS_DELETE_PENDING',
-            28 => 'NET_SFTP_STATUS_FILE_CORRUPT',
-            29 => 'NET_SFTP_STATUS_OWNER_INVALID',
-            30 => 'NET_SFTP_STATUS_GROUP_INVALID',
-            31 => 'NET_SFTP_STATUS_NO_MATCHING_BYTE_RANGE_LOCK'
-        );
-        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-7.1
-        // the order, in this case, matters quite a lot - see \phpseclib\Net\SFTP::_parseAttributes() to understand why
-        $this->attributes = array(
-            0x00000001 => 'NET_SFTP_ATTR_SIZE',
-            0x00000002 => 'NET_SFTP_ATTR_UIDGID', // defined in SFTPv3, removed in SFTPv4+
-            0x00000004 => 'NET_SFTP_ATTR_PERMISSIONS',
-            0x00000008 => 'NET_SFTP_ATTR_ACCESSTIME',
-            // 0x80000000 will yield a floating point on 32-bit systems and converting floating points to integers
-            // yields inconsistent behavior depending on how php is compiled.  so we left shift -1 (which, in
-            // two's compliment, consists of all 1 bits) by 31.  on 64-bit systems this'll yield 0xFFFFFFFF80000000.
-            // that's not a problem, however, and 'anded' and a 32-bit number, as all the leading 1 bits are ignored.
-              -1 << 31 => 'NET_SFTP_ATTR_EXTENDED'
-        );
-        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.3
-        // the flag definitions change somewhat in SFTPv5+.  if SFTPv5+ support is added to this library, maybe name
-        // the array for that $this->open5_flags and similarily alter the constant names.
-        $this->open_flags = array(
-            0x00000001 => 'NET_SFTP_OPEN_READ',
-            0x00000002 => 'NET_SFTP_OPEN_WRITE',
-            0x00000004 => 'NET_SFTP_OPEN_APPEND',
-            0x00000008 => 'NET_SFTP_OPEN_CREATE',
-            0x00000010 => 'NET_SFTP_OPEN_TRUNCATE',
-            0x00000020 => 'NET_SFTP_OPEN_EXCL'
-        );
-        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-5.2
-        // see \phpseclib\Net\SFTP::_parseLongname() for an explanation
-        $this->file_types = array(
-            1 => 'NET_SFTP_TYPE_REGULAR',
-            2 => 'NET_SFTP_TYPE_DIRECTORY',
-            3 => 'NET_SFTP_TYPE_SYMLINK',
-            4 => 'NET_SFTP_TYPE_SPECIAL',
-            5 => 'NET_SFTP_TYPE_UNKNOWN',
-            // the followin types were first defined for use in SFTPv5+
-            // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-05#section-5.2
-            6 => 'NET_SFTP_TYPE_SOCKET',
-            7 => 'NET_SFTP_TYPE_CHAR_DEVICE',
-            8 => 'NET_SFTP_TYPE_BLOCK_DEVICE',
-            9 => 'NET_SFTP_TYPE_FIFO'
-        );
-        $this->_define_array(
-            $this->packet_types,
-            $this->status_codes,
-            $this->attributes,
-            $this->open_flags,
-            $this->file_types
-        );
-
-        if (!defined('NET_SFTP_QUEUE_SIZE')) {
-            define('NET_SFTP_QUEUE_SIZE', 50);
+        if (defined('NET_SFTP_QUEUE_SIZE')) {
+            $this->queueSize = NET_SFTP_QUEUE_SIZE;
+        }
+        if (defined('NET_SFTP_UPLOAD_QUEUE_SIZE')) {
+            $this->uploadQueueSize = NET_SFTP_UPLOAD_QUEUE_SIZE;
         }
     }
 
     /**
-     * Login
-     *
-     * @param string $username
-     * @param string $password
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @return bool
-     * @access public
+     * Check a few things before SFTP functions are called
      */
-    function login($username)
+    private function precheck(): bool
     {
-        $args = func_get_args();
-        if (!call_user_func_array(array(&$this, '_login'), $args)) {
+        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
             return false;
         }
 
-        $this->window_size_server_to_client[self::CHANNEL] = $this->window_size;
-
-        $packet = pack(
-            'CNa*N3',
-            NET_SSH2_MSG_CHANNEL_OPEN,
-            strlen('session'),
-            'session',
-            self::CHANNEL,
-            $this->window_size,
-            0x4000
-        );
-
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
+        if ($this->pwd === false) {
+            return $this->init_sftp_connection();
         }
 
-        $this->channel_status[self::CHANNEL] = NET_SSH2_MSG_CHANNEL_OPEN;
+        return true;
+    }
 
-        $response = $this->_get_channel_packet(self::CHANNEL);
-        if ($response === false) {
+    /**
+     * Partially initialize an SFTP connection
+     *
+     * @throws UnexpectedValueException on receipt of unexpected packets
+     */
+    private function partial_init_sftp_connection(): bool
+    {
+        $response = $this->open_channel(self::CHANNEL, true);
+        if ($response === true && $this->isTimeout()) {
             return false;
         }
 
-        $packet = pack(
-            'CNNa*CNa*',
-            NET_SSH2_MSG_CHANNEL_REQUEST,
+        $packet = Strings::packSSH2(
+            'CNsbs',
+            SSH2MessageType::CHANNEL_REQUEST,
             $this->server_channels[self::CHANNEL],
-            strlen('subsystem'),
             'subsystem',
-            1,
-            strlen('sftp'),
+            true,
             'sftp'
         );
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
+        $this->send_binary_packet($packet);
 
-        $this->channel_status[self::CHANNEL] = NET_SSH2_MSG_CHANNEL_REQUEST;
+        $this->channel_status[self::CHANNEL] = SSH2MessageType::CHANNEL_REQUEST;
 
-        $response = $this->_get_channel_packet(self::CHANNEL);
+        $response = $this->get_channel_packet(self::CHANNEL, true);
         if ($response === false) {
             // from PuTTY's psftp.exe
             $command = "test -x /usr/lib/sftp-server && exec /usr/lib/sftp-server\n" .
@@ -442,64 +372,58 @@ function login($username)
                        "exec sftp-server";
             // we don't do $this->exec($command, false) because exec() operates on a different channel and plus the SSH_MSG_CHANNEL_OPEN that exec() does
             // is redundant
-            $packet = pack(
-                'CNNa*CNa*',
-                NET_SSH2_MSG_CHANNEL_REQUEST,
+            $packet = Strings::packSSH2(
+                'CNsCs',
+                SSH2MessageType::CHANNEL_REQUEST,
                 $this->server_channels[self::CHANNEL],
-                strlen('exec'),
                 'exec',
                 1,
-                strlen($command),
                 $command
             );
-            if (!$this->_send_binary_packet($packet)) {
-                return false;
-            }
+            $this->send_binary_packet($packet);
 
-            $this->channel_status[self::CHANNEL] = NET_SSH2_MSG_CHANNEL_REQUEST;
+            $this->channel_status[self::CHANNEL] = SSH2MessageType::CHANNEL_REQUEST;
 
-            $response = $this->_get_channel_packet(self::CHANNEL);
+            $response = $this->get_channel_packet(self::CHANNEL, true);
             if ($response === false) {
                 return false;
             }
+        } elseif ($response === true && $this->isTimeout()) {
+            return false;
         }
 
-        $this->channel_status[self::CHANNEL] = NET_SSH2_MSG_CHANNEL_DATA;
+        $this->channel_status[self::CHANNEL] = SSH2MessageType::CHANNEL_DATA;
+        $this->send_sftp_packet(SFTPPacketType::INIT, "\0\0\0\3");
 
-        if (!$this->_send_sftp_packet(NET_SFTP_INIT, "\0\0\0\3")) {
-            return false;
+        $response = $this->get_sftp_packet();
+        if ($this->packet_type != SFTPPacketType::VERSION) {
+            throw new UnexpectedValueException(
+                'Expected PacketType::VERSION. '
+                . 'Got packet type: ' . $this->packet_type
+            );
         }
 
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_VERSION) {
-            throw new \UnexpectedValueException('Expected SSH_FXP_VERSION');
-        }
+        $this->use_request_id = true;
 
-        extract(unpack('Nversion', $this->_string_shift($response, 4)));
-        $this->version = $version;
+        [$this->defaultVersion] = Strings::unpackSSH2('N', $response);
         while (!empty($response)) {
-            extract(unpack('Nlength', $this->_string_shift($response, 4)));
-            $key = $this->_string_shift($response, $length);
-            extract(unpack('Nlength', $this->_string_shift($response, 4)));
-            $value = $this->_string_shift($response, $length);
+            [$key, $value] = Strings::unpackSSH2('ss', $response);
             $this->extensions[$key] = $value;
         }
 
-        /*
-         SFTPv4+ defines a 'newline' extension.  SFTPv3 seems to have unofficial support for it via 'newline@vandyke.com',
-         however, I'm not sure what 'newline@vandyke.com' is supposed to do (the fact that it's unofficial means that it's
-         not in the official SFTPv3 specs) and 'newline@vandyke.com' / 'newline' are likely not drop-in substitutes for
-         one another due to the fact that 'newline' comes with a SSH_FXF_TEXT bitmask whereas it seems unlikely that
-         'newline@vandyke.com' would.
-        */
-        /*
-        if (isset($this->extensions['newline@vandyke.com'])) {
-            $this->extensions['newline'] = $this->extensions['newline@vandyke.com'];
-            unset($this->extensions['newline@vandyke.com']);
-        }
-        */
+        $this->partial_init = true;
+
+        return true;
+    }
 
-        $this->request_id = 1;
+    /**
+     * (Re)initializes the SFTP channel
+     */
+    private function init_sftp_connection(): bool
+    {
+        if (!$this->partial_init && !$this->partial_init_sftp_connection()) {
+            return false;
+        }
 
         /*
          A Note on SFTPv4/5/6 support:
@@ -521,83 +445,165 @@ function login($username)
          So what do you do if you have a client whose initial SSH_FXP_INIT packet says it implements v3 and
          a server whose initial SSH_FXP_VERSION reply says it implements v4 and only v4?  If it only implements
          v4, the "versions" extension is likely not going to have been sent so version re-negotiation as discussed
-         in draft-ietf-secsh-filexfer-13 would be quite impossible.  As such, what \phpseclib\Net\SFTP would do is close the
+         in draft-ietf-secsh-filexfer-13 would be quite impossible.  As such, what \phpseclib3\Net\SFTP would do is close the
          channel and reopen it with a new and updated SSH_FXP_INIT packet.
         */
-        switch ($this->version) {
-            case 2:
-            case 3:
-                break;
-            default:
-                return false;
+        $this->version = $this->defaultVersion;
+        if (isset($this->extensions['versions']) && (!$this->preferredVersion || $this->preferredVersion != $this->version)) {
+            $versions = explode(',', $this->extensions['versions']);
+            $supported = [6, 5, 4];
+            if ($this->preferredVersion) {
+                $supported = array_diff($supported, [$this->preferredVersion]);
+                array_unshift($supported, $this->preferredVersion);
+            }
+            foreach ($supported as $ver) {
+                if (in_array($ver, $versions)) {
+                    if ($ver === $this->version) {
+                        break;
+                    }
+                    $this->version = (int) $ver;
+                    $packet = Strings::packSSH2('ss', 'version-select', "$ver");
+                    $this->send_sftp_packet(SFTPPacketType::EXTENDED, $packet);
+                    $response = $this->get_sftp_packet();
+                    if ($this->packet_type != SFTPPacketType::STATUS) {
+                        throw new UnexpectedValueException(
+                            'Expected PacketType::STATUS. '
+                            . 'Got packet type: ' . $this->packet_type
+                        );
+                    }
+                    [$status] = Strings::unpackSSH2('N', $response);
+                    if ($status != StatusCode::OK) {
+                        $this->logError($response, $status);
+                        throw new UnexpectedValueException(
+                            'Expected StatusCode::OK. '
+                            . ' Got ' . $status
+                        );
+                    }
+                    break;
+                }
+            }
+        }
+
+        /*
+         SFTPv4+ defines a 'newline' extension.  SFTPv3 seems to have unofficial support for it via 'newline@vandyke.com',
+         however, I'm not sure what 'newline@vandyke.com' is supposed to do (the fact that it's unofficial means that it's
+         not in the official SFTPv3 specs) and 'newline@vandyke.com' / 'newline' are likely not drop-in substitutes for
+         one another due to the fact that 'newline' comes with a SSH_FXF_TEXT bitmask whereas it seems unlikely that
+         'newline@vandyke.com' would.
+        */
+        /*
+        if (isset($this->extensions['newline@vandyke.com'])) {
+            $this->extensions['newline'] = $this->extensions['newline@vandyke.com'];
+            unset($this->extensions['newline@vandyke.com']);
+        }
+        */
+        if ($this->version < 2 || $this->version > 6) {
+            return false;
         }
 
-        $this->pwd = $this->_realpath('.');
+        $this->pwd = true;
+        try {
+            $this->pwd = $this->realpath('.');
+        } catch (\UnexpectedValueException $e) {
+            if (!$this->canonicalize_paths) {
+                throw $e;
+            }
+            $this->canonicalize_paths = false;
+            $this->reset_sftp();
+            return $this->init_sftp_connection();
+        }
 
-        $this->_update_stat_cache($this->pwd, array());
+        $this->update_stat_cache($this->pwd, []);
 
         return true;
     }
 
     /**
      * Disable the stat cache
-     *
-     * @access public
      */
-    function disableStatCache()
+    public function disableStatCache(): void
     {
         $this->use_stat_cache = false;
     }
 
     /**
      * Enable the stat cache
-     *
-     * @access public
      */
-    function enableStatCache()
+    public function enableStatCache(): void
     {
         $this->use_stat_cache = true;
     }
 
     /**
      * Clear the stat cache
+     */
+    public function clearStatCache(): void
+    {
+        $this->stat_cache = [];
+    }
+
+    /**
+     * Enable path canonicalization
+     */
+    public function enablePathCanonicalization(): void
+    {
+        $this->canonicalize_paths = true;
+    }
+
+    /**
+     * Disable path canonicalization
      *
-     * @access public
+     * If this is enabled then $sftp->pwd() will not return the canonicalized absolute path
+     */
+    public function disablePathCanonicalization(): void
+    {
+        $this->canonicalize_paths = false;
+    }
+
+    /**
+     * Enable arbitrary length packets
+     */
+    public function enableArbitraryLengthPackets(): void
+    {
+        $this->allow_arbitrary_length_packets = true;
+    }
+
+    /**
+     * Disable arbitrary length packets
      */
-    function clearStatCache()
+    public function disableArbitraryLengthPackets(): void
     {
-        $this->stat_cache = array();
+        $this->allow_arbitrary_length_packets = false;
     }
 
     /**
      * Returns the current directory name
      *
-     * @return mixed
-     * @access public
+     * @return string|bool
      */
-    function pwd()
+    public function pwd()
     {
+        if (!$this->precheck()) {
+            return false;
+        }
+
         return $this->pwd;
     }
 
     /**
      * Logs errors
-     *
-     * @param string $response
-     * @param int $status
-     * @access public
      */
-    function _logError($response, $status = -1)
+    private function logError(string $response, int $status = -1): void
     {
         if ($status == -1) {
-            extract(unpack('Nstatus', $this->_string_shift($response, 4)));
+            [$status] = Strings::unpackSSH2('N', $response);
         }
 
-        $error = $this->status_codes[$status];
+        $error = StatusCode::getConstantNameByValue($status);
 
         if ($this->version > 2) {
-            extract(unpack('Nlength', $this->_string_shift($response, 4)));
-            $this->sftp_errors[] = $error . ': ' . $this->_string_shift($response, $length);
+            [$message] = Strings::unpackSSH2('s', $response);
+            $this->sftp_errors[] = "$error: $message";
         } else {
             $this->sftp_errors[] = $error;
         }
@@ -609,43 +615,78 @@ function _logError($response, $status = -1)
      * SFTP doesn't provide a mechanism by which the current working directory can be changed, so we'll emulate it.  Returns
      * the absolute (canonicalized) path.
      *
-     * @see self::chdir()
-     * @param string $path
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @return mixed
-     * @access private
+     * If canonicalize_paths has been disabled using disablePathCanonicalization(), $path is returned as-is.
+     *
+     * @throws UnexpectedValueException on receipt of unexpected packets
+     * @see    self::chdir()
+     * @see    self::disablePathCanonicalization()
      */
-    function _realpath($path)
+    public function realpath(string $path)
     {
-        if ($this->pwd === false) {
-            // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.9
-            if (!$this->_send_sftp_packet(NET_SFTP_REALPATH, pack('Na*', strlen($path), $path))) {
-                return false;
+        if ($this->precheck() === false) {
+            return false;
+        }
+
+        $path = (string) $path;
+
+        if (!$this->canonicalize_paths) {
+            if ($this->pwd === true) {
+                return '.';
+            }
+            if (!strlen($path) || $path[0] != '/') {
+                $path = $this->pwd . '/' . $path;
+            }
+            $parts = explode('/', $path);
+            $afterPWD = $beforePWD = [];
+            foreach ($parts as $part) {
+                switch ($part) {
+                    //case '': // some SFTP servers /require/ double /'s. see https://github.com/phpseclib/phpseclib/pull/1137
+                    case '.':
+                        break;
+                    case '..':
+                        if (!empty($afterPWD)) {
+                            array_pop($afterPWD);
+                        } else {
+                            $beforePWD[] = '..';
+                        }
+                        break;
+                    default:
+                        $afterPWD[] = $part;
+                }
             }
+            $beforePWD = count($beforePWD) ? implode('/', $beforePWD) : '.';
+            return $beforePWD . '/' . implode('/', $afterPWD);
+        }
+
+        if ($this->pwd === true) {
+            // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.9
+            $this->send_sftp_packet(SFTPPacketType::REALPATH, Strings::packSSH2('s', $path));
 
-            $response = $this->_get_sftp_packet();
+            $response = $this->get_sftp_packet();
             switch ($this->packet_type) {
-                case NET_SFTP_NAME:
+                case SFTPPacketType::NAME:
                     // although SSH_FXP_NAME is implemented differently in SFTPv3 than it is in SFTPv4+, the following
                     // should work on all SFTP versions since the only part of the SSH_FXP_NAME packet the following looks
                     // at is the first part and that part is defined the same in SFTP versions 3 through 6.
-                    $this->_string_shift($response, 4); // skip over the count - it should be 1, anyway
-                    extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                    return $this->_string_shift($response, $length);
-                case NET_SFTP_STATUS:
-                    $this->_logError($response);
+                    [, $filename] = Strings::unpackSSH2('Ns', $response);
+                    return $filename;
+                case SFTPPacketType::STATUS:
+                    $this->logError($response);
                     return false;
                 default:
-                    throw new \UnexpectedValueException('Expected SSH_FXP_NAME or SSH_FXP_STATUS');
+                    throw new UnexpectedValueException(
+                        'Expected PacketType::NAME or PacketType::STATUS. '
+                        . 'Got packet type: ' . $this->packet_type
+                    );
             }
         }
 
-        if ($path[0] != '/') {
+        if (!strlen($path) || $path[0] != '/') {
             $path = $this->pwd . '/' . $path;
         }
 
         $path = explode('/', $path);
-        $new = array();
+        $new = [];
         foreach ($path as $dir) {
             if (!strlen($dir)) {
                 continue;
@@ -653,6 +694,7 @@ function _realpath($path)
             switch ($dir) {
                 case '..':
                     array_pop($new);
+                    // fall-through
                 case '.':
                     break;
                 default:
@@ -666,14 +708,11 @@ function _realpath($path)
     /**
      * Changes the current directory
      *
-     * @param string $dir
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @return bool
-     * @access public
+     * @throws UnexpectedValueException on receipt of unexpected packets
      */
-    function chdir($dir)
+    public function chdir(string $dir): bool
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->precheck()) {
             return false;
         }
 
@@ -681,14 +720,14 @@ function chdir($dir)
         if ($dir === '') {
             $dir = './';
         // suffix a slash if needed
-        } elseif ($dir[strlen($dir) - 1] != '/') {
-            $dir.= '/';
+        } elseif ($dir[-1] != '/') {
+            $dir .= '/';
         }
 
-        $dir = $this->_realpath($dir);
+        $dir = $this->realpath($dir);
 
         // confirm that $dir is, in fact, a valid directory
-        if ($this->use_stat_cache && is_array($this->_query_stat_cache($dir))) {
+        if ($this->use_stat_cache && is_array($this->query_stat_cache($dir))) {
             $this->pwd = $dir;
             return true;
         }
@@ -698,28 +737,29 @@ function chdir($dir)
         // the file's uid / gid match the currently logged in user's uid / gid but how there's no easy
         // way to get those with SFTP
 
-        if (!$this->_send_sftp_packet(NET_SFTP_OPENDIR, pack('Na*', strlen($dir), $dir))) {
-            return false;
-        }
+        $this->send_sftp_packet(SFTPPacketType::OPENDIR, Strings::packSSH2('s', $dir));
 
-        // see \phpseclib\Net\SFTP::nlist() for a more thorough explanation of the following
-        $response = $this->_get_sftp_packet();
+        // see \phpseclib3\Net\SFTP::nlist() for a more thorough explanation of the following
+        $response = $this->get_sftp_packet();
         switch ($this->packet_type) {
-            case NET_SFTP_HANDLE:
+            case SFTPPacketType::HANDLE:
                 $handle = substr($response, 4);
                 break;
-            case NET_SFTP_STATUS:
-                $this->_logError($response);
+            case SFTPPacketType::STATUS:
+                $this->logError($response);
                 return false;
             default:
-                throw new \UnexpectedValueException('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
+                throw new UnexpectedValueException(
+                    'Expected PacketType::HANDLE or PacketType::STATUS' .
+                    'Got packet type: ' . $this->packet_type
+                );
         }
 
-        if (!$this->_close_handle($handle)) {
+        if (!$this->close_handle($handle)) {
             return false;
         }
 
-        $this->_update_stat_cache($dir, array());
+        $this->update_stat_cache($dir, []);
 
         $this->pwd = $dir;
         return true;
@@ -728,43 +768,41 @@ function chdir($dir)
     /**
      * Returns a list of files in the given directory
      *
-     * @param string $dir
-     * @param bool $recursive
-     * @return mixed
-     * @access public
+     * @return array|false
      */
-    function nlist($dir = '.', $recursive = false)
+    public function nlist(string $dir = '.', bool $recursive = false)
     {
-        return $this->_nlist_helper($dir, $recursive, '');
+        return $this->nlist_helper($dir, $recursive, '');
     }
 
     /**
      * Helper method for nlist
      *
-     * @param string $dir
-     * @param bool $recursive
-     * @param string $relativeDir
-     * @return mixed
-     * @access private
+     * @return array|false
      */
-    function _nlist_helper($dir, $recursive, $relativeDir)
+    private function nlist_helper(string $dir, bool $recursive, string $relativeDir)
     {
-        $files = $this->_list($dir, false);
+        $files = $this->readlist($dir, false);
 
-        if (!$recursive) {
+        // If we get an int back, then that is an "unexpected" status.
+        // We do not have a file list, so return false.
+        if (is_int($files)) {
+            return false;
+        }
+
+        if (!$recursive || $files === false) {
             return $files;
         }
 
-        $result = array();
+        $result = [];
         foreach ($files as $value) {
             if ($value == '.' || $value == '..') {
-                if ($relativeDir == '') {
-                    $result[] = $value;
-                }
+                $result[] = $relativeDir . $value;
                 continue;
             }
-            if (is_array($this->_query_stat_cache($this->_realpath($dir . '/' . $value)))) {
-                $temp = $this->_nlist_helper($dir . '/' . $value, true, $relativeDir . $value . '/');
+            if (is_array($this->query_stat_cache($this->realpath($dir . '/' . $value)))) {
+                $temp = $this->nlist_helper($dir . '/' . $value, true, $relativeDir . $value . '/');
+                $temp = is_array($temp) ? $temp : [];
                 $result = array_merge($result, $temp);
             } else {
                 $result[] = $relativeDir . $value;
@@ -777,14 +815,18 @@ function _nlist_helper($dir, $recursive, $relativeDir)
     /**
      * Returns a detailed list of files in the given directory
      *
-     * @param string $dir
-     * @param bool $recursive
-     * @return mixed
-     * @access public
+     * @return array|false
      */
-    function rawlist($dir = '.', $recursive = false)
+    public function rawlist(string $dir = '.', bool $recursive = false)
     {
-        $files = $this->_list($dir, true);
+        $files = $this->readlist($dir, true);
+
+        // If we get an int back, then that is an "unexpected" status.
+        // We do not have a file list, so return false.
+        if (is_int($files)) {
+            return false;
+        }
+
         if (!$recursive || $files === false) {
             return $files;
         }
@@ -796,7 +838,17 @@ function rawlist($dir = '.', $recursive = false)
                 unset($files[$key]);
                 continue;
             }
-            if ($key != '.' && $key != '..' && is_array($this->_query_stat_cache($this->_realpath($dir . '/' . $key)))) {
+            $is_directory = false;
+            if ($key != '.' && $key != '..') {
+                if ($this->use_stat_cache) {
+                    $is_directory = is_array($this->query_stat_cache($this->realpath($dir . '/' . $key)));
+                } else {
+                    $stat = $this->lstat($dir . '/' . $key);
+                    $is_directory = $stat && $stat['type'] === FileType::DIRECTORY;
+                }
+            }
+
+            if ($is_directory) {
                 $depth++;
                 $files[$key] = $this->rawlist($dir . '/' . $key, true);
                 $depth--;
@@ -811,121 +863,118 @@ function rawlist($dir = '.', $recursive = false)
     /**
      * Reads a list, be it detailed or not, of files in the given directory
      *
-     * @param string $dir
-     * @param bool $raw
-     * @return mixed
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @access private
+     * @return array|int|false array of files, integer status (if known) or false if something else is wrong
+     * @throws UnexpectedValueException on receipt of unexpected packets
      */
-    function _list($dir, $raw = true)
+    private function readlist(string $dir, bool $raw = true): array|int|false
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->precheck()) {
             return false;
         }
 
-        $dir = $this->_realpath($dir . '/');
+        $dir = $this->realpath($dir . '/');
         if ($dir === false) {
             return false;
         }
 
         // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.1.2
-        if (!$this->_send_sftp_packet(NET_SFTP_OPENDIR, pack('Na*', strlen($dir), $dir))) {
-            return false;
-        }
+        $this->send_sftp_packet(SFTPPacketType::OPENDIR, Strings::packSSH2('s', $dir));
 
-        $response = $this->_get_sftp_packet();
+        $response = $this->get_sftp_packet();
         switch ($this->packet_type) {
-            case NET_SFTP_HANDLE:
+            case SFTPPacketType::HANDLE:
                 // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-9.2
                 // since 'handle' is the last field in the SSH_FXP_HANDLE packet, we'll just remove the first four bytes that
                 // represent the length of the string and leave it at that
                 $handle = substr($response, 4);
                 break;
-            case NET_SFTP_STATUS:
+            case SFTPPacketType::STATUS:
                 // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-                $this->_logError($response);
-                return false;
+                [$status] = Strings::unpackSSH2('N', $response);
+                $this->logError($response, $status);
+                return $status;
             default:
-                throw new \UnexpectedValueException('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
+                throw new UnexpectedValueException(
+                    'Expected PacketType::HANDLE or PacketType::STATUS. '
+                    . 'Got packet type: ' . $this->packet_type
+                );
         }
 
-        $this->_update_stat_cache($dir, array());
+        $this->update_stat_cache($dir, []);
 
-        $contents = array();
+        $contents = [];
         while (true) {
             // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.2.2
             // why multiple SSH_FXP_READDIR packets would be sent when the response to a single one can span arbitrarily many
             // SSH_MSG_CHANNEL_DATA messages is not known to me.
-            if (!$this->_send_sftp_packet(NET_SFTP_READDIR, pack('Na*', strlen($handle), $handle))) {
-                return false;
-            }
+            $this->send_sftp_packet(SFTPPacketType::READDIR, Strings::packSSH2('s', $handle));
 
-            $response = $this->_get_sftp_packet();
+            $response = $this->get_sftp_packet();
             switch ($this->packet_type) {
-                case NET_SFTP_NAME:
-                    extract(unpack('Ncount', $this->_string_shift($response, 4)));
+                case SFTPPacketType::NAME:
+                    [$count] = Strings::unpackSSH2('N', $response);
                     for ($i = 0; $i < $count; $i++) {
-                        extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                        $shortname = $this->_string_shift($response, $length);
-                        extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                        $longname = $this->_string_shift($response, $length);
-                        $attributes = $this->_parseAttributes($response);
-                        if (!isset($attributes['type'])) {
-                            $fileType = $this->_parseLongname($longname);
+                        [$shortname] = Strings::unpackSSH2('s', $response);
+                        // SFTPv4 "removed the long filename from the names structure-- it can now be
+                        //         built from information available in the attrs structure."
+                        if ($this->version < 4) {
+                            [$longname] = Strings::unpackSSH2('s', $response);
+                        }
+                        $attributes = $this->parseAttributes($response);
+                        if (!isset($attributes['type']) && $this->version < 4) {
+                            $fileType = $this->parseLongname($longname);
                             if ($fileType) {
                                 $attributes['type'] = $fileType;
                             }
                         }
-                        $contents[$shortname] = $attributes + array('filename' => $shortname);
+                        $contents[$shortname] = $attributes + ['filename' => $shortname];
 
-                        if (isset($attributes['type']) && $attributes['type'] == NET_SFTP_TYPE_DIRECTORY && ($shortname != '.' && $shortname != '..')) {
-                            $this->_update_stat_cache($dir . '/' . $shortname, array());
+                        if (isset($attributes['type']) && $attributes['type'] == FileType::DIRECTORY && ($shortname != '.' && $shortname != '..')) {
+                            $this->update_stat_cache($dir . '/' . $shortname, []);
                         } else {
                             if ($shortname == '..') {
-                                $temp = $this->_realpath($dir . '/..') . '/.';
+                                $temp = $this->realpath($dir . '/..') . '/.';
                             } else {
                                 $temp = $dir . '/' . $shortname;
                             }
-                            $this->_update_stat_cache($temp, (object) array('lstat' => $attributes));
+                            $this->update_stat_cache($temp, (object) ['lstat' => $attributes]);
                         }
                         // SFTPv6 has an optional boolean end-of-list field, but we'll ignore that, since the
                         // final SSH_FXP_STATUS packet should tell us that, already.
                     }
                     break;
-                case NET_SFTP_STATUS:
-                    extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-                    if ($status != NET_SFTP_STATUS_EOF) {
-                        $this->_logError($response, $status);
-                        return false;
+                case SFTPPacketType::STATUS:
+                    [$status] = Strings::unpackSSH2('N', $response);
+                    if ($status != StatusCode::EOF) {
+                        $this->logError($response, $status);
+                        return $status;
                     }
                     break 2;
                 default:
-                    throw new \UnexpectedValueException('Expected SSH_FXP_NAME or SSH_FXP_STATUS');
+                    throw new UnexpectedValueException(
+                        'Expected PacketType::NAME or PacketType::STATUS. '
+                        . 'Got packet type: ' . $this->packet_type
+                    );
             }
         }
 
-        if (!$this->_close_handle($handle)) {
+        if (!$this->close_handle($handle)) {
             return false;
         }
 
         if (count($this->sortOptions)) {
-            uasort($contents, array(&$this, '_comparator'));
+            uasort($contents, [&$this, 'comparator']);
         }
 
-        return $raw ? $contents : array_keys($contents);
+        return $raw ? $contents : array_map('strval', array_keys($contents));
     }
 
     /**
      * Compares two rawlist entries using parameters set by setListOrder()
      *
      * Intended for use with uasort()
-     *
-     * @param array $a
-     * @param array $b
-     * @return int
-     * @access private
      */
-    function _comparator($a, $b)
+    private function comparator(array $a, array $b): ?int
     {
         switch (true) {
             case $a['filename'] === '.' || $b['filename'] === '.':
@@ -938,7 +987,7 @@ function _comparator($a, $b)
                     return 0;
                 }
                 return $a['filename'] === '..' ? -1 : 1;
-            case isset($a['type']) && $a['type'] === NET_SFTP_TYPE_DIRECTORY:
+            case isset($a['type']) && $a['type'] === FileType::DIRECTORY:
                 if (!isset($b['type'])) {
                     return 1;
                 }
@@ -946,7 +995,7 @@ function _comparator($a, $b)
                     return -1;
                 }
                 break;
-            case isset($b['type']) && $b['type'] === NET_SFTP_TYPE_DIRECTORY:
+            case isset($b['type']) && $b['type'] === FileType::DIRECTORY:
                 return 1;
         }
         foreach ($this->sortOptions as $sort => $order) {
@@ -966,10 +1015,10 @@ function _comparator($a, $b)
                         return $order === SORT_DESC ? -$result : $result;
                     }
                     break;
-                case 'permissions':
                 case 'mode':
-                    $a[$sort]&= 07777;
-                    $b[$sort]&= 07777;
+                    $a[$sort] &= 0o7777;
+                    $b[$sort] &= 0o7777;
+                    // fall-through
                 default:
                     if ($a[$sort] === $b[$sort]) {
                         break;
@@ -977,6 +1026,7 @@ function _comparator($a, $b)
                     return $order === SORT_ASC ? $a[$sort] - $b[$sort] : $b[$sort] - $a[$sort];
             }
         }
+        return null;
     }
 
     /**
@@ -997,54 +1047,27 @@ function _comparator($a, $b)
      * $sftp->setListOrder();
      *    Don't do any sort of sorting
      *
-     * @access public
+     * @param string ...$args
      */
-    function setListOrder()
+    public function setListOrder(...$args): void
     {
-        $this->sortOptions = array();
-        $args = func_get_args();
+        $this->sortOptions = [];
         if (empty($args)) {
             return;
         }
         $len = count($args) & 0x7FFFFFFE;
-        for ($i = 0; $i < $len; $i+=2) {
+        for ($i = 0; $i < $len; $i += 2) {
             $this->sortOptions[$args[$i]] = $args[$i + 1];
         }
         if (!count($this->sortOptions)) {
-            $this->sortOptions = array('bogus' => true);
-        }
-    }
-
-    /**
-     * Returns the file size, in bytes, or false, on failure
-     *
-     * Files larger than 4GB will show up as being exactly 4GB.
-     *
-     * @param string $filename
-     * @return mixed
-     * @access public
-     */
-    function size($filename)
-    {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
-            return false;
-        }
-
-        $result = $this->stat($filename);
-        if ($result === false) {
-            return false;
+            $this->sortOptions = ['bogus' => true];
         }
-        return isset($result['size']) ? $result['size'] : -1;
     }
 
     /**
      * Save files / directories to cache
-     *
-     * @param string $path
-     * @param mixed $value
-     * @access private
      */
-    function _update_stat_cache($path, $value)
+    private function update_stat_cache(string $path, $value): void
     {
         if ($this->use_stat_cache === false) {
             return;
@@ -1060,13 +1083,13 @@ function _update_stat_cache($path, $value)
             //  1. a file was deleted and changed to a directory behind phpseclib's back
             //  2. it's a symlink. when lstat is done it's unclear what it's a symlink to
             if (is_object($temp)) {
-                $temp = array();
+                $temp = [];
             }
             if (!isset($temp[$dir])) {
-                $temp[$dir] = array();
+                $temp[$dir] = [];
             }
             if ($i === $max) {
-                if (is_object($temp[$dir])) {
+                if (is_object($temp[$dir]) && is_object($value)) {
                     if (!isset($value->stat) && isset($temp[$dir]->stat)) {
                         $value->stat = $temp[$dir]->stat;
                     }
@@ -1083,18 +1106,17 @@ function _update_stat_cache($path, $value)
 
     /**
      * Remove files / directories from cache
-     *
-     * @param string $path
-     * @return bool
-     * @access private
      */
-    function _remove_from_stat_cache($path)
+    private function remove_from_stat_cache(string $path): bool
     {
         $dirs = explode('/', preg_replace('#^/|/(?=/)|/$#', '', $path));
 
         $temp = &$this->stat_cache;
         $max = count($dirs) - 1;
         foreach ($dirs as $i => $dir) {
+            if (!is_array($temp)) {
+                return false;
+            }
             if ($i === $max) {
                 unset($temp[$dir]);
                 return true;
@@ -1110,17 +1132,16 @@ function _remove_from_stat_cache($path)
      * Checks cache for path
      *
      * Mainly used by file_exists
-     *
-     * @param string $dir
-     * @return mixed
-     * @access private
      */
-    function _query_stat_cache($path)
+    private function query_stat_cache(string $path)
     {
         $dirs = explode('/', preg_replace('#^/|/(?=/)|/$#', '', $path));
 
         $temp = &$this->stat_cache;
         foreach ($dirs as $dir) {
+            if (!is_array($temp)) {
+                return null;
+            }
             if (!isset($temp[$dir])) {
                 return null;
             }
@@ -1134,23 +1155,21 @@ function _query_stat_cache($path)
      *
      * Returns an array on success and false otherwise.
      *
-     * @param string $filename
-     * @return mixed
-     * @access public
+     * @return array|false
      */
-    function stat($filename)
+    public function stat(string $filename)
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->precheck()) {
             return false;
         }
 
-        $filename = $this->_realpath($filename);
+        $filename = $this->realpath($filename);
         if ($filename === false) {
             return false;
         }
 
         if ($this->use_stat_cache) {
-            $result = $this->_query_stat_cache($filename);
+            $result = $this->query_stat_cache($filename);
             if (is_array($result) && isset($result['.']) && isset($result['.']->stat)) {
                 return $result['.']->stat;
             }
@@ -1159,29 +1178,29 @@ function stat($filename)
             }
         }
 
-        $stat = $this->_stat($filename, NET_SFTP_STAT);
+        $stat = $this->stat_helper($filename, SFTPPacketType::STAT);
         if ($stat === false) {
-            $this->_remove_from_stat_cache($filename);
+            $this->remove_from_stat_cache($filename);
             return false;
         }
         if (isset($stat['type'])) {
-            if ($stat['type'] == NET_SFTP_TYPE_DIRECTORY) {
-                $filename.= '/.';
+            if ($stat['type'] == FileType::DIRECTORY) {
+                $filename .= '/.';
             }
-            $this->_update_stat_cache($filename, (object) array('stat' => $stat));
+            $this->update_stat_cache($filename, (object) ['stat' => $stat]);
             return $stat;
         }
 
         $pwd = $this->pwd;
         $stat['type'] = $this->chdir($filename) ?
-            NET_SFTP_TYPE_DIRECTORY :
-            NET_SFTP_TYPE_REGULAR;
+            FileType::DIRECTORY :
+            FileType::REGULAR;
         $this->pwd = $pwd;
 
-        if ($stat['type'] == NET_SFTP_TYPE_DIRECTORY) {
-            $filename.= '/.';
+        if ($stat['type'] == FileType::DIRECTORY) {
+            $filename .= '/.';
         }
-        $this->_update_stat_cache($filename, (object) array('stat' => $stat));
+        $this->update_stat_cache($filename, (object) ['stat' => $stat]);
 
         return $stat;
     }
@@ -1191,23 +1210,21 @@ function stat($filename)
      *
      * Returns an array on success and false otherwise.
      *
-     * @param string $filename
-     * @return mixed
-     * @access public
+     * @return array|false
      */
-    function lstat($filename)
+    public function lstat(string $filename)
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->precheck()) {
             return false;
         }
 
-        $filename = $this->_realpath($filename);
+        $filename = $this->realpath($filename);
         if ($filename === false) {
             return false;
         }
 
         if ($this->use_stat_cache) {
-            $result = $this->_query_stat_cache($filename);
+            $result = $this->query_stat_cache($filename);
             if (is_array($result) && isset($result['.']) && isset($result['.']->lstat)) {
                 return $result['.']->lstat;
             }
@@ -1216,37 +1233,37 @@ function lstat($filename)
             }
         }
 
-        $lstat = $this->_stat($filename, NET_SFTP_LSTAT);
+        $lstat = $this->stat_helper($filename, SFTPPacketType::LSTAT);
         if ($lstat === false) {
-            $this->_remove_from_stat_cache($filename);
+            $this->remove_from_stat_cache($filename);
             return false;
         }
         if (isset($lstat['type'])) {
-            if ($lstat['type'] == NET_SFTP_TYPE_DIRECTORY) {
-                $filename.= '/.';
+            if ($lstat['type'] == FileType::DIRECTORY) {
+                $filename .= '/.';
             }
-            $this->_update_stat_cache($filename, (object) array('lstat' => $lstat));
+            $this->update_stat_cache($filename, (object) ['lstat' => $lstat]);
             return $lstat;
         }
 
-        $stat = $this->_stat($filename, NET_SFTP_STAT);
+        $stat = $this->stat_helper($filename, SFTPPacketType::STAT);
 
         if ($lstat != $stat) {
-            $lstat = array_merge($lstat, array('type' => NET_SFTP_TYPE_SYMLINK));
-            $this->_update_stat_cache($filename, (object) array('lstat' => $lstat));
+            $lstat = array_merge($lstat, ['type' => FileType::SYMLINK]);
+            $this->update_stat_cache($filename, (object) ['lstat' => $lstat]);
             return $stat;
         }
 
         $pwd = $this->pwd;
         $lstat['type'] = $this->chdir($filename) ?
-            NET_SFTP_TYPE_DIRECTORY :
-            NET_SFTP_TYPE_REGULAR;
+            FileType::DIRECTORY :
+            FileType::REGULAR;
         $this->pwd = $pwd;
 
-        if ($lstat['type'] == NET_SFTP_TYPE_DIRECTORY) {
-            $filename.= '/.';
+        if ($lstat['type'] == FileType::DIRECTORY) {
+            $filename .= '/.';
         }
-        $this->_update_stat_cache($filename, (object) array('lstat' => $lstat));
+        $this->update_stat_cache($filename, (object) ['lstat' => $lstat]);
 
         return $lstat;
     }
@@ -1254,48 +1271,41 @@ function lstat($filename)
     /**
      * Returns general information about a file or symbolic link
      *
-     * Determines information without calling \phpseclib\Net\SFTP::_realpath().
-     * The second parameter can be either NET_SFTP_STAT or NET_SFTP_LSTAT.
+     * Determines information without calling \phpseclib3\Net\SFTP::realpath().
+     * The second parameter can be either PacketType::STAT or PacketType::LSTAT.
      *
-     * @param string $filename
-     * @param int $type
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @return mixed
-     * @access private
+     * @return array|false
+     * @throws UnexpectedValueException on receipt of unexpected packets
      */
-    function _stat($filename, $type)
+    private function stat_helper(string $filename, int $type)
     {
         // SFTPv4+ adds an additional 32-bit integer field - flags - to the following:
-        $packet = pack('Na*', strlen($filename), $filename);
-        if (!$this->_send_sftp_packet($type, $packet)) {
-            return false;
-        }
+        $packet = Strings::packSSH2('s', $filename);
+        $this->send_sftp_packet($type, $packet);
 
-        $response = $this->_get_sftp_packet();
+        $response = $this->get_sftp_packet();
         switch ($this->packet_type) {
-            case NET_SFTP_ATTRS:
-                return $this->_parseAttributes($response);
-            case NET_SFTP_STATUS:
-                $this->_logError($response);
+            case SFTPPacketType::ATTRS:
+                return $this->parseAttributes($response);
+            case SFTPPacketType::STATUS:
+                $this->logError($response);
                 return false;
         }
 
-        throw new \UnexpectedValueException('Expected SSH_FXP_ATTRS or SSH_FXP_STATUS');
+        throw new UnexpectedValueException(
+            'Expected PacketType::ATTRS or PacketType::STATUS. '
+            . 'Got packet type: ' . $this->packet_type
+        );
     }
 
     /**
      * Truncates a file to a given length
-     *
-     * @param string $filename
-     * @param int $new_size
-     * @return bool
-     * @access public
      */
-    function truncate($filename, $new_size)
+    public function truncate(string $filename, int $new_size): bool
     {
-        $attr = pack('N3', NET_SFTP_ATTR_SIZE, $new_size / 4294967296, $new_size); // 4294967296 == 0x100000000 == 1<<32
+        $attr = Strings::packSSH2('NQ', Attribute::SIZE, $new_size);
 
-        return $this->_setstat($filename, $attr, false);
+        return $this->setstat($filename, $attr, false);
     }
 
     /**
@@ -1303,20 +1313,15 @@ function truncate($filename, $new_size)
      *
      * If the file does not exist, it will be created.
      *
-     * @param string $filename
-     * @param int $time
-     * @param int $atime
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @return bool
-     * @access public
+     * @throws UnexpectedValueException on receipt of unexpected packets
      */
-    function touch($filename, $time = null, $atime = null)
+    public function touch(string $filename, ?int $time = null, ?int $atime = null): bool
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->precheck()) {
             return false;
         }
 
-        $filename = $this->_realpath($filename);
+        $filename = $this->realpath($filename);
         if ($filename === false) {
             return false;
         }
@@ -1328,63 +1333,98 @@ function touch($filename, $time = null, $atime = null)
             $atime = $time;
         }
 
-        $flags = NET_SFTP_OPEN_WRITE | NET_SFTP_OPEN_CREATE | NET_SFTP_OPEN_EXCL;
-        $attr = pack('N3', NET_SFTP_ATTR_ACCESSTIME, $time, $atime);
-        $packet = pack('Na*Na*', strlen($filename), $filename, $flags, $attr);
-        if (!$this->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
-            return false;
-        }
+        $attr = $this->version < 4 ?
+            pack('N3', Attribute::ACCESSTIME, $atime, $time) :
+            Strings::packSSH2('NQ2', Attribute::ACCESSTIME | Attribute::MODIFYTIME, $atime, $time);
+
+        $packet = Strings::packSSH2('s', $filename);
+        $packet .= $this->version >= 5 ?
+            pack('N2', 0, OpenFlag5::OPEN_EXISTING) :
+            pack('N', OpenFlag::WRITE | OpenFlag::CREATE | OpenFlag::EXCL);
+        $packet .= $attr;
+
+        $this->send_sftp_packet(SFTPPacketType::OPEN, $packet);
 
-        $response = $this->_get_sftp_packet();
+        $response = $this->get_sftp_packet();
         switch ($this->packet_type) {
-            case NET_SFTP_HANDLE:
-                return $this->_close_handle(substr($response, 4));
-            case NET_SFTP_STATUS:
-                $this->_logError($response);
+            case SFTPPacketType::HANDLE:
+                return $this->close_handle(substr($response, 4));
+            case SFTPPacketType::STATUS:
+                $this->logError($response);
                 break;
             default:
-                throw new \UnexpectedValueException('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
+                throw new UnexpectedValueException(
+                    'Expected PacketType::HANDLE or PacketType::STATUS. '
+                    . 'Got packet type: ' . $this->packet_type
+                );
         }
 
-        return $this->_setstat($filename, $attr, false);
+        return $this->setstat($filename, $attr, false);
     }
 
     /**
      * Changes file or directory owner
      *
+     * $uid should be an int for SFTPv3 and a string for SFTPv4+. Ideally the string
+     * would be of the form "user@dns_domain" but it does not need to be.
+     * `$sftp->getSupportedVersions()['version']` will return the specific version
+     * that's being used.
+     *
      * Returns true on success or false on error.
      *
-     * @param string $filename
-     * @param int $uid
-     * @param bool $recursive
-     * @return bool
-     * @access public
+     * @param int|string $uid
      */
-    function chown($filename, $uid, $recursive = false)
+    public function chown(string $filename, $uid, bool $recursive = false): bool
     {
-        // quoting from <http://www.kernel.org/doc/man-pages/online/pages/man2/chown.2.html>,
-        // "if the owner or group is specified as -1, then that ID is not changed"
-        $attr = pack('N3', NET_SFTP_ATTR_UIDGID, $uid, -1);
+        /*
+         quoting <https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-7.5>,
+
+         "To avoid a representation that is tied to a particular underlying
+          implementation at the client or server, the use of UTF-8 strings has
+          been chosen.  The string should be of the form "user@dns_domain".
+          This will allow for a client and server that do not use the same
+          local representation the ability to translate to a common syntax that
+          can be interpreted by both.  In the case where there is no
+          translation available to the client or server, the attribute value
+          must be constructed without the "@"."
+
+         phpseclib _could_ auto append the dns_domain to $uid BUT what if it shouldn't
+         have one? phpseclib would have no way of knowing so rather than guess phpseclib
+         will just use whatever value the user provided
+        */
 
-        return $this->_setstat($filename, $attr, $recursive);
+        $attr = $this->version < 4 ?
+            // quoting <http://www.kernel.org/doc/man-pages/online/pages/man2/chown.2.html>,
+            // "if the owner or group is specified as -1, then that ID is not changed"
+            pack('N3', Attribute::UIDGID, $uid, -1) :
+            // quoting <https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-7.5>,
+            // "If either the owner or group field is zero length, the field should be
+            //  considered absent, and no change should be made to that specific field
+            //  during a modification operation"
+            Strings::packSSH2('Nss', Attribute::OWNERGROUP, $uid, '');
+
+        return $this->setstat($filename, $attr, $recursive);
     }
 
     /**
      * Changes file or directory group
      *
+     * $gid should be an int for SFTPv3 and a string for SFTPv4+. Ideally the string
+     * would be of the form "user@dns_domain" but it does not need to be.
+     * `$sftp->getSupportedVersions()['version']` will return the specific version
+     * that's being used.
+     *
      * Returns true on success or false on error.
      *
-     * @param string $filename
-     * @param int $gid
-     * @param bool $recursive
-     * @return bool
-     * @access public
+     * @param int|string $gid
      */
-    function chgrp($filename, $gid, $recursive = false)
+    public function chgrp(string $filename, $gid, bool $recursive = false): bool
     {
-        $attr = pack('N3', NET_SFTP_ATTR_UIDGID, -1, $gid);
+        $attr = $this->version < 4 ?
+            pack('N3', Attribute::UIDGID, -1, $gid) :
+            Strings::packSSH2('Nss', Attribute::OWNERGROUP, '', $gid);
 
-        return $this->_setstat($filename, $attr, $recursive);
+        return $this->setstat($filename, $attr, $recursive);
     }
 
     /**
@@ -1393,14 +1433,9 @@ function chgrp($filename, $gid, $recursive = false)
      * Returns the new file permissions on success or false on error.
      * If $recursive is true than this just returns true or false.
      *
-     * @param int $mode
-     * @param string $filename
-     * @param bool $recursive
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @return mixed
-     * @access public
+     * @throws UnexpectedValueException on receipt of unexpected packets
      */
-    function chmod($mode, $filename, $recursive = false)
+    public function chmod(int $mode, string $filename, bool $recursive = false)
     {
         if (is_string($mode) && is_int($filename)) {
             $temp = $mode;
@@ -1408,71 +1443,67 @@ function chmod($mode, $filename, $recursive = false)
             $filename = $temp;
         }
 
-        $attr = pack('N2', NET_SFTP_ATTR_PERMISSIONS, $mode & 07777);
-        if (!$this->_setstat($filename, $attr, $recursive)) {
+        $attr = pack('N2', Attribute::PERMISSIONS, $mode & 0o7777);
+        if (!$this->setstat($filename, $attr, $recursive)) {
             return false;
         }
         if ($recursive) {
             return true;
         }
 
-        $filename = $this->_realPath($filename);
+        $filename = $this->realpath($filename);
         // rather than return what the permissions *should* be, we'll return what they actually are.  this will also
         // tell us if the file actually exists.
         // incidentally, SFTPv4+ adds an additional 32-bit integer field - flags - to the following:
         $packet = pack('Na*', strlen($filename), $filename);
-        if (!$this->_send_sftp_packet(NET_SFTP_STAT, $packet)) {
-            return false;
-        }
+        $this->send_sftp_packet(SFTPPacketType::STAT, $packet);
 
-        $response = $this->_get_sftp_packet();
+        $response = $this->get_sftp_packet();
         switch ($this->packet_type) {
-            case NET_SFTP_ATTRS:
-                $attrs = $this->_parseAttributes($response);
-                return $attrs['permissions'];
-            case NET_SFTP_STATUS:
-                $this->_logError($response);
+            case SFTPPacketType::ATTRS:
+                $attrs = $this->parseAttributes($response);
+                return $attrs['mode'];
+            case SFTPPacketType::STATUS:
+                $this->logError($response);
                 return false;
         }
 
-        throw new \UnexpectedValueException('Expected SSH_FXP_ATTRS or SSH_FXP_STATUS');
+        throw new UnexpectedValueException(
+            'Expected PacketType::ATTRS or PacketType::STATUS. '
+            . 'Got packet type: ' . $this->packet_type
+        );
     }
 
     /**
      * Sets information about a file
      *
-     * @param string $filename
-     * @param string $attr
-     * @param bool $recursive
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @return bool
-     * @access private
+     * @throws UnexpectedValueException on receipt of unexpected packets
      */
-    function _setstat($filename, $attr, $recursive)
+    private function setstat(string $filename, string $attr, bool $recursive): bool
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->precheck()) {
             return false;
         }
 
-        $filename = $this->_realpath($filename);
+        $filename = $this->realpath($filename);
         if ($filename === false) {
             return false;
         }
 
-        $this->_remove_from_stat_cache($filename);
+        $this->remove_from_stat_cache($filename);
 
         if ($recursive) {
             $i = 0;
-            $result = $this->_setstat_recursive($filename, $attr, $i);
-            $this->_read_put_responses($i);
+            $result = $this->setstat_recursive($filename, $attr, $i);
+            $this->read_put_responses($i);
             return $result;
         }
 
-        // SFTPv4+ has an additional byte field - type - that would need to be sent, as well. setting it to
-        // SSH_FILEXFER_TYPE_UNKNOWN might work. if not, we'd have to do an SSH_FXP_STAT before doing an SSH_FXP_SETSTAT.
-        if (!$this->_send_sftp_packet(NET_SFTP_SETSTAT, pack('Na*a*', strlen($filename), $filename, $attr))) {
-            return false;
-        }
+        $packet = Strings::packSSH2('s', $filename);
+        $packet .= $this->version >= 4 ?
+            pack('a*Ca*', substr($attr, 0, 4), FileType::UNKNOWN, substr($attr, 4)) :
+            $attr;
+        $this->send_sftp_packet(SFTPPacketType::SETSTAT, $packet);
 
         /*
          "Because some systems must use separate system calls to set various attributes, it is possible that a failure
@@ -1481,14 +1512,17 @@ function _setstat($filename, $attr, $recursive)
 
           -- http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.6
         */
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            throw new \UnexpectedValueException('Expected SSH_FXP_STATUS');
+        $response = $this->get_sftp_packet();
+        if ($this->packet_type != SFTPPacketType::STATUS) {
+            throw new UnexpectedValueException(
+                'Expected PacketType::STATUS. '
+                . 'Got packet type: ' . $this->packet_type
+            );
         }
 
-        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        if ($status != NET_SFTP_STATUS_OK) {
-            $this->_logError($response, $status);
+        [$status] = Strings::unpackSSH2('N', $response);
+        if ($status != StatusCode::OK) {
+            $this->logError($response, $status);
             return false;
         }
 
@@ -1499,23 +1533,17 @@ function _setstat($filename, $attr, $recursive)
      * Recursively sets information on directories on the SFTP server
      *
      * Minimizes directory lookups and SSH_FXP_STATUS requests for speed.
-     *
-     * @param string $path
-     * @param string $attr
-     * @param int $i
-     * @return bool
-     * @access private
      */
-    function _setstat_recursive($path, $attr, &$i)
+    private function setstat_recursive(string $path, string $attr, int &$i): bool
     {
-        if (!$this->_read_put_responses($i)) {
+        if (!$this->read_put_responses($i)) {
             return false;
         }
         $i = 0;
-        $entries = $this->_list($path, true);
+        $entries = $this->readlist($path, true);
 
-        if ($entries === false) {
-            return $this->_setstat($path, $attr, false);
+        if ($entries === false || is_int($entries)) {
+            return $this->setstat($path, $attr, false);
         }
 
         // normally $entries would have at least . and .. but it might not if the directories
@@ -1531,19 +1559,21 @@ function _setstat_recursive($path, $attr, &$i)
             }
 
             $temp = $path . '/' . $filename;
-            if ($props['type'] == NET_SFTP_TYPE_DIRECTORY) {
-                if (!$this->_setstat_recursive($temp, $attr, $i)) {
+            if ($props['type'] == FileType::DIRECTORY) {
+                if (!$this->setstat_recursive($temp, $attr, $i)) {
                     return false;
                 }
             } else {
-                if (!$this->_send_sftp_packet(NET_SFTP_SETSTAT, pack('Na*a*', strlen($temp), $temp, $attr))) {
-                    return false;
-                }
+                $packet = Strings::packSSH2('s', $temp);
+                $packet .= $this->version >= 4 ?
+                    pack('Ca*', FileType::UNKNOWN, $attr) :
+                    $attr;
+                $this->send_sftp_packet(SFTPPacketType::SETSTAT, $packet);
 
                 $i++;
 
-                if ($i >= NET_SFTP_QUEUE_SIZE) {
-                    if (!$this->_read_put_responses($i)) {
+                if ($i >= $this->queueSize) {
+                    if (!$this->read_put_responses($i)) {
                         return false;
                     }
                     $i = 0;
@@ -1551,14 +1581,16 @@ function _setstat_recursive($path, $attr, &$i)
             }
         }
 
-        if (!$this->_send_sftp_packet(NET_SFTP_SETSTAT, pack('Na*a*', strlen($path), $path, $attr))) {
-            return false;
-        }
+        $packet = Strings::packSSH2('s', $path);
+        $packet .= $this->version >= 4 ?
+            pack('Ca*', FileType::UNKNOWN, $attr) :
+            $attr;
+        $this->send_sftp_packet(SFTPPacketType::SETSTAT, $packet);
 
         $i++;
 
-        if ($i >= NET_SFTP_QUEUE_SIZE) {
-            if (!$this->_read_put_responses($i)) {
+        if ($i >= $this->queueSize) {
+            if (!$this->read_put_responses($i)) {
                 return false;
             }
             $i = 0;
@@ -1570,42 +1602,41 @@ function _setstat_recursive($path, $attr, &$i)
     /**
      * Return the target of a symbolic link
      *
-     * @param string $link
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @return mixed
-     * @access public
+     * @throws UnexpectedValueException on receipt of unexpected packets
      */
-    function readlink($link)
+    public function readlink(string $link)
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->precheck()) {
             return false;
         }
 
-        $link = $this->_realpath($link);
+        $link = $this->realpath($link);
 
-        if (!$this->_send_sftp_packet(NET_SFTP_READLINK, pack('Na*', strlen($link), $link))) {
-            return false;
-        }
+        $this->send_sftp_packet(SFTPPacketType::READLINK, Strings::packSSH2('s', $link));
 
-        $response = $this->_get_sftp_packet();
+        $response = $this->get_sftp_packet();
         switch ($this->packet_type) {
-            case NET_SFTP_NAME:
+            case SFTPPacketType::NAME:
                 break;
-            case NET_SFTP_STATUS:
-                $this->_logError($response);
+            case SFTPPacketType::STATUS:
+                $this->logError($response);
                 return false;
             default:
-                throw new \UnexpectedValueException('Expected SSH_FXP_NAME or SSH_FXP_STATUS');
+                throw new UnexpectedValueException(
+                    'Expected PacketType::NAME or PacketType::STATUS. '
+                    . 'Got packet type: ' . $this->packet_type
+                );
         }
 
-        extract(unpack('Ncount', $this->_string_shift($response, 4)));
+        [$count] = Strings::unpackSSH2('N', $response);
         // the file isn't a symlink
         if (!$count) {
             return false;
         }
 
-        extract(unpack('Nlength', $this->_string_shift($response, 4)));
-        return $this->_string_shift($response, $length);
+        [$filename] = Strings::unpackSSH2('s', $response);
+
+        return $filename;
     }
 
     /**
@@ -1613,34 +1644,60 @@ function readlink($link)
      *
      * symlink() creates a symbolic link to the existing target with the specified name link.
      *
-     * @param string $target
-     * @param string $link
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @return bool
-     * @access public
+     * @throws UnexpectedValueException on receipt of unexpected packets
      */
-    function symlink($target, $link)
+    public function symlink(string $target, string $link): bool
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->precheck()) {
             return false;
         }
 
-        $target = $this->_realpath($target);
-        $link = $this->_realpath($link);
+        //$target = $this->realpath($target);
+        $link = $this->realpath($link);
 
-        $packet = pack('Na*Na*', strlen($target), $target, strlen($link), $link);
-        if (!$this->_send_sftp_packet(NET_SFTP_SYMLINK, $packet)) {
-            return false;
-        }
+        /* quoting https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-09#section-12.1 :
 
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            throw new \UnexpectedValueException('Expected SSH_FXP_STATUS');
+           Changed the SYMLINK packet to be LINK and give it the ability to
+           create hard links.  Also change it's packet number because many
+           implementation implemented SYMLINK with the arguments reversed.
+           Hopefully the new argument names make it clear which way is which.
+        */
+        if ($this->version == 6) {
+            $type = SFTPPacketType::LINK;
+            $packet = Strings::packSSH2('ssC', $link, $target, 1);
+        } else {
+            $type = SFTPPacketType::SYMLINK;
+            /* quoting http://bxr.su/OpenBSD/usr.bin/ssh/PROTOCOL#347 :
+
+               3.1. sftp: Reversal of arguments to SSH_FXP_SYMLINK
+
+               When OpenSSH's sftp-server was implemented, the order of the arguments
+               to the SSH_FXP_SYMLINK method was inadvertently reversed. Unfortunately,
+               the reversal was not noticed until the server was widely deployed. Since
+               fixing this to follow the specification would cause incompatibility, the
+               current order was retained. For correct operation, clients should send
+               SSH_FXP_SYMLINK as follows:
+
+                   uint32      id
+                   string      targetpath
+                   string      linkpath */
+            $packet = substr($this->server_identifier, 0, 15) == 'SSH-2.0-OpenSSH' ?
+                Strings::packSSH2('ss', $target, $link) :
+                Strings::packSSH2('ss', $link, $target);
+        }
+        $this->send_sftp_packet($type, $packet);
+
+        $response = $this->get_sftp_packet();
+        if ($this->packet_type != SFTPPacketType::STATUS) {
+            throw new UnexpectedValueException(
+                'Expected PacketType::STATUS. '
+                . 'Got packet type: ' . $this->packet_type
+            );
         }
 
-        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        if ($status != NET_SFTP_STATUS_OK) {
-            $this->_logError($response, $status);
+        [$status] = Strings::unpackSSH2('N', $response);
+        if ($status != StatusCode::OK) {
+            $this->logError($response, $status);
             return false;
         }
 
@@ -1649,21 +1706,14 @@ function symlink($target, $link)
 
     /**
      * Creates a directory.
-     *
-     * @param string $dir
-     * @return bool
-     * @access public
      */
-    function mkdir($dir, $mode = -1, $recursive = false)
+    public function mkdir(string $dir, int $mode = -1, bool $recursive = false): bool
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->precheck()) {
             return false;
         }
 
-        $dir = $this->_realpath($dir);
-        // by not providing any permissions, hopefully the server will use the logged in users umask - their
-        // default permissions.
-        $attr = $mode == -1 ? "\0\0\0\0" : pack('N2', NET_SFTP_ATTR_PERMISSIONS, $mode & 07777);
+        $dir = $this->realpath($dir);
 
         if ($recursive) {
             $dirs = explode('/', preg_replace('#/(?=/)|/$#', '', $dir));
@@ -1674,82 +1724,81 @@ function mkdir($dir, $mode = -1, $recursive = false)
             for ($i = 0; $i < count($dirs); $i++) {
                 $temp = array_slice($dirs, 0, $i + 1);
                 $temp = implode('/', $temp);
-                $result = $this->_mkdir_helper($temp, $attr);
+                $result = $this->mkdir_helper($temp, $mode);
             }
             return $result;
         }
 
-        return $this->_mkdir_helper($dir, $attr);
+        return $this->mkdir_helper($dir, $mode);
     }
 
     /**
      * Helper function for directory creation
-     *
-     * @param string $dir
-     * @return bool
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @access private
      */
-    function _mkdir_helper($dir, $attr)
+    private function mkdir_helper(string $dir, int $mode): bool
     {
-        if (!$this->_send_sftp_packet(NET_SFTP_MKDIR, pack('Na*a*', strlen($dir), $dir, $attr))) {
-            return false;
-        }
+        // send SSH_FXP_MKDIR without any attributes (that's what the \0\0\0\0 is doing)
+        $this->send_sftp_packet(SFTPPacketType::MKDIR, Strings::packSSH2('s', $dir) . "\0\0\0\0");
 
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            throw new \UnexpectedValueException('Expected SSH_FXP_STATUS');
+        $response = $this->get_sftp_packet();
+        if ($this->packet_type != SFTPPacketType::STATUS) {
+            throw new UnexpectedValueException(
+                'Expected PacketType::STATUS. '
+                . 'Got packet type: ' . $this->packet_type
+            );
         }
 
-        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        if ($status != NET_SFTP_STATUS_OK) {
-            $this->_logError($response, $status);
+        [$status] = Strings::unpackSSH2('N', $response);
+        if ($status != StatusCode::OK) {
+            $this->logError($response, $status);
             return false;
         }
 
+        if ($mode !== -1) {
+            $this->chmod($mode, $dir);
+        }
+
         return true;
     }
 
     /**
      * Removes a directory.
      *
-     * @param string $dir
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @return bool
-     * @access public
+     * @throws UnexpectedValueException on receipt of unexpected packets
      */
-    function rmdir($dir)
+    public function rmdir(string $dir): bool
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->precheck()) {
             return false;
         }
 
-        $dir = $this->_realpath($dir);
+        $dir = $this->realpath($dir);
         if ($dir === false) {
             return false;
         }
 
-        if (!$this->_send_sftp_packet(NET_SFTP_RMDIR, pack('Na*', strlen($dir), $dir))) {
-            return false;
-        }
+        $this->send_sftp_packet(SFTPPacketType::RMDIR, Strings::packSSH2('s', $dir));
 
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            throw new \UnexpectedValueException('Expected SSH_FXP_STATUS');
+        $response = $this->get_sftp_packet();
+        if ($this->packet_type != SFTPPacketType::STATUS) {
+            throw new UnexpectedValueException(
+                'Expected PacketType::STATUS. '
+                . 'Got packet type: ' . $this->packet_type
+            );
         }
 
-        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        if ($status != NET_SFTP_STATUS_OK) {
+        [$status] = Strings::unpackSSH2('N', $response);
+        if ($status != StatusCode::OK) {
             // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED?
-            $this->_logError($response, $status);
+            $this->logError($response, $status);
             return false;
         }
 
-        $this->_remove_from_stat_cache($dir);
+        $this->remove_from_stat_cache($dir);
         // the following will do a soft delete, which would be useful if you deleted a file
         // and then tried to do a stat on the deleted file. the above, in contrast, does
         // a hard delete
-        //$this->_update_stat_cache($dir, false);
+        //$this->update_stat_cache($dir, false);
 
         return true;
     }
@@ -1757,15 +1806,16 @@ function rmdir($dir)
     /**
      * Uploads a file to the SFTP server.
      *
-     * By default, \phpseclib\Net\SFTP::put() does not read from the local filesystem.  $data is dumped directly into $remote_file.
-     * So, for example, if you set $data to 'filename.ext' and then do \phpseclib\Net\SFTP::get(), you will get a file, twelve bytes
+     * By default, \phpseclib3\Net\SFTP::put() does not read from the local filesystem.  $data is dumped directly into $remote_file.
+     * So, for example, if you set $data to 'filename.ext' and then do \phpseclib3\Net\SFTP::get(), you will get a file, twelve bytes
      * long, containing 'filename.ext' as its contents.
      *
      * Setting $mode to self::SOURCE_LOCAL_FILE will change the above behavior.  With self::SOURCE_LOCAL_FILE, $remote_file will
      * contain as many bytes as filename.ext does on your local filesystem.  If your filename.ext is 1MB then that is how
      * large $remote_file will be, as well.
      *
-     * Setting $mode to self::SOURCE_CALLBACK will use $data as callback function, which gets only one parameter -- number of bytes to return, and returns a string if there is some data or null if there is no more data
+     * Setting $mode to self::SOURCE_CALLBACK will use $data as callback function, which gets only one parameter -- number
+     * of bytes to return, and returns a string if there is some data or null if there is no more data
      *
      * If $data is a resource then it'll be used as a resource instead.
      *
@@ -1789,63 +1839,71 @@ function rmdir($dir)
      *
      * Setting $local_start to > 0 or $mode | self::RESUME_START doesn't do anything unless $mode | self::SOURCE_LOCAL_FILE.
      *
-     * @param string $remote_file
-     * @param string|resource $data
-     * @param int $mode
-     * @param int $start
-     * @param int $local_start
-     * @param callable|null $progressCallback
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @throws \BadFunctionCallException if you're uploading via a callback and the callback function is invalid
-     * @throws \phpseclib\Exception\FileNotFoundException if you're uploading via a file and the file doesn't exist
-     * @return bool
-     * @access public
-     * @internal ASCII mode for SFTPv4/5/6 can be supported by adding a new function - \phpseclib\Net\SFTP::setMode().
-     */
-    function put($remote_file, $data, $mode = self::SOURCE_STRING, $start = -1, $local_start = -1, $progressCallback = null)
+     * {@internal ASCII mode for SFTPv4/5/6 can be supported by adding a new function - \phpseclib3\Net\SFTP::setMode().}
+     *
+     * @param  resource|array|string $data
+     * @throws UnexpectedValueException on receipt of unexpected packets
+     * @throws BadFunctionCallException if you're uploading via a callback and the callback function is invalid
+     * @throws FileNotFoundException if you're uploading via a file and the file doesn't exist
+     */
+    public function put(string $remote_file, $data, int $mode = self::SOURCE_STRING, int $start = -1, int $local_start = -1, ?callable $progressCallback = null): bool
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->precheck()) {
             return false;
         }
 
-        $remote_file = $this->_realpath($remote_file);
+        $remote_file = $this->realpath($remote_file);
         if ($remote_file === false) {
             return false;
         }
 
-        $this->_remove_from_stat_cache($remote_file);
+        $this->remove_from_stat_cache($remote_file);
 
-        $flags = NET_SFTP_OPEN_WRITE | NET_SFTP_OPEN_CREATE;
-        // according to the SFTP specs, NET_SFTP_OPEN_APPEND should "force all writes to append data at the end of the file."
-        // in practice, it doesn't seem to do that.
-        //$flags|= ($mode & self::RESUME) ? NET_SFTP_OPEN_APPEND : NET_SFTP_OPEN_TRUNCATE;
+        if ($this->version >= 5) {
+            $flags = OpenFlag5::OPEN_OR_CREATE;
+        } else {
+            $flags = OpenFlag::WRITE | OpenFlag::CREATE;
+            // according to the SFTP specs, OpenFlag::APPEND should "force all writes to append data at the end of the file."
+            // in practice, it doesn't seem to do that.
+            //$flags|= ($mode & self::RESUME) ? OpenFlag::APPEND : OpenFlag::TRUNCATE;
+        }
 
         if ($start >= 0) {
             $offset = $start;
-        } elseif ($mode & self::RESUME) {
-            // if NET_SFTP_OPEN_APPEND worked as it should _size() wouldn't need to be called
-            $size = $this->size($remote_file);
-            $offset = $size !== false ? $size : 0;
+        } elseif ($mode & (self::RESUME | self::RESUME_START)) {
+            // if OpenFlag::APPEND worked as it should _size() wouldn't need to be called
+            $stat = $this->stat($remote_file);
+            $offset = $stat !== false && $stat['size'] ? $stat['size'] : 0;
         } else {
             $offset = 0;
-            $flags|= NET_SFTP_OPEN_TRUNCATE;
+            if ($this->version >= 5) {
+                $flags = OpenFlag5::CREATE_TRUNCATE;
+            } else {
+                $flags |= OpenFlag::TRUNCATE;
+            }
         }
 
-        $packet = pack('Na*N2', strlen($remote_file), $remote_file, $flags, 0);
-        if (!$this->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
-            return false;
-        }
+        $this->remove_from_stat_cache($remote_file);
+
+        $packet = Strings::packSSH2('s', $remote_file);
+        $packet .= $this->version >= 5 ?
+            pack('N3', 0, $flags, 0) :
+            pack('N2', $flags, 0);
+        $this->send_sftp_packet(SFTPPacketType::OPEN, $packet);
 
-        $response = $this->_get_sftp_packet();
+        $response = $this->get_sftp_packet();
         switch ($this->packet_type) {
-            case NET_SFTP_HANDLE:
+            case SFTPPacketType::HANDLE:
                 $handle = substr($response, 4);
                 break;
-            case NET_SFTP_STATUS:
-                $this->_logError($response);
+            case SFTPPacketType::STATUS:
+                $this->logError($response);
                 return false;
             default:
-                throw new \UnexpectedValueException('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
+                throw new UnexpectedValueException(
+                    'Expected PacketType::HANDLE or PacketType::STATUS. '
+                    . 'Got packet type: ' . $this->packet_type
+                );
         }
 
         // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.2.3
@@ -1853,14 +1911,21 @@ function put($remote_file, $data, $mode = self::SOURCE_STRING, $start = -1, $loc
         switch (true) {
             case $mode & self::SOURCE_CALLBACK:
                 if (!is_callable($data)) {
-                    throw new \BadFunctionCallException("\$data should be is_callable() if you specify SOURCE_CALLBACK flag");
+                    throw new BadFunctionCallException("\$data should be is_callable() if you specify SOURCE_CALLBACK flag");
                 }
                 $dataCallback = $data;
                 // do nothing
                 break;
             case is_resource($data):
                 $mode = $mode & ~self::SOURCE_LOCAL_FILE;
-                $fp = $data;
+                $info = stream_get_meta_data($data);
+                if (isset($info['wrapper_type']) && $info['wrapper_type'] == 'PHP' && $info['stream_type'] == 'Input') {
+                    $fp = fopen('php://memory', 'w+');
+                    stream_copy_to_stream($data, $fp);
+                    rewind($fp);
+                } else {
+                    $fp = $data;
+                }
                 break;
             case $mode & self::SOURCE_LOCAL_FILE:
                 if (!is_file($data)) {
@@ -1874,11 +1939,14 @@ function put($remote_file, $data, $mode = self::SOURCE_STRING, $start = -1, $loc
 
         if (isset($fp)) {
             $stat = fstat($fp);
-            $size = $stat['size'];
+            $size = !empty($stat) ? $stat['size'] : 0;
 
             if ($local_start >= 0) {
                 fseek($fp, $local_start);
-                $size-= $local_start;
+                $size -= $local_start;
+            } elseif ($mode & self::RESUME) {
+                fseek($fp, $offset);
+                $size -= $offset;
             }
         } elseif ($dataCallback) {
             $size = 0;
@@ -1889,36 +1957,42 @@ function put($remote_file, $data, $mode = self::SOURCE_STRING, $start = -1, $loc
         $sent = 0;
         $size = $size < 0 ? ($size & 0x7FFFFFFF) + 0x80000000 : $size;
 
-        $sftp_packet_size = 4096; // PuTTY uses 4096
-        // make the SFTP packet be exactly 4096 bytes by including the bytes in the NET_SFTP_WRITE packets "header"
-        $sftp_packet_size-= strlen($handle) + 25;
-        $i = 0;
-        while ($dataCallback || $sent < $size) {
+        $sftp_packet_size = $this->max_sftp_packet;
+        // make the SFTP packet be exactly the SFTP packet size by including the bytes in the PacketType::WRITE packets "header"
+        $sftp_packet_size -= strlen($handle) + 25;
+        $i = $j = 0;
+        while ($dataCallback || ($size === 0 || $sent < $size)) {
             if ($dataCallback) {
-                $temp = call_user_func($dataCallback, $sftp_packet_size);
+                $temp = $dataCallback($sftp_packet_size);
                 if (is_null($temp)) {
                     break;
                 }
             } else {
                 $temp = isset($fp) ? fread($fp, $sftp_packet_size) : substr($data, $sent, $sftp_packet_size);
+                if ($temp === false || $temp === '') {
+                    break;
+                }
             }
+
             $subtemp = $offset + $sent;
             $packet = pack('Na*N3a*', strlen($handle), $handle, $subtemp / 4294967296, $subtemp, strlen($temp), $temp);
-            if (!$this->_send_sftp_packet(NET_SFTP_WRITE, $packet)) {
+            try {
+                $this->send_sftp_packet(SFTPPacketType::WRITE, $packet, $j);
+            } catch (\Exception $e) {
                 if ($mode & self::SOURCE_LOCAL_FILE) {
                     fclose($fp);
                 }
-                return false;
+                throw $e;
             }
-            $sent+= strlen($temp);
+            $sent += strlen($temp);
             if (is_callable($progressCallback)) {
-                call_user_func($progressCallback, $sent);
+                $progressCallback($sent);
             }
 
             $i++;
-
-            if ($i == NET_SFTP_QUEUE_SIZE) {
-                if (!$this->_read_put_responses($i)) {
+            $j++;
+            if ($i == $this->uploadQueueSize) {
+                if (!$this->read_put_responses($i)) {
                     $i = 0;
                     break;
                 }
@@ -1926,19 +2000,33 @@ function put($remote_file, $data, $mode = self::SOURCE_STRING, $start = -1, $loc
             }
         }
 
-        if (!$this->_read_put_responses($i)) {
+        $result = $this->close_handle($handle);
+
+        if (!$this->read_put_responses($i)) {
             if ($mode & self::SOURCE_LOCAL_FILE) {
                 fclose($fp);
             }
-            $this->_close_handle($handle);
+            $this->close_handle($handle);
             return false;
         }
 
-        if ($mode & self::SOURCE_LOCAL_FILE) {
-            fclose($fp);
+        if ($mode & SFTP::SOURCE_LOCAL_FILE) {
+            if (isset($fp) && is_resource($fp)) {
+                fclose($fp);
+            }
+
+            if ($this->preserveTime) {
+                $stat = stat($data);
+                $attr = $this->version < 4 ?
+                    pack('N3', Attribute::ACCESSTIME, $stat['atime'], $stat['mtime']) :
+                    Strings::packSSH2('NQ2', Attribute::ACCESSTIME | Attribute::MODIFYTIME, $stat['atime'], $stat['mtime']);
+                if (!$this->setstat($remote_file, $attr, false)) {
+                    throw new RuntimeException('Error setting file time');
+                }
+            }
         }
 
-        return $this->_close_handle($handle);
+        return $result;
     }
 
     /**
@@ -1947,22 +2035,22 @@ function put($remote_file, $data, $mode = self::SOURCE_STRING, $start = -1, $loc
      * Sending an SSH_FXP_WRITE packet and immediately reading its response isn't as efficient as blindly sending out $i
      * SSH_FXP_WRITEs, in succession, and then reading $i responses.
      *
-     * @param int $i
-     * @return bool
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @access private
+     * @throws UnexpectedValueException on receipt of unexpected packets
      */
-    function _read_put_responses($i)
+    private function read_put_responses(int $i): bool
     {
         while ($i--) {
-            $response = $this->_get_sftp_packet();
-            if ($this->packet_type != NET_SFTP_STATUS) {
-                throw new \UnexpectedValueException('Expected SSH_FXP_STATUS');
+            $response = $this->get_sftp_packet();
+            if ($this->packet_type != SFTPPacketType::STATUS) {
+                throw new UnexpectedValueException(
+                    'Expected PacketType::STATUS. '
+                    . 'Got packet type: ' . $this->packet_type
+                );
             }
 
-            extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-            if ($status != NET_SFTP_STATUS_OK) {
-                $this->_logError($response, $status);
+            [$status] = Strings::unpackSSH2('N', $response);
+            if ($status != StatusCode::OK) {
+                $this->logError($response, $status);
                 break;
             }
         }
@@ -1973,27 +2061,25 @@ function _read_put_responses($i)
     /**
      * Close handle
      *
-     * @param string $handle
-     * @return bool
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @access private
+     * @throws UnexpectedValueException on receipt of unexpected packets
      */
-    function _close_handle($handle)
+    private function close_handle(string $handle): bool
     {
-        if (!$this->_send_sftp_packet(NET_SFTP_CLOSE, pack('Na*', strlen($handle), $handle))) {
-            return false;
-        }
+        $this->send_sftp_packet(SFTPPacketType::CLOSE, pack('Na*', strlen($handle), $handle));
 
         // "The client MUST release all resources associated with the handle regardless of the status."
         //  -- http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.1.3
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            throw new \UnexpectedValueException('Expected SSH_FXP_STATUS');
+        $response = $this->get_sftp_packet();
+        if ($this->packet_type != SFTPPacketType::STATUS) {
+            throw new UnexpectedValueException(
+                'Expected PacketType::STATUS. '
+                . 'Got packet type: ' . $this->packet_type
+            );
         }
 
-        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        if ($status != NET_SFTP_STATUS_OK) {
-            $this->_logError($response, $status);
+        [$status] = Strings::unpackSSH2('N', $response);
+        if ($status != StatusCode::OK) {
+            $this->logError($response, $status);
             return false;
         }
 
@@ -2009,40 +2095,40 @@ function _close_handle($handle)
      *
      * $offset and $length can be used to download files in chunks.
      *
-     * @param string $remote_file
-     * @param string $local_file
-     * @param int $offset
-     * @param int $length
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @return mixed
-     * @access public
+     * @param  string|bool|resource|callable $local_file
+     * @return string|bool
+     * @throws UnexpectedValueException on receipt of unexpected packets
      */
-    function get($remote_file, $local_file = false, $offset = 0, $length = -1)
+    public function get(string $remote_file, $local_file = false, int $offset = 0, int $length = -1, ?callable $progressCallback = null)
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->precheck()) {
             return false;
         }
 
-        $remote_file = $this->_realpath($remote_file);
+        $remote_file = $this->realpath($remote_file);
         if ($remote_file === false) {
             return false;
         }
 
-        $packet = pack('Na*N2', strlen($remote_file), $remote_file, NET_SFTP_OPEN_READ, 0);
-        if (!$this->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
-            return false;
-        }
+        $packet = Strings::packSSH2('s', $remote_file);
+        $packet .= $this->version >= 5 ?
+            pack('N3', 0, OpenFlag5::OPEN_EXISTING, 0) :
+            pack('N2', OpenFlag::READ, 0);
+        $this->send_sftp_packet(SFTPPacketType::OPEN, $packet);
 
-        $response = $this->_get_sftp_packet();
+        $response = $this->get_sftp_packet();
         switch ($this->packet_type) {
-            case NET_SFTP_HANDLE:
+            case SFTPPacketType::HANDLE:
                 $handle = substr($response, 4);
                 break;
-            case NET_SFTP_STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-                $this->_logError($response);
+            case SFTPPacketType::STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
+                $this->logError($response);
                 return false;
             default:
-                throw new \UnexpectedValueException('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
+                throw new UnexpectedValueException(
+                    'Expected PacketType::HANDLE or PacketType::STATUS. '
+                    . 'Got packet type: ' . $this->packet_type
+                );
         }
 
         if (is_resource($local_file)) {
@@ -2051,7 +2137,7 @@ function get($remote_file, $local_file = false, $offset = 0, $length = -1)
             $res_offset = $stat['size'];
         } else {
             $res_offset = 0;
-            if ($local_file !== false) {
+            if ($local_file !== false && !is_callable($local_file)) {
                 $fp = fopen($local_file, 'wb');
                 if (!$fp) {
                     return false;
@@ -2061,110 +2147,161 @@ function get($remote_file, $local_file = false, $offset = 0, $length = -1)
             }
         }
 
-        $fclose_check = $local_file !== false && !is_resource($local_file);
+        $fclose_check = $local_file !== false && !is_callable($local_file) && !is_resource($local_file);
 
         $start = $offset;
-        $size = $this->max_sftp_packet < $length || $length < 0 ? $this->max_sftp_packet : $length;
+        $read = 0;
         while (true) {
-            $packet = pack('Na*N3', strlen($handle), $handle, $offset / 4294967296, $offset, $size);
-            if (!$this->_send_sftp_packet(NET_SFTP_READ, $packet)) {
-                if ($fclose_check) {
-                    fclose($fp);
-                }
-                return false;
-            }
+            $i = 0;
 
-            $response = $this->_get_sftp_packet();
-            switch ($this->packet_type) {
-                case NET_SFTP_DATA:
-                    $temp = substr($response, 4);
-                    $offset+= strlen($temp);
-                    if ($local_file === false) {
-                        $content.= $temp;
-                    } else {
-                        fputs($fp, $temp);
-                    }
-                    break;
-                case NET_SFTP_STATUS:
-                    // could, in theory, return false if !strlen($content) but we'll hold off for the time being
-                    $this->_logError($response);
-                    break 2;
-                default:
+            while ($i < $this->queueSize && ($length < 0 || $read < $length)) {
+                $tempoffset = $start + $read;
+
+                $packet_size = $length > 0 ? min($this->max_sftp_packet, $length - $read) : $this->max_sftp_packet;
+
+                $packet = Strings::packSSH2('sN3', $handle, $tempoffset / 4294967296, $tempoffset, $packet_size);
+                try {
+                    $this->send_sftp_packet(SFTPPacketType::READ, $packet, $i);
+                } catch (\Exception $e) {
                     if ($fclose_check) {
                         fclose($fp);
                     }
-                    throw new \UnexpectedValueException('Expected SSH_FXP_DATA or SSH_FXP_STATUS');
+                    throw $e;
+                }
+                $packet = null;
+                $read += $packet_size;
+                $i++;
             }
 
-            if ($length > 0 && $length <= $offset - $start) {
+            if (!$i) {
                 break;
             }
-        }
 
-        if ($length > 0 && $length <= $offset - $start) {
-            if ($local_file === false) {
-                $content = substr($content, 0, $length);
-            } else {
-                ftruncate($fp, $length + $res_offset);
+            $packets_sent = $i - 1;
+
+            $clear_responses = false;
+            while ($i > 0) {
+                $i--;
+
+                if ($clear_responses) {
+                    $this->get_sftp_packet($packets_sent - $i);
+                    continue;
+                } else {
+                    $response = $this->get_sftp_packet($packets_sent - $i);
+                }
+
+                switch ($this->packet_type) {
+                    case SFTPPacketType::DATA:
+                        $temp = substr($response, 4);
+                        $offset += strlen($temp);
+                        if ($local_file === false) {
+                            $content .= $temp;
+                        } elseif (is_callable($local_file)) {
+                            $local_file($temp);
+                        } else {
+                            fwrite($fp, $temp);
+                        }
+                        if (is_callable($progressCallback)) {
+                            call_user_func($progressCallback, $offset);
+                        }
+                        $temp = null;
+                        break;
+                    case SFTPPacketType::STATUS:
+                        // could, in theory, return false if !strlen($content) but we'll hold off for the time being
+                        $this->logError($response);
+                        $clear_responses = true; // don't break out of the loop yet, so we can read the remaining responses
+                        break;
+                    default:
+                        if ($fclose_check) {
+                            fclose($fp);
+                        }
+                        if ($this->channel_close) {
+                            $this->partial_init = false;
+                            $this->init_sftp_connection();
+                            return false;
+                        } else {
+                            throw new UnexpectedValueException(
+                                'Expected PacketType::DATA or PacketType::STATUS. '
+                                                          . 'Got packet type: ' . $this->packet_type
+                            );
+                        }
+                }
+                $response = null;
+            }
+
+            if ($clear_responses) {
+                break;
             }
         }
 
         if ($fclose_check) {
             fclose($fp);
+
+            if ($this->preserveTime) {
+                $stat = $this->stat($remote_file);
+                touch($local_file, $stat['mtime'], $stat['atime']);
+            }
         }
 
-        if (!$this->_close_handle($handle)) {
+        if (!$this->close_handle($handle)) {
             return false;
         }
 
         // if $content isn't set that means a file was written to
-        return isset($content) ? $content : true;
+        return $content ?? true;
     }
 
     /**
      * Deletes a file on the SFTP server.
      *
-     * @param string $path
-     * @param bool $recursive
-     * @return bool
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @access public
+     * @throws UnexpectedValueException on receipt of unexpected packets
      */
-    function delete($path, $recursive = true)
+    public function delete(string $path, bool $recursive = true): bool
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->precheck()) {
             return false;
         }
 
-        $path = $this->_realpath($path);
-        if ($path === false) {
+        if (is_object($path)) {
+            // It's an object. Cast it as string before we check anything else.
+            $path = (string) $path;
+        }
+
+        if (!is_string($path) || $path == '') {
             return false;
         }
 
-        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.3
-        if (!$this->_send_sftp_packet(NET_SFTP_REMOVE, pack('Na*', strlen($path), $path))) {
+        $path = $this->realpath($path);
+        if ($path === false) {
             return false;
         }
 
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            throw new \UnexpectedValueException('Expected SSH_FXP_STATUS');
+        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.3
+        $this->send_sftp_packet(SFTPPacketType::REMOVE, pack('Na*', strlen($path), $path));
+
+        $response = $this->get_sftp_packet();
+        if ($this->packet_type != SFTPPacketType::STATUS) {
+            throw new UnexpectedValueException(
+                'Expected PacketType::STATUS. '
+                . 'Got packet type: ' . $this->packet_type
+            );
         }
 
         // if $status isn't SSH_FX_OK it's probably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        if ($status != NET_SFTP_STATUS_OK) {
-            $this->_logError($response, $status);
+        [$status] = Strings::unpackSSH2('N', $response);
+        if ($status != StatusCode::OK) {
+            $this->logError($response, $status);
             if (!$recursive) {
                 return false;
             }
+
             $i = 0;
-            $result = $this->_delete_recursive($path, $i);
-            $this->_read_put_responses($i);
+            $result = $this->delete_recursive($path, $i);
+            $this->read_put_responses($i);
             return $result;
         }
 
-        $this->_remove_from_stat_cache($path);
+        $this->remove_from_stat_cache($path);
 
         return true;
     }
@@ -2173,26 +2310,26 @@ function delete($path, $recursive = true)
      * Recursively deletes directories on the SFTP server
      *
      * Minimizes directory lookups and SSH_FXP_STATUS requests for speed.
-     *
-     * @param string $path
-     * @param int $i
-     * @return bool
-     * @access private
      */
-    function _delete_recursive($path, &$i)
+    private function delete_recursive(string $path, int &$i): bool
     {
-        if (!$this->_read_put_responses($i)) {
+        if (!$this->read_put_responses($i)) {
             return false;
         }
         $i = 0;
-        $entries = $this->_list($path, true);
+        $entries = $this->readlist($path, true);
 
-        // normally $entries would have at least . and .. but it might not if the directories
-        // permissions didn't allow reading
-        if (empty($entries)) {
+        // The folder does not exist at all, so we cannot delete it.
+        if ($entries === StatusCode::NO_SUCH_FILE) {
             return false;
         }
 
+        // Normally $entries would have at least . and .. but it might not if the directories
+        // permissions didn't allow reading. If this happens then default to an empty list of files.
+        if ($entries === false || is_int($entries)) {
+            $entries = [];
+        }
+
         unset($entries['.'], $entries['..']);
         foreach ($entries as $filename => $props) {
             if (!isset($props['type'])) {
@@ -2200,20 +2337,18 @@ function _delete_recursive($path, &$i)
             }
 
             $temp = $path . '/' . $filename;
-            if ($props['type'] == NET_SFTP_TYPE_DIRECTORY) {
-                if (!$this->_delete_recursive($temp, $i)) {
+            if ($props['type'] == FileType::DIRECTORY) {
+                if (!$this->delete_recursive($temp, $i)) {
                     return false;
                 }
             } else {
-                if (!$this->_send_sftp_packet(NET_SFTP_REMOVE, pack('Na*', strlen($temp), $temp))) {
-                    return false;
-                }
-                $this->_remove_from_stat_cache($temp);
+                $this->send_sftp_packet(SFTPPacketType::REMOVE, Strings::packSSH2('s', $temp));
+                $this->remove_from_stat_cache($temp);
 
                 $i++;
 
-                if ($i >= NET_SFTP_QUEUE_SIZE) {
-                    if (!$this->_read_put_responses($i)) {
+                if ($i >= $this->queueSize) {
+                    if (!$this->read_put_responses($i)) {
                         return false;
                     }
                     $i = 0;
@@ -2221,15 +2356,13 @@ function _delete_recursive($path, &$i)
             }
         }
 
-        if (!$this->_send_sftp_packet(NET_SFTP_RMDIR, pack('Na*', strlen($path), $path))) {
-            return false;
-        }
-        $this->_remove_from_stat_cache($path);
+        $this->send_sftp_packet(SFTPPacketType::RMDIR, Strings::packSSH2('s', $path));
+        $this->remove_from_stat_cache($path);
 
         $i++;
 
-        if ($i >= NET_SFTP_QUEUE_SIZE) {
-            if (!$this->_read_put_responses($i)) {
+        if ($i >= $this->queueSize) {
+            if (!$this->read_put_responses($i)) {
                 return false;
             }
             $i = 0;
@@ -2240,17 +2373,17 @@ function _delete_recursive($path, &$i)
 
     /**
      * Checks whether a file or directory exists
-     *
-     * @param string $path
-     * @return bool
-     * @access public
      */
-    function file_exists($path)
+    public function file_exists(string $path): bool
     {
         if ($this->use_stat_cache) {
-            $path = $this->_realpath($path);
+            if (!$this->precheck()) {
+                return false;
+            }
 
-            $result = $this->_query_stat_cache($path);
+            $path = $this->realpath($path);
+
+            $result = $this->query_stat_cache($path);
 
             if (isset($result)) {
                 // return true if $result is an array or if it's an stdClass object
@@ -2263,150 +2396,193 @@ function file_exists($path)
 
     /**
      * Tells whether the filename is a directory
-     *
-     * @param string $path
-     * @return bool
-     * @access public
      */
-    function is_dir($path)
+    public function is_dir(string $path): bool
     {
-        $result = $this->_get_stat_cache_prop($path, 'type');
+        $result = $this->get_stat_cache_prop($path, 'type');
         if ($result === false) {
             return false;
         }
-        return $result === NET_SFTP_TYPE_DIRECTORY;
+        return $result === FileType::DIRECTORY;
     }
 
     /**
      * Tells whether the filename is a regular file
-     *
-     * @param string $path
-     * @return bool
-     * @access public
      */
-    function is_file($path)
+    public function is_file(string $path): bool
     {
-        $result = $this->_get_stat_cache_prop($path, 'type');
+        $result = $this->get_stat_cache_prop($path, 'type');
         if ($result === false) {
             return false;
         }
-        return $result === NET_SFTP_TYPE_REGULAR;
+        return $result === FileType::REGULAR;
     }
 
     /**
      * Tells whether the filename is a symbolic link
-     *
-     * @param string $path
-     * @return bool
-     * @access public
      */
-    function is_link($path)
+    public function is_link(string $path): bool
     {
-        $result = $this->_get_lstat_cache_prop($path, 'type');
+        $result = $this->get_lstat_cache_prop($path, 'type');
         if ($result === false) {
             return false;
         }
-        return $result === NET_SFTP_TYPE_SYMLINK;
+        return $result === FileType::SYMLINK;
     }
 
     /**
-     * Gets last access time of file
+     * Tells whether a file exists and is readable
+     */
+    public function is_readable(string $path): bool
+    {
+        if (!$this->precheck()) {
+            return false;
+        }
+
+        $packet = Strings::packSSH2('sNN', $this->realpath($path), OpenFlag::READ, 0);
+        $this->send_sftp_packet(SFTPPacketType::OPEN, $packet);
+
+        $response = $this->get_sftp_packet();
+        switch ($this->packet_type) {
+            case SFTPPacketType::HANDLE:
+                return true;
+            case SFTPPacketType::STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
+                return false;
+            default:
+                throw new UnexpectedValueException(
+                    'Expected PacketType::HANDLE or PacketType::STATUS. '
+                    . 'Got packet type: ' . $this->packet_type
+                );
+        }
+    }
+
+    /**
+     * Tells whether the filename is writable
+     */
+    public function is_writable(string $path): bool
+    {
+        if (!$this->precheck()) {
+            return false;
+        }
+
+        $packet = Strings::packSSH2('sNN', $this->realpath($path), OpenFlag::WRITE, 0);
+        $this->send_sftp_packet(SFTPPacketType::OPEN, $packet);
+
+        $response = $this->get_sftp_packet();
+        switch ($this->packet_type) {
+            case SFTPPacketType::HANDLE:
+                return true;
+            case SFTPPacketType::STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
+                return false;
+            default:
+                throw new UnexpectedValueException(
+                    'Expected SSH_FXP_HANDLE or SSH_FXP_STATUS. '
+                    . 'Got packet type: ' . $this->packet_type
+                );
+        }
+    }
+
+    /**
+     * Tells whether the filename is writeable
      *
-     * @param string $path
-     * @return mixed
-     * @access public
+     * Alias of is_writable
+     */
+    public function is_writeable(string $path): bool
+    {
+        return $this->is_writable($path);
+    }
+
+    /**
+     * Gets last access time of file
      */
-    function fileatime($path)
+    public function fileatime(string $path)
     {
-        return $this->_get_stat_cache_prop($path, 'atime');
+        return $this->get_stat_cache_prop($path, 'atime');
     }
 
     /**
      * Gets file modification time
-     *
-     * @param string $path
-     * @return mixed
-     * @access public
      */
-    function filemtime($path)
+    public function filemtime(string $path)
     {
-        return $this->_get_stat_cache_prop($path, 'mtime');
+        return $this->get_stat_cache_prop($path, 'mtime');
     }
 
     /**
      * Gets file permissions
-     *
-     * @param string $path
-     * @return mixed
-     * @access public
      */
-    function fileperms($path)
+    public function fileperms(string $path)
     {
-        return $this->_get_stat_cache_prop($path, 'permissions');
+        return $this->get_stat_cache_prop($path, 'mode');
     }
 
     /**
      * Gets file owner
-     *
-     * @param string $path
-     * @return mixed
-     * @access public
      */
-    function fileowner($path)
+    public function fileowner(string $path)
     {
-        return $this->_get_stat_cache_prop($path, 'uid');
+        return $this->get_stat_cache_prop($path, 'uid');
     }
 
     /**
      * Gets file group
-     *
-     * @param string $path
-     * @return mixed
-     * @access public
      */
-    function filegroup($path)
+    public function filegroup(string $path)
     {
-        return $this->_get_stat_cache_prop($path, 'gid');
+        return $this->get_stat_cache_prop($path, 'gid');
+    }
+
+    /**
+     * Recursively go through rawlist() output to get the total filesize
+     */
+    private static function recursiveFilesize(array $files): int
+    {
+        $size = 0;
+        foreach ($files as $name => $file) {
+            if ($name == '.' || $name == '..') {
+                continue;
+            }
+            $size += is_array($file) ?
+                self::recursiveFilesize($file) :
+                $file->size;
+        }
+        return $size;
     }
 
     /**
      * Gets file size
-     *
-     * @param string $path
-     * @return mixed
-     * @access public
      */
-    function filesize($path)
+    public function filesize(string $path, bool $recursive = false)
     {
-        return $this->_get_stat_cache_prop($path, 'size');
+        return !$recursive || $this->filetype($path) != 'dir' ?
+            $this->get_stat_cache_prop($path, 'size') :
+            self::recursiveFilesize($this->rawlist($path, true));
     }
 
     /**
      * Gets file type
      *
-     * @param string $path
-     * @return mixed
-     * @access public
+     * @return string|false
      */
-    function filetype($path)
+    public function filetype(string $path)
     {
-        $type = $this->_get_stat_cache_prop($path, 'type');
+        $type = $this->get_stat_cache_prop($path, 'type');
         if ($type === false) {
             return false;
         }
 
         switch ($type) {
-            case NET_SFTP_TYPE_BLOCK_DEVICE:
+            case FileType::BLOCK_DEVICE:
                 return 'block';
-            case NET_SFTP_TYPE_CHAR_DEVICE:
+            case FileType::CHAR_DEVICE:
                 return 'char';
-            case NET_SFTP_TYPE_DIRECTORY:
+            case FileType::DIRECTORY:
                 return 'dir';
-            case NET_SFTP_TYPE_FIFO:
+            case FileType::FIFO:
                 return 'fifo';
-            case NET_SFTP_TYPE_REGULAR:
+            case FileType::REGULAR:
                 return 'file';
-            case NET_SFTP_TYPE_SYMLINK:
+            case FileType::SYMLINK:
                 return 'link';
             default:
                 return false;
@@ -2417,48 +2593,37 @@ function filetype($path)
      * Return a stat properity
      *
      * Uses cache if appropriate.
-     *
-     * @param string $path
-     * @param string $prop
-     * @return mixed
-     * @access private
      */
-    function _get_stat_cache_prop($path, $prop)
+    private function get_stat_cache_prop(string $path, string $prop)
     {
-        return $this->_get_xstat_cache_prop($path, $prop, 'stat');
+        return $this->get_xstat_cache_prop($path, $prop, 'stat');
     }
 
     /**
      * Return an lstat properity
      *
      * Uses cache if appropriate.
-     *
-     * @param string $path
-     * @param string $prop
-     * @return mixed
-     * @access private
      */
-    function _get_lstat_cache_prop($path, $prop)
+    private function get_lstat_cache_prop(string $path, string $prop)
     {
-        return $this->_get_xstat_cache_prop($path, $prop, 'lstat');
+        return $this->get_xstat_cache_prop($path, $prop, 'lstat');
     }
 
     /**
      * Return a stat or lstat properity
      *
      * Uses cache if appropriate.
-     *
-     * @param string $path
-     * @param string $prop
-     * @return mixed
-     * @access private
      */
-    function _get_xstat_cache_prop($path, $prop, $type)
+    private function get_xstat_cache_prop(string $path, string $prop, string $type)
     {
+        if (!$this->precheck()) {
+            return false;
+        }
+
         if ($this->use_stat_cache) {
-            $path = $this->_realpath($path);
+            $path = $this->realpath($path);
 
-            $result = $this->_query_stat_cache($path);
+            $result = $this->query_stat_cache($path);
 
             if (is_object($result) && isset($result->$type)) {
                 return $result->{$type}[$prop];
@@ -2475,101 +2640,221 @@ function _get_xstat_cache_prop($path, $prop, $type)
     }
 
     /**
-     * Renames a file or a directory on the SFTP server
+     * Renames a file or a directory on the SFTP server.
+     *
+     * If the file already exists this will return false
      *
-     * @param string $oldname
-     * @param string $newname
-     * @return bool
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @access public
+     * @throws UnexpectedValueException on receipt of unexpected packets
      */
-    function rename($oldname, $newname)
+    public function rename(string $oldname, string $newname): bool
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->precheck()) {
             return false;
         }
 
-        $oldname = $this->_realpath($oldname);
-        $newname = $this->_realpath($newname);
+        $oldname = $this->realpath($oldname);
+        $newname = $this->realpath($newname);
         if ($oldname === false || $newname === false) {
             return false;
         }
 
         // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.3
-        $packet = pack('Na*Na*', strlen($oldname), $oldname, strlen($newname), $newname);
-        if (!$this->_send_sftp_packet(NET_SFTP_RENAME, $packet)) {
-            return false;
+        $packet = Strings::packSSH2('ss', $oldname, $newname);
+        if ($this->version >= 5) {
+            /* quoting https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-05#section-6.5 ,
+
+               'flags' is 0 or a combination of:
+
+                   SSH_FXP_RENAME_OVERWRITE  0x00000001
+                   SSH_FXP_RENAME_ATOMIC     0x00000002
+                   SSH_FXP_RENAME_NATIVE     0x00000004
+
+               (none of these are currently supported) */
+            $packet .= "\0\0\0\0";
         }
+        $this->send_sftp_packet(SFTPPacketType::RENAME, $packet);
 
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            throw new \UnexpectedValueException('Expected SSH_FXP_STATUS');
+        $response = $this->get_sftp_packet();
+        if ($this->packet_type != SFTPPacketType::STATUS) {
+            throw new UnexpectedValueException(
+                'Expected PacketType::STATUS. '
+                . 'Got packet type: ' . $this->packet_type
+            );
         }
 
         // if $status isn't SSH_FX_OK it's probably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        if ($status != NET_SFTP_STATUS_OK) {
-            $this->_logError($response, $status);
+        /**
+         * @var int $status
+         */
+        [$status] = Strings::unpackSSH2('N', $response);
+        if ($status != StatusCode::OK) {
+            $this->logError($response, $status);
             return false;
         }
 
         // don't move the stat cache entry over since this operation could very well change the
         // atime and mtime attributes
-        //$this->_update_stat_cache($newname, $this->_query_stat_cache($oldname));
-        $this->_remove_from_stat_cache($oldname);
-        $this->_remove_from_stat_cache($newname);
+        //$this->update_stat_cache($newname, $this->query_stat_cache($oldname));
+        $this->remove_from_stat_cache($oldname);
+        $this->remove_from_stat_cache($newname);
 
         return true;
     }
 
+    /**
+     * Parse Time
+     *
+     * See '7.7.  Times' of draft-ietf-secsh-filexfer-13 for more info.
+     */
+    private function parseTime(string $key, int $flags, string &$response): array
+    {
+        $attr = [];
+        [$attr[$key]] = Strings::unpackSSH2('Q', $response);
+        if ($flags & Attribute::SUBSECOND_TIMES) {
+            [$attr[$key . '-nseconds']] = Strings::unpackSSH2('N', $response);
+        }
+        return $attr;
+    }
+
     /**
      * Parse Attributes
      *
      * See '7.  File Attributes' of draft-ietf-secsh-filexfer-13 for more info.
-     *
-     * @param string $response
-     * @return array
-     * @access private
      */
-    function _parseAttributes(&$response)
+    protected function parseAttributes(string &$response): array
     {
-        $attr = array();
-        extract(unpack('Nflags', $this->_string_shift($response, 4)));
-        // SFTPv4+ have a type field (a byte) that follows the above flag field
-        foreach ($this->attributes as $key => $value) {
+        $attr = [];
+
+        if ($this->version >= 4) {
+            [$flags, $attr['type']] = Strings::unpackSSH2('NC', $response);
+        } else {
+            [$flags] = Strings::unpackSSH2('N', $response);
+        }
+
+        foreach (Attribute::getConstants() as $value => $key) {
+            switch ($flags & $key) {
+                case Attribute::UIDGID:
+                    if ($this->version > 3) {
+                        continue 2;
+                    }
+                    break;
+                case Attribute::CREATETIME:
+                case Attribute::MODIFYTIME:
+                case Attribute::ACL:
+                case Attribute::OWNERGROUP:
+                case Attribute::SUBSECOND_TIMES:
+                    if ($this->version < 4) {
+                        continue 2;
+                    }
+                    break;
+                case Attribute::BITS:
+                    if ($this->version < 5) {
+                        continue 2;
+                    }
+                    break;
+                case Attribute::ALLOCATION_SIZE:
+                case Attribute::TEXT_HINT:
+                case Attribute::MIME_TYPE:
+                case Attribute::LINK_COUNT:
+                case Attribute::UNTRANSLATED_NAME:
+                case Attribute::CTIME:
+                    if ($this->version < 6) {
+                        continue 2;
+                    }
+            }
             switch ($flags & $key) {
-                case NET_SFTP_ATTR_SIZE: // 0x00000001
+                case Attribute::SIZE:             // 0x00000001
                     // The size attribute is defined as an unsigned 64-bit integer.
                     // The following will use floats on 32-bit platforms, if necessary.
                     // As can be seen in the BigInteger class, floats are generally
                     // IEEE 754 binary64 "double precision" on such platforms and
                     // as such can represent integers of at least 2^50 without loss
                     // of precision. Interpreted in filesize, 2^50 bytes = 1024 TiB.
-                    $attr['size'] = hexdec(bin2hex($this->_string_shift($response, 8)));
+                    [$attr['size']] = Strings::unpackSSH2('Q', $response);
+                    break;
+                case Attribute::UIDGID: // 0x00000002 (SFTPv3 only)
+                    [$attr['uid'], $attr['gid']] = Strings::unpackSSH2('NN', $response);
                     break;
-                case NET_SFTP_ATTR_UIDGID: // 0x00000002 (SFTPv3 only)
-                    $attr+= unpack('Nuid/Ngid', $this->_string_shift($response, 8));
+                case Attribute::PERMISSIONS: // 0x00000004
+                    [$attr['mode']] = Strings::unpackSSH2('N', $response);
+                    $fileType = $this->parseMode($attr['mode']);
+                    if ($this->version < 4 && $fileType !== false) {
+                        $attr += ['type' => $fileType];
+                    }
                     break;
-                case NET_SFTP_ATTR_PERMISSIONS: // 0x00000004
-                    $attr+= unpack('Npermissions', $this->_string_shift($response, 4));
-                    // mode == permissions; permissions was the original array key and is retained for bc purposes.
-                    // mode was added because that's the more industry standard terminology
-                    $attr+= array('mode' => $attr['permissions']);
-                    $fileType = $this->_parseMode($attr['permissions']);
-                    if ($fileType !== false) {
-                        $attr+= array('type' => $fileType);
+                case Attribute::ACCESSTIME: // 0x00000008
+                    if ($this->version >= 4) {
+                        $attr += $this->parseTime('atime', $flags, $response);
+                        break;
                     }
+                    [$attr['atime'], $attr['mtime']] = Strings::unpackSSH2('NN', $response);
+                    break;
+                case Attribute::CREATETIME:       // 0x00000010 (SFTPv4+)
+                    $attr += $this->parseTime('createtime', $flags, $response);
+                    break;
+                case Attribute::MODIFYTIME:       // 0x00000020
+                    $attr += $this->parseTime('mtime', $flags, $response);
+                    break;
+                case Attribute::ACL:              // 0x00000040
+                    // access control list
+                    // see https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-04#section-5.7
+                    // currently unsupported
+                    [$count] = Strings::unpackSSH2('N', $response);
+                    for ($i = 0; $i < $count; $i++) {
+                        [$type, $flag, $mask, $who] = Strings::unpackSSH2('N3s', $result);
+                    }
+                    break;
+                case Attribute::OWNERGROUP:       // 0x00000080
+                    [$attr['owner'], $attr['$group']] = Strings::unpackSSH2('ss', $response);
+                    break;
+                case Attribute::SUBSECOND_TIMES:  // 0x00000100
+                    break;
+                case Attribute::BITS:             // 0x00000200 (SFTPv5+)
+                    // see https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-05#section-5.8
+                    // currently unsupported
+                    // tells if you file is:
+                    // readonly, system, hidden, case inensitive, archive, encrypted, compressed, sparse
+                    // append only, immutable, sync
+                    [$attrib_bits, $attrib_bits_valid] = Strings::unpackSSH2('N2', $response);
+                    // if we were actually gonna implement the above it ought to be
+                    // $attr['attrib-bits'] and $attr['attrib-bits-valid']
+                    // eg. - instead of _
+                    break;
+                case Attribute::ALLOCATION_SIZE:  // 0x00000400 (SFTPv6+)
+                    // see https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-7.4
+                    // represents the number of bytes that the file consumes on the disk. will
+                    // usually be larger than the 'size' field
+                    [$attr['allocation-size']] = Strings::unpackSSH2('Q', $response);
+                    break;
+                case Attribute::TEXT_HINT:        // 0x00000800
+                    // https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-7.10
+                    // currently unsupported
+                    // tells if file is "known text", "guessed text", "known binary", "guessed binary"
+                    [$text_hint] = Strings::unpackSSH2('C', $response);
+                    // the above should be $attr['text-hint']
+                    break;
+                case Attribute::MIME_TYPE:        // 0x00001000
+                    // see https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-7.11
+                    [$attr['mime-type']] = Strings::unpackSSH2('s', $response);
+                    break;
+                case Attribute::LINK_COUNT:       // 0x00002000
+                    // see https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-7.12
+                    [$attr['link-count']] = Strings::unpackSSH2('N', $response);
                     break;
-                case NET_SFTP_ATTR_ACCESSTIME: // 0x00000008
-                    $attr+= unpack('Natime/Nmtime', $this->_string_shift($response, 8));
+                case Attribute::UNTRANSLATED_NAME:// 0x00004000
+                    // see https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-7.13
+                    [$attr['untranslated-name']] = Strings::unpackSSH2('s', $response);
                     break;
-                case NET_SFTP_ATTR_EXTENDED: // 0x80000000
-                    extract(unpack('Ncount', $this->_string_shift($response, 4)));
+                case Attribute::CTIME:            // 0x00008000
+                    // 'ctime' contains the last time the file attributes were changed.  The
+                    // exact meaning of this field depends on the server.
+                    $attr += $this->parseTime('ctime', $flags, $response);
+                    break;
+                case Attribute::EXTENDED: // 0x80000000
+                    [$count] = Strings::unpackSSH2('N', $response);
                     for ($i = 0; $i < $count; $i++) {
-                        extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                        $key = $this->_string_shift($response, $length);
-                        extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                        $attr[$key] = $this->_string_shift($response, $length);
+                        [$key, $value] = Strings::unpackSSH2('ss', $response);
+                        $attr[$key] = $value;
                     }
             }
         }
@@ -2581,39 +2866,37 @@ function _parseAttributes(&$response)
      *
      * Quoting the SFTP RFC, "Implementations MUST NOT send bits that are not defined" but they seem to anyway
      *
-     * @param int $mode
      * @return int
-     * @access private
      */
-    function _parseMode($mode)
+    private function parseMode(int $mode)
     {
         // values come from http://lxr.free-electrons.com/source/include/uapi/linux/stat.h#L12
         // see, also, http://linux.die.net/man/2/stat
-        switch ($mode & 0170000) {// ie. 1111 0000 0000 0000
-            case 0000000: // no file type specified - figure out the file type using alternative means
+        switch ($mode & 0o170000) {// ie. 1111 0000 0000 0000
+            case 0: // no file type specified - figure out the file type using alternative means
                 return false;
-            case 0040000:
-                return NET_SFTP_TYPE_DIRECTORY;
-            case 0100000:
-                return NET_SFTP_TYPE_REGULAR;
-            case 0120000:
-                return NET_SFTP_TYPE_SYMLINK;
+            case 0o040000:
+                return FileType::DIRECTORY;
+            case 0o100000:
+                return FileType::REGULAR;
+            case 0o120000:
+                return FileType::SYMLINK;
             // new types introduced in SFTPv5+
             // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-05#section-5.2
-            case 0010000: // named pipe (fifo)
-                return NET_SFTP_TYPE_FIFO;
-            case 0020000: // character special
-                return NET_SFTP_TYPE_CHAR_DEVICE;
-            case 0060000: // block special
-                return NET_SFTP_TYPE_BLOCK_DEVICE;
-            case 0140000: // socket
-                return NET_SFTP_TYPE_SOCKET;
-            case 0160000: // whiteout
+            case 0o010000: // named pipe (fifo)
+                return FileType::FIFO;
+            case 0o020000: // character special
+                return FileType::CHAR_DEVICE;
+            case 0o060000: // block special
+                return FileType::BLOCK_DEVICE;
+            case 0o140000: // socket
+                return FileType::SOCKET;
+            case 0o160000: // whiteout
                 // "SPECIAL should be used for files that are of
                 //  a known type which cannot be expressed in the protocol"
-                return NET_SFTP_TYPE_SPECIAL;
+                return FileType::SPECIAL;
             default:
-                return NET_SFTP_TYPE_UNKNOWN;
+                return FileType::UNKNOWN;
         }
     }
 
@@ -2627,25 +2910,21 @@ function _parseMode($mode)
      * {@link http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-5.2 SFTPv4 type constants}.
      *
      * If the longname is in an unrecognized format bool(false) is returned.
-     *
-     * @param string $longname
-     * @return mixed
-     * @access private
      */
-    function _parseLongname($longname)
+    private function parseLongname(string $longname)
     {
         // http://en.wikipedia.org/wiki/Unix_file_types
         // http://en.wikipedia.org/wiki/Filesystem_permissions#Notation_of_traditional_Unix_permissions
         if (preg_match('#^[^/]([r-][w-][xstST-]){3}#', $longname)) {
             switch ($longname[0]) {
                 case '-':
-                    return NET_SFTP_TYPE_REGULAR;
+                    return FileType::REGULAR;
                 case 'd':
-                    return NET_SFTP_TYPE_DIRECTORY;
+                    return FileType::DIRECTORY;
                 case 'l':
-                    return NET_SFTP_TYPE_SYMLINK;
+                    return FileType::SYMLINK;
                 default:
-                    return NET_SFTP_TYPE_SPECIAL;
+                    return FileType::SPECIAL;
             }
         }
 
@@ -2657,39 +2936,49 @@ function _parseLongname($longname)
      *
      * See '6. General Packet Format' of draft-ietf-secsh-filexfer-13 for more info.
      *
-     * @param int $type
-     * @param string $data
      * @see self::_get_sftp_packet()
-     * @see self::_send_channel_packet()
-     * @return bool
-     * @access private
+     * @see self::send_channel_packet()
      */
-    function _send_sftp_packet($type, $data)
+    private function send_sftp_packet(int $type, string $data, int $request_id = 1): void
     {
-        $packet = $this->request_id !== false ?
-            pack('NCNa*', strlen($data) + 5, $type, $this->request_id, $data) :
-            pack('NCa*',  strlen($data) + 1, $type, $data);
+        // in SSH2.php the timeout is cumulative per function call. eg. exec() will
+        // timeout after 10s. but for SFTP.php it's cumulative per packet
+        $this->curTimeout = $this->timeout;
+        $this->is_timeout = false;
+
+        $packet = $this->use_request_id ?
+            pack('NCNa*', strlen($data) + 5, $type, $request_id, $data) :
+            pack('NCa*', strlen($data) + 1, $type, $data);
 
-        $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838
-        $result = $this->_send_channel_packet(self::CHANNEL, $packet);
-        $stop = strtok(microtime(), ' ') + strtok('');
+        $start = microtime(true);
+        $this->send_channel_packet(self::CHANNEL, $packet);
+        $stop = microtime(true);
 
         if (defined('NET_SFTP_LOGGING')) {
             $packet_type = '-> ' . $this->packet_types[$type] .
                            ' (' . round($stop - $start, 4) . 's)';
-            if (NET_SFTP_LOGGING == NET_SFTP_LOG_REALTIME) {
-                echo "<pre>\r\n" . $this->_format_log(array($data), array($packet_type)) . "\r\n</pre>\r\n";
-                flush();
-                ob_flush();
-            } else {
-                $this->packet_type_log[] = $packet_type;
-                if (NET_SFTP_LOGGING == NET_SFTP_LOG_COMPLEX) {
-                    $this->packet_log[] = $data;
-                }
-            }
+            $this->append_log($packet_type, $data);
         }
+    }
 
-        return $result;
+    /**
+     * Resets the SFTP channel for re-use
+     */
+    private function reset_sftp(): void
+    {
+        $this->use_request_id = false;
+        $this->pwd = false;
+        $this->requestBuffer = [];
+        $this->partial_init = false;
+    }
+
+    /**
+     * Resets a connection for re-use
+     */
+    protected function reset_connection(): void
+    {
+        parent::reset_connection();
+        $this->reset_sftp();
     }
 
     /**
@@ -2701,115 +2990,153 @@ function _send_sftp_packet($type, $data)
      * There can be one SSH_MSG_CHANNEL_DATA messages containing two SFTP packets or there can be two SSH_MSG_CHANNEL_DATA
      * messages containing one SFTP packet.
      *
-     * @see self::_send_sftp_packet()
+     * @see    self::_send_sftp_packet()
      * @return string
-     * @access private
      */
-    function _get_sftp_packet()
+    private function get_sftp_packet($request_id = null)
     {
-        $this->curTimeout = false;
+        $this->channel_close = false;
 
-        $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838
+        if (isset($request_id) && isset($this->requestBuffer[$request_id])) {
+            $this->packet_type = $this->requestBuffer[$request_id]['packet_type'];
+            $temp = $this->requestBuffer[$request_id]['packet'];
+            unset($this->requestBuffer[$request_id]);
+            return $temp;
+        }
+
+        // in SSH2.php the timeout is cumulative per function call. eg. exec() will
+        // timeout after 10s. but for SFTP.php it's cumulative per packet
+        $this->curTimeout = $this->timeout;
+        $this->is_timeout = false;
+
+        $start = microtime(true);
 
         // SFTP packet length
         while (strlen($this->packet_buffer) < 4) {
-            $temp = $this->_get_channel_packet(self::CHANNEL);
-            if (is_bool($temp)) {
-                $this->packet_type = false;
+            $temp = $this->get_channel_packet(self::CHANNEL, true);
+            if ($temp === true) {
+                if ($this->channel_status[self::CHANNEL] === SSH2MessageType::CHANNEL_CLOSE) {
+                    $this->channel_close = true;
+                }
+                $this->packet_type = -1;
                 $this->packet_buffer = '';
                 return false;
             }
-            $this->packet_buffer.= $temp;
+            $this->packet_buffer .= $temp;
+        }
+        if (strlen($this->packet_buffer) < 4) {
+            throw new RuntimeException('Packet is too small');
         }
-        extract(unpack('Nlength', $this->_string_shift($this->packet_buffer, 4)));
+        ['length' => $length] = unpack('Nlength', Strings::shift($this->packet_buffer, 4));
+
         $tempLength = $length;
-        $tempLength-= strlen($this->packet_buffer);
+        $tempLength -= strlen($this->packet_buffer);
+
+        // 256 * 1024 is what SFTP_MAX_MSG_LENGTH is set to in OpenSSH's sftp-common.h
+        if (!$this->allow_arbitrary_length_packets && !$this->use_request_id && $tempLength > 256 * 1024) {
+            throw new RuntimeException('Invalid Size');
+        }
 
         // SFTP packet type and data payload
         while ($tempLength > 0) {
-            $temp = $this->_get_channel_packet(self::CHANNEL);
-            if (is_bool($temp)) {
-                $this->packet_type = false;
+            $temp = $this->get_channel_packet(self::CHANNEL, true);
+            if ($temp === true) {
+                if ($this->channel_status[self::CHANNEL] === SSH2MessageType::CHANNEL_CLOSE) {
+                    $this->channel_close = true;
+                }
+                $this->packet_type = -1;
                 $this->packet_buffer = '';
                 return false;
             }
-            $this->packet_buffer.= $temp;
-            $tempLength-= strlen($temp);
+            $this->packet_buffer .= $temp;
+            $tempLength -= strlen($temp);
         }
 
-        $stop = strtok(microtime(), ' ') + strtok('');
+        $stop = microtime(true);
 
-        $this->packet_type = ord($this->_string_shift($this->packet_buffer));
+        $this->packet_type = ord(Strings::shift($this->packet_buffer));
 
-        if ($this->request_id !== false) {
-            $this->_string_shift($this->packet_buffer, 4); // remove the request id
-            $length-= 5; // account for the request id and the packet type
+        if ($this->use_request_id) {
+            ['packet_id' => $packet_id] = unpack('Npacket_id', Strings::shift($this->packet_buffer, 4)); // remove the request id
+            $length -= 5; // account for the request id and the packet type
         } else {
-            $length-= 1; // account for the packet type
+            $length -= 1; // account for the packet type
         }
 
-        $packet = $this->_string_shift($this->packet_buffer, $length);
+        $packet = Strings::shift($this->packet_buffer, $length);
 
         if (defined('NET_SFTP_LOGGING')) {
             $packet_type = '<- ' . $this->packet_types[$this->packet_type] .
                            ' (' . round($stop - $start, 4) . 's)';
-            if (NET_SFTP_LOGGING == NET_SFTP_LOG_REALTIME) {
-                echo "<pre>\r\n" . $this->_format_log(array($packet), array($packet_type)) . "\r\n</pre>\r\n";
-                flush();
-                ob_flush();
-            } else {
-                $this->packet_type_log[] = $packet_type;
-                if (NET_SFTP_LOGGING == NET_SFTP_LOG_COMPLEX) {
-                    $this->packet_log[] = $packet;
-                }
-            }
+            $this->append_log($packet_type, $packet);
+        }
+
+        if (isset($request_id) && $this->use_request_id && $packet_id != $request_id) {
+            $this->requestBuffer[$packet_id] = [
+                'packet_type' => $this->packet_type,
+                'packet' => $packet,
+            ];
+            return $this->get_sftp_packet($request_id);
         }
 
         return $packet;
     }
 
+    /**
+     * Logs data packets
+     *
+     * Makes sure that only the last 1MB worth of packets will be logged
+     */
+    private function append_log(string $message_number, string $message): void
+    {
+        $this->append_log_helper(
+            NET_SFTP_LOGGING,
+            $message_number,
+            $message,
+            $this->packet_type_log,
+            $this->packet_log,
+            $this->log_size,
+            $this->realtime_log_file,
+            $this->realtime_log_wrap,
+            $this->realtime_log_size
+        );
+    }
+
     /**
      * Returns a log of the packets that have been sent and received.
      *
-     * Returns a string if NET_SFTP_LOGGING == NET_SFTP_LOG_COMPLEX, an array if NET_SFTP_LOGGING == NET_SFTP_LOG_SIMPLE and false if !defined('NET_SFTP_LOGGING')
+     * Returns a string if PacketType::LOGGING == self::LOG_COMPLEX, an array if PacketType::LOGGING == self::LOG_SIMPLE and false if !defined('NET_SFTP_LOGGING')
      *
-     * @access public
-     * @return string or Array
+     * @return array|string|false
      */
-    function getSFTPLog()
+    public function getSFTPLog()
     {
         if (!defined('NET_SFTP_LOGGING')) {
             return false;
         }
 
         switch (NET_SFTP_LOGGING) {
-            case NET_SFTP_LOG_COMPLEX:
-                return $this->_format_log($this->packet_log, $this->packet_type_log);
+            case self::LOG_COMPLEX:
+                return $this->format_log($this->packet_log, $this->packet_type_log);
                 break;
-            //case NET_SFTP_LOG_SIMPLE:
+            //case self::LOG_SIMPLE:
             default:
                 return $this->packet_type_log;
         }
     }
 
     /**
-     * Returns all errors
-     *
-     * @return string
-     * @access public
+     * Returns all errors on the SFTP layer
      */
-    function getSFTPErrors()
+    public function getSFTPErrors(): array
     {
         return $this->sftp_errors;
     }
 
     /**
-     * Returns the last error
-     *
-     * @return string
-     * @access public
+     * Returns the last error on the SFTP layer
      */
-    function getLastSFTPError()
+    public function getLastSFTPError(): string
     {
         return count($this->sftp_errors) ? $this->sftp_errors[count($this->sftp_errors) - 1] : '';
     }
@@ -2818,27 +3145,210 @@ function getLastSFTPError()
      * Get supported SFTP versions
      *
      * @return array
-     * @access public
      */
-    function getSupportedVersions()
+    public function getSupportedVersions()
     {
-        $temp = array('version' => $this->version);
+        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+            return false;
+        }
+
+        if (!$this->partial_init) {
+            $this->partial_init_sftp_connection();
+        }
+
+        $temp = ['version' => $this->defaultVersion];
         if (isset($this->extensions['versions'])) {
             $temp['extensions'] = $this->extensions['versions'];
         }
         return $temp;
     }
 
+    /**
+     * Get supported SFTP extensions
+     *
+     * @return array
+     */
+    public function getSupportedExtensions()
+    {
+        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+            return false;
+        }
+
+        if (!$this->partial_init) {
+            $this->partial_init_sftp_connection();
+        }
+
+        return $this->extensions;
+    }
+
+    /**
+     * Get supported SFTP versions
+     *
+     * @return int|false
+     */
+    public function getNegotiatedVersion()
+    {
+        if (!$this->precheck()) {
+            return false;
+        }
+
+        return $this->version;
+    }
+
+    /**
+     * Set preferred version
+     *
+     * If you're preferred version isn't supported then the highest supported
+     * version of SFTP will be utilized. Set to null or false or int(0) to
+     * unset the preferred version
+     */
+    public function setPreferredVersion(int $version): void
+    {
+        $this->preferredVersion = $version;
+    }
+
     /**
      * Disconnect
      *
-     * @param int $reason
-     * @return bool
-     * @access private
+     * @return false
      */
-    function _disconnect($reason)
+    protected function disconnect_helper(int $reason): bool
     {
         $this->pwd = false;
-        parent::_disconnect($reason);
+        return parent::disconnect_helper($reason);
+    }
+
+    /**
+     * Enable Date Preservation
+     */
+    public function enableDatePreservation(): void
+    {
+        $this->preserveTime = true;
+    }
+
+    /**
+     * Disable Date Preservation
+     */
+    public function disableDatePreservation(): void
+    {
+        $this->preserveTime = false;
+    }
+
+    /**
+     * POSIX Rename
+     *
+     * Where rename() fails "if there already exists a file with the name specified by newpath"
+     * (draft-ietf-secsh-filexfer-02#section-6.5), posix_rename() overwrites the existing file in an atomic fashion.
+     * ie. "there is no observable instant in time where the name does not refer to either the old or the new file"
+     * (draft-ietf-secsh-filexfer-13#page-39).
+     */
+    public function posix_rename(string $oldname, string $newname): bool
+    {
+        if (!$this->precheck()) {
+            return false;
+        }
+
+        $oldname = $this->realpath($oldname);
+        $newname = $this->realpath($newname);
+        if ($oldname === false || $newname === false) {
+            return false;
+        }
+
+        if ($this->version >= 5) {
+            $packet = Strings::packSSH2('ssN', $oldname, $newname, 2); // 2 = SSH_FXP_RENAME_ATOMIC
+            $this->send_sftp_packet(PacketType::RENAME, $packet);
+        } elseif (isset($this->extensions['posix-rename@openssh.com']) && $this->extensions['posix-rename@openssh.com'] === '1') {
+            $packet = Strings::packSSH2('sss', 'posix-rename@openssh.com', $oldname, $newname);
+            $this->send_sftp_packet(PacketType::EXTENDED, $packet);
+        } else {
+            throw new RuntimeException(
+                "Extension 'posix-rename@openssh.com' is not supported by the server. " .
+                "Call getSupportedVersions() to see a list of supported extension"
+            );
+        }
+
+        $response = $this->get_sftp_packet();
+        if ($this->packet_type != PacketType::STATUS) {
+            throw new UnexpectedValueException(
+                'Expected NET_SFTP_STATUS. ' .
+                'Got packet type: ' . $this->packet_type
+            );
+        }
+
+        // if $status isn't SSH_FX_OK it's probably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
+        [$status] = Strings::unpackSSH2('N', $response);
+        if ($status != StatusCode::OK) {
+            $this->logError($response, $status);
+            return false;
+        }
+
+        // don't move the stat cache entry over since this operation could very well change the
+        // atime and mtime attributes
+        //$this->update_stat_cache($newname, $this->query_stat_cache($oldname));
+        $this->remove_from_stat_cache($oldname);
+        $this->remove_from_stat_cache($newname);
+
+        return true;
+    }
+
+    /**
+     * Returns general information about a file system.
+     *
+     * The function statvfs() returns information about a mounted filesystem.
+     * @see https://man7.org/linux/man-pages/man3/statvfs.3.html
+     *
+     * @return array{bsize: int, frsize: int, blocks: int, bfree: int, bavail: int, files: int, ffree: int, favail: int, fsid: int, flag: int, namemax: int}
+     */
+    public function statvfs(string $path): array|bool
+    {
+        if (!$this->precheck()) {
+            return false;
+        }
+
+        if (!isset($this->extensions['statvfs@openssh.com']) || $this->extensions['statvfs@openssh.com'] !== '2') {
+            throw new RuntimeException(
+                "Extension 'statvfs@openssh.com' is not supported by the server. " .
+                "Call getSupportedVersions() to see a list of supported extension"
+            );
+        }
+
+        $realpath = $this->realpath($path);
+        if ($realpath === false) {
+            return false;
+        }
+
+        $packet = Strings::packSSH2('ss', 'statvfs@openssh.com', $realpath);
+        $this->send_sftp_packet(PacketType::EXTENDED, $packet);
+
+        $response = $this->get_sftp_packet();
+        if ($this->packet_type !== PacketType::EXTENDED_REPLY) {
+            throw new UnexpectedValueException(
+                'Expected SSH_FXP_EXTENDED_REPLY. ' .
+                'Got packet type: ' . $this->packet_type
+            );
+        }
+
+        /**
+         * These requests return a SSH_FXP_STATUS reply on failure. On success they
+         * return the following SSH_FXP_EXTENDED_REPLY reply:
+         *
+         * uint32        id
+         * uint64        f_bsize     file system block size
+         * uint64        f_frsize     fundamental fs block size
+         * uint64        f_blocks     number of blocks (unit f_frsize)
+         * uint64        f_bfree      free blocks in file system
+         * uint64        f_bavail     free blocks for non-root
+         * uint64        f_files      total file inodes
+         * uint64        f_ffree      free file inodes
+         * uint64        f_favail     free file inodes for to non-root
+         * uint64        f_fsid       file system id
+         * uint64        f_flag       bit mask of f_flag values
+         * uint64        f_namemax    maximum filename length
+         */
+
+        return array_combine(
+            ['bsize', 'frsize', 'blocks', 'bfree', 'bavail', 'files', 'ffree', 'favail', 'fsid', 'flag', 'namemax'],
+            Strings::unpackSSH2('QQQQQQQQQQQ', $response)
+        );
     }
 }
diff --git a/phpseclib/Net/SFTP/Attribute.php b/phpseclib/Net/SFTP/Attribute.php
new file mode 100644
index 000000000..d83d5cc9b
--- /dev/null
+++ b/phpseclib/Net/SFTP/Attribute.php
@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Net\SFTP;
+
+/**
+ * http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-7.1
+ * the order, in this case, matters quite a lot - see \phpseclib3\Net\SFTP::_parseAttributes() to understand why
+ *
+ * @internal
+ */
+abstract class Attribute
+{
+    public const SIZE = 0x00000001;
+    public const UIDGID = 0x00000002;          // defined in SFTPv3, removed in SFTPv4+
+    public const OWNERGROUP = 0x00000080;      // defined in SFTPv4+
+    public const PERMISSIONS = 0x00000004;
+    public const ACCESSTIME = 0x00000008;
+    public const CREATETIME = 0x00000010;      // SFTPv4+
+    public const MODIFYTIME = 0x00000020;
+    public const ACL = 0x00000040;
+    public const SUBSECOND_TIMES = 0x00000100;
+    public const BITS = 0x00000200;            // SFTPv5+
+    public const ALLOCATION_SIZE = 0x00000400; // SFTPv6+
+    public const TEXT_HINT = 0x00000800;
+    public const MIME_TYPE = 0x00001000;
+    public const LINK_COUNT = 0x00002000;
+    public const UNTRANSLATED_NAME = 0x00004000;
+    public const CTIME = 0x00008000;
+    // 0x80000000 will yield a floating point on 32-bit systems and converting floating points to integers
+    // yields inconsistent behavior depending on how php is compiled.  so we left shift -1 (which, in
+    // two's compliment, consists of all 1 bits) by 31.  on 64-bit systems this'll yield 0xFFFFFFFF80000000.
+    // that's not a problem, however, and 'anded' and a 32-bit number, as all the leading 1 bits are ignored.
+    public const EXTENDED = PHP_INT_SIZE == 4 ? (-1 << 31) : 0x80000000;
+
+    /**
+     */
+    public static function getConstants(): array
+    {
+        $reflectionClass = new \ReflectionClass(static::class);
+        return $reflectionClass->getConstants();
+    }
+}
diff --git a/phpseclib/Net/SFTP/FileType.php b/phpseclib/Net/SFTP/FileType.php
new file mode 100644
index 000000000..f4b88e07d
--- /dev/null
+++ b/phpseclib/Net/SFTP/FileType.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Net\SFTP;
+
+/**
+ * http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-5.2
+ * see \phpseclib3\Net\SFTP::_parseLongname() for an explanation
+ *
+ * @internal
+ */
+abstract class FileType
+{
+    public const REGULAR = 1;
+    public const DIRECTORY = 2;
+    public const SYMLINK = 3;
+    public const SPECIAL = 4;
+    public const UNKNOWN = 5;
+    // the following types were first defined for use in SFTPv5+
+    // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-05#section-5.2
+    public const SOCKET = 6;
+    public const CHAR_DEVICE = 7;
+    public const BLOCK_DEVICE = 8;
+    public const FIFO = 9;
+}
diff --git a/phpseclib/Net/SFTP/OpenFlag.php b/phpseclib/Net/SFTP/OpenFlag.php
new file mode 100644
index 000000000..3317aaa1c
--- /dev/null
+++ b/phpseclib/Net/SFTP/OpenFlag.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Net\SFTP;
+
+/**
+ * http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.3
+ * the flag definitions change somewhat in SFTPv5+.  if SFTPv5+ support is added to this library, maybe name
+ * the array for that $this->open5_flags and similarly alter the constant names.
+ *
+ * @internal
+ */
+abstract class OpenFlag
+{
+    public const READ = 0x00000001;
+    public const WRITE = 0x00000002;
+    public const APPEND = 0x00000004;
+    public const CREATE = 0x00000008;
+    public const TRUNCATE = 0x00000010;
+    public const EXCL = 0x00000020;
+    public const TEXT = 0x00000040; // defined in SFTPv4
+}
diff --git a/phpseclib/Net/SFTP/OpenFlag5.php b/phpseclib/Net/SFTP/OpenFlag5.php
new file mode 100644
index 000000000..0be44156b
--- /dev/null
+++ b/phpseclib/Net/SFTP/OpenFlag5.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Net\SFTP;
+
+/**
+ * SFTPv5+ changed the flags up: https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-8.1.1.3
+ *
+ * @internal
+ */
+abstract class OpenFlag5
+{
+    // when SSH_FXF_ACCESS_DISPOSITION is a 3 bit field that controls how the file is opened
+    public const CREATE_NEW = 0x00000000;
+    public const CREATE_TRUNCATE = 0x00000001;
+    public const OPEN_EXISTING = 0x00000002;
+    public const OPEN_OR_CREATE = 0x00000003;
+    public const TRUNCATE_EXISTING = 0x00000004;
+    // the rest of the flags are not supported
+    public const APPEND_DATA = 0x00000008; // "the offset field of SS_FXP_WRITE requests is ignored"
+    public const APPEND_DATA_ATOMIC = 0x00000010;
+    public const TEXT_MODE = 0x00000020;
+    public const BLOCK_READ = 0x00000040;
+    public const BLOCK_WRITE = 0x00000080;
+    public const BLOCK_DELETE = 0x00000100;
+    public const BLOCK_ADVISORY = 0x00000200;
+    public const NOFOLLOW = 0x00000400;
+    public const DELETE_ON_CLOSE = 0x00000800;
+    public const ACCESS_AUDIT_ALARM_INFO = 0x00001000;
+    public const ACCESS_BACKUP = 0x00002000;
+    public const BACKUP_STREAM = 0x00004000;
+    public const OVERRIDE_OWNER = 0x00008000;
+}
diff --git a/phpseclib/Net/SFTP/PacketType.php b/phpseclib/Net/SFTP/PacketType.php
new file mode 100644
index 000000000..75f875a60
--- /dev/null
+++ b/phpseclib/Net/SFTP/PacketType.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Net\SFTP;
+
+use phpseclib3\Common\ConstantUtilityTrait;
+
+/**
+ * @internal
+ */
+abstract class PacketType
+{
+    use ConstantUtilityTrait;
+
+    public const INIT = 1;
+    public const VERSION = 2;
+    public const OPEN = 3;
+    public const CLOSE = 4;
+    public const READ = 5;
+    public const WRITE = 6;
+    public const LSTAT = 7;
+    public const SETSTAT = 9;
+    public const FSETSTAT = 10;
+    public const OPENDIR = 11;
+    public const READDIR = 12;
+    public const REMOVE = 13;
+    public const MKDIR = 14;
+    public const RMDIR = 15;
+    public const REALPATH = 16;
+    public const STAT = 17;
+    public const RENAME = 18;
+    public const READLINK = 19;
+    public const SYMLINK = 20;
+    public const LINK = 21;
+
+    public const STATUS = 101;
+    public const HANDLE = 102;
+    public const DATA = 103;
+    public const NAME = 104;
+    public const ATTRS = 105;
+
+    public const EXTENDED = 200;
+    public const EXTENDED_REPLY = 201;
+}
diff --git a/phpseclib/Net/SFTP/StatusCode.php b/phpseclib/Net/SFTP/StatusCode.php
new file mode 100644
index 000000000..7ddca0912
--- /dev/null
+++ b/phpseclib/Net/SFTP/StatusCode.php
@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Net\SFTP;
+
+use phpseclib3\Common\ConstantUtilityTrait;
+
+/**
+ * @internal
+ */
+abstract class StatusCode
+{
+    use ConstantUtilityTrait;
+
+    public const OK = 0;
+    public const EOF = 1;
+    public const NO_SUCH_FILE = 2;
+    public const PERMISSION_DENIED = 3;
+    public const FAILURE = 4;
+    public const BAD_MESSAGE = 5;
+    public const NO_CONNECTION = 6;
+    public const CONNECTION_LOST = 7;
+    public const OP_UNSUPPORTED = 8;
+    public const INVALID_HANDLE = 9;
+    public const NO_SUCH_PATH = 10;
+    public const FILE_ALREADY_EXISTS = 11;
+    public const WRITE_PROTECT = 12;
+    public const NO_MEDIA = 13;
+    public const NO_SPACE_ON_FILESYSTEM = 14;
+    public const QUOTA_EXCEEDED = 15;
+    public const UNKNOWN_PRINCIPAL = 16;
+    public const LOCK_CONFLICT = 17;
+    public const DIR_NOT_EMPTY = 18;
+    public const NOT_A_DIRECTORY = 19;
+    public const INVALID_FILENAME = 20;
+    public const LINK_LOOP = 21;
+    public const CANNOT_DELETE = 22;
+    public const INVALID_PARAMETER = 23;
+    public const FILE_IS_A_DIRECTORY = 24;
+    public const BYTE_RANGE_LOCK_CONFLICT = 25;
+    public const BYTE_RANGE_LOCK_REFUSED = 26;
+    public const DELETE_PENDING = 27;
+    public const FILE_CORRUPT = 28;
+    public const OWNER_INVALID = 29;
+    public const GROUP_INVALID = 30;
+    public const NO_MATCHING_BYTE_RANGE_LOCK = 31;
+}
diff --git a/phpseclib/Net/SFTP/Stream.php b/phpseclib/Net/SFTP/Stream.php
index d19d08b83..8dbcfe3de 100644
--- a/phpseclib/Net/SFTP/Stream.php
+++ b/phpseclib/Net/SFTP/Stream.php
@@ -7,26 +7,25 @@
  *
  * PHP version 5
  *
- * @category  Net
- * @package   SFTP
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2013 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\Net\SFTP;
+declare(strict_types=1);
 
-use phpseclib\Crypt\RSA;
-use phpseclib\Net\SFTP;
-use phpseclib\Net\SSH2;
+namespace phpseclib3\Net\SFTP;
+
+use phpseclib3\Crypt\Common\PrivateKey;
+use phpseclib3\Net\SFTP;
+use phpseclib3\Net\SSH2;
+use phpseclib3\Net\SSH2\MessageType as SSH2MessageType;
 
 /**
  * SFTP Stream Wrapper
  *
- * @package SFTP
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class Stream
 {
@@ -34,93 +33,67 @@ class Stream
      * SFTP instances
      *
      * Rather than re-create the connection we re-use instances if possible
-     *
-     * @var array
      */
-    static $instances;
+    public static array $instances;
 
     /**
      * SFTP instance
-     *
-     * @var object
-     * @access private
      */
-    var $sftp;
+    private SFTP $sftp;
 
     /**
      * Path
-     *
-     * @var string
-     * @access private
      */
-    var $path;
+    private string $path;
 
     /**
      * Mode
-     *
-     * @var string
-     * @access private
      */
-    var $mode;
+    private string $mode;
 
     /**
      * Position
-     *
-     * @var int
-     * @access private
      */
-    var $pos;
+    private int $pos;
 
     /**
      * Size
-     *
-     * @var int
-     * @access private
      */
-    var $size;
+    private int|false $size;
 
     /**
      * Directory entries
-     *
-     * @var array
-     * @access private
      */
-    var $entries;
+    private array $entries;
 
     /**
      * EOF flag
-     *
-     * @var bool
-     * @access private
      */
-    var $eof;
+    private bool $eof;
 
     /**
      * Context resource
      *
-     * Technically this needs to be publically accessible so PHP can set it directly
+     * Technically this needs to be publicly accessible so PHP can set it directly
      *
      * @var resource
-     * @access public
      */
-    var $context;
+    public $context;
 
     /**
      * Notification callback function
      *
      * @var callable
-     * @access public
      */
-    var $notification;
+    private $notification;
 
     /**
      * Registers this class as a URL wrapper.
      *
      * @param string $protocol The wrapper name to be registered.
      * @return bool True on success, false otherwise.
-     * @access public
      */
-    static function register($protocol = 'sftp')
+    public static function register(string $protocol = 'sftp'): bool
     {
         if (in_array($protocol, stream_get_wrappers(), true)) {
             return false;
@@ -130,10 +103,8 @@ static function register($protocol = 'sftp')
 
     /**
      * The Constructor
-     *
-     * @access public
      */
-    function __construct()
+    public function __construct()
     {
         if (defined('NET_SFTP_STREAM_LOGGING')) {
             echo "__construct()\r\n";
@@ -146,25 +117,31 @@ function __construct()
      * Extract a path from a URI and actually connect to an SSH server if appropriate
      *
      * If "notification" is set as a context parameter the message code for successful login is
-     * NET_SSH2_MSG_USERAUTH_SUCCESS. For a failed login it's NET_SSH2_MSG_USERAUTH_FAILURE.
+     * SSHMsg::USERAUTH_SUCCESS. For a failed login it's SSHMsg::USERAUTH_FAILURE.
      *
-     * @param string $path
      * @return string
-     * @access private
      */
-    function _parse_path($path)
+    protected function parse_path(string $path)
     {
         $orig = $path;
-        extract(parse_url($path) + array('port' => 22));
+        $url = parse_url($path) + ['port' => 22];
+
+        $keys = ['scheme', 'host', 'port', 'user', 'pass', 'path', 'query', 'fragment'];
+        foreach ($keys as $key) {
+            if (isset($url[$key])) {
+                $$key = $url[$key];
+            }
+        }
+
         if (isset($query)) {
-            $path.= '?' . $query;
+            $path .= '?' . $query;
         } elseif (preg_match('/(\?|\?#)$/', $orig)) {
-            $path.= '?';
+            $path .= '?';
         }
         if (isset($fragment)) {
-            $path.= '#' . $fragment;
-        } elseif ($orig[strlen($orig) - 1] == '#') {
-            $path.= '#';
+            $path .= '#' . $fragment;
+        } elseif ($orig[-1] == '#') {
+            $path .= '#';
         }
 
         if (!isset($host)) {
@@ -180,7 +157,7 @@ function _parse_path($path)
 
         if (preg_match('/^{[a-z0-9]+}$/i', $host)) {
             $host = SSH2::getConnectionByResourceId($host);
-            if ($host === false) {
+            if ($host === null) {
                 return false;
             }
             $this->sftp = $host;
@@ -204,7 +181,7 @@ function _parse_path($path)
             if (isset($context[$scheme]['password'])) {
                 $pass = $context[$scheme]['password'];
             }
-            if (isset($context[$scheme]['privkey']) && $context[$scheme]['privkey'] instanceof RSA) {
+            if (isset($context[$scheme]['privkey']) && $context[$scheme]['privkey'] instanceof PrivateKey) {
                 $pass = $context[$scheme]['privkey'];
             }
 
@@ -212,7 +189,7 @@ function _parse_path($path)
                 return false;
             }
 
-            // casting $pass to a string is necessary in the event that it's a \phpseclib\Crypt\RSA object
+            // casting $pass to a string is necessary in the event that it's a \phpseclib3\Crypt\RSA object
             if (isset(self::$instances[$host][$port][$user][(string) $pass])) {
                 $this->sftp = self::$instances[$host][$port][$user][(string) $pass];
             } else {
@@ -231,10 +208,10 @@ function _parse_path($path)
                     call_user_func($this->notification, STREAM_NOTIFY_CONNECT, STREAM_NOTIFY_SEVERITY_INFO, '', 0, 0, 0);
                     call_user_func($this->notification, STREAM_NOTIFY_AUTH_REQUIRED, STREAM_NOTIFY_SEVERITY_INFO, '', 0, 0, 0);
                     if (!$this->sftp->login($user, $pass)) {
-                        call_user_func($this->notification, STREAM_NOTIFY_AUTH_RESULT, STREAM_NOTIFY_SEVERITY_ERR, 'Login Failure', NET_SSH2_MSG_USERAUTH_FAILURE, 0, 0);
+                        call_user_func($this->notification, STREAM_NOTIFY_AUTH_RESULT, STREAM_NOTIFY_SEVERITY_ERR, 'Login Failure', SSH2MessageType::USERAUTH_FAILURE, 0, 0);
                         return false;
                     }
-                    call_user_func($this->notification, STREAM_NOTIFY_AUTH_RESULT, STREAM_NOTIFY_SEVERITY_INFO, 'Login Success', NET_SSH2_MSG_USERAUTH_SUCCESS, 0, 0);
+                    call_user_func($this->notification, STREAM_NOTIFY_AUTH_RESULT, STREAM_NOTIFY_SEVERITY_INFO, 'Login Success', SSH2MessageType::USERAUTH_SUCCESS, 0, 0);
                 } else {
                     if (!$this->sftp->login($user, $pass)) {
                         return false;
@@ -249,24 +226,17 @@ function _parse_path($path)
 
     /**
      * Opens file or URL
-     *
-     * @param string $path
-     * @param string $mode
-     * @param int $options
-     * @param string $opened_path
-     * @return bool
-     * @access public
-     */
-    function _stream_open($path, $mode, $options, &$opened_path)
+     */
+    private function _stream_open(string $path, string $mode): bool
     {
-        $path = $this->_parse_path($path);
+        $path = $this->parse_path($path);
 
         if ($path === false) {
             return false;
         }
         $this->path = $path;
 
-        $this->size = $this->sftp->size($path);
+        $this->size = $this->sftp->filesize($path);
         $this->mode = preg_replace('#[bt]$#', '', $mode);
         $this->eof = false;
 
@@ -294,12 +264,8 @@ function _stream_open($path, $mode, $options, &$opened_path)
 
     /**
      * Read from stream
-     *
-     * @param int $count
-     * @return mixed
-     * @access public
      */
-    function _stream_read($count)
+    private function _stream_read(int $count)
     {
         switch ($this->mode) {
             case 'w':
@@ -318,7 +284,7 @@ function _stream_read($count)
         $result = $this->sftp->get($this->path, false, $this->pos, $count);
         if (isset($this->notification) && is_callable($this->notification)) {
             if ($result === false) {
-                call_user_func($this->notification, STREAM_NOTIFY_FAILURE, STREAM_NOTIFY_SEVERITY_ERR, $this->sftp->getLastSFTPError(), NET_SFTP_OPEN, 0, 0);
+                call_user_func($this->notification, STREAM_NOTIFY_FAILURE, STREAM_NOTIFY_SEVERITY_ERR, $this->sftp->getLastSFTPError(), PacketType::OPEN, 0, 0);
                 return 0;
             }
             // seems that PHP calls stream_read in 8k chunks
@@ -329,7 +295,7 @@ function _stream_read($count)
             $this->eof = true;
             return false;
         }
-        $this->pos+= strlen($result);
+        $this->pos += strlen($result);
 
         return $result;
     }
@@ -337,11 +303,9 @@ function _stream_read($count)
     /**
      * Write to stream
      *
-     * @param string $data
-     * @return mixed
-     * @access public
+     * @return int|false
      */
-    function _stream_write($data)
+    private function _stream_write(string $data)
     {
         switch ($this->mode) {
             case 'r':
@@ -351,7 +315,7 @@ function _stream_write($data)
         $result = $this->sftp->put($this->path, $data, SFTP::SOURCE_STRING, $this->pos);
         if (isset($this->notification) && is_callable($this->notification)) {
             if (!$result) {
-                call_user_func($this->notification, STREAM_NOTIFY_FAILURE, STREAM_NOTIFY_SEVERITY_ERR, $this->sftp->getLastSFTPError(), NET_SFTP_OPEN, 0, 0);
+                call_user_func($this->notification, STREAM_NOTIFY_FAILURE, STREAM_NOTIFY_SEVERITY_ERR, $this->sftp->getLastSFTPError(), PacketType::OPEN, 0, 0);
                 return 0;
             }
             // seems that PHP splits up strings into 8k blocks before calling stream_write
@@ -361,7 +325,7 @@ function _stream_write($data)
         if ($result === false) {
             return false;
         }
-        $this->pos+= strlen($data);
+        $this->pos += strlen($data);
         if ($this->pos > $this->size) {
             $this->size = $this->pos;
         }
@@ -371,11 +335,8 @@ function _stream_write($data)
 
     /**
      * Retrieve the current position of a stream
-     *
-     * @return int
-     * @access public
      */
-    function _stream_tell()
+    private function _stream_tell(): int
     {
         return $this->pos;
     }
@@ -389,36 +350,28 @@ function _stream_tell()
      * Only fgets / fread, however, results in feof() returning true. do fputs($fp, 'aaa') on a blank file and feof()
      * will return false. do fread($fp, 1) and feof() will then return true. do fseek($fp, 10) on ablank file and feof()
      * will return false. do fread($fp, 1) and feof() will then return true.
-     *
-     * @return bool
-     * @access public
      */
-    function _stream_eof()
+    private function _stream_eof(): bool
     {
         return $this->eof;
     }
 
     /**
      * Seeks to specific location in a stream
-     *
-     * @param int $offset
-     * @param int $whence
-     * @return bool
-     * @access public
      */
-    function _stream_seek($offset, $whence)
+    private function _stream_seek(int $offset, int $whence): bool
     {
         switch ($whence) {
             case SEEK_SET:
-                if ($offset >= $this->size || $offset < 0) {
+                if ($offset < 0) {
                     return false;
                 }
                 break;
             case SEEK_CUR:
-                $offset+= $this->pos;
+                $offset += $this->pos;
                 break;
             case SEEK_END:
-                $offset+= $this->size;
+                $offset += $this->size;
         }
 
         $this->pos = $offset;
@@ -428,16 +381,10 @@ function _stream_seek($offset, $whence)
 
     /**
      * Change stream options
-     *
-     * @param string $path
-     * @param int $option
-     * @param mixed $var
-     * @return bool
-     * @access public
      */
-    function _stream_metadata($path, $option, $var)
+    private function _stream_metadata(string $path, int $option, $var): bool
     {
-        $path = $this->_parse_path($path);
+        $path = $this->parse_path($path);
         if ($path === false) {
             return false;
         }
@@ -447,7 +394,9 @@ function _stream_metadata($path, $option, $var)
         //     and https://github.com/php/php-src/blob/master/main/php_streams.h#L592
         switch ($option) {
             case 1: // PHP_STREAM_META_TOUCH
-                return $this->sftp->touch($path, $var[0], $var[1]);
+                $time = $var[0] ?? null;
+                $atime = $var[1] ?? null;
+                return $this->sftp->touch($path, $time, $atime);
             case 2: // PHP_STREAM_OWNER_NAME
             case 3: // PHP_STREAM_GROUP_NAME
                 return false;
@@ -463,23 +412,17 @@ function _stream_metadata($path, $option, $var)
     /**
      * Retrieve the underlaying resource
      *
-     * @param int $cast_as
      * @return resource
-     * @access public
      */
-    function _stream_cast($cast_as)
+    private function _stream_cast(int $cast_as)
     {
         return $this->sftp->fsock;
     }
 
     /**
      * Advisory file locking
-     *
-     * @param int $operation
-     * @return bool
-     * @access public
      */
-    function _stream_lock($operation)
+    private function _stream_lock(int $operation): bool
     {
         return false;
     }
@@ -488,15 +431,10 @@ function _stream_lock($operation)
      * Renames a file or directory
      *
      * Attempts to rename oldname to newname, moving it between directories if necessary.
-     * If newname exists, it will be overwritten.  This is a departure from what \phpseclib\Net\SFTP
+     * If newname exists, it will be overwritten.  This is a departure from what \phpseclib3\Net\SFTP
      * does.
-     *
-     * @param string $path_from
-     * @param string $path_to
-     * @return bool
-     * @access public
      */
-    function _rename($path_from, $path_to)
+    private function _rename(string $path_from, string $path_to): bool
     {
         $path1 = parse_url($path_from);
         $path2 = parse_url($path_to);
@@ -505,7 +443,7 @@ function _rename($path_from, $path_to)
             return false;
         }
 
-        $path_from = $this->_parse_path($path_from);
+        $path_from = $this->parse_path($path_from);
         $path_to = parse_url($path_to);
         if ($path_from === false) {
             return false;
@@ -542,15 +480,10 @@ function _rename($path_from, $path_to)
      *                string     filename
      *                string     longname
      *                ATTRS      attrs
-     *
-     * @param string $path
-     * @param int $options
-     * @return bool
-     * @access public
      */
-    function _dir_opendir($path, $options)
+    private function _dir_opendir(string $path, int $options): bool
     {
-        $path = $this->_parse_path($path);
+        $path = $this->parse_path($path);
         if ($path === false) {
             return false;
         }
@@ -561,11 +494,8 @@ function _dir_opendir($path, $options)
 
     /**
      * Read entry from directory handle
-     *
-     * @return mixed
-     * @access public
      */
-    function _dir_readdir()
+    private function _dir_readdir()
     {
         if (isset($this->entries[$this->pos])) {
             return $this->entries[$this->pos++];
@@ -575,11 +505,8 @@ function _dir_readdir()
 
     /**
      * Rewind directory handle
-     *
-     * @return bool
-     * @access public
      */
-    function _dir_rewinddir()
+    private function _dir_rewinddir(): bool
     {
         $this->pos = 0;
         return true;
@@ -587,11 +514,8 @@ function _dir_rewinddir()
 
     /**
      * Close directory handle
-     *
-     * @return bool
-     * @access public
      */
-    function _dir_closedir()
+    private function _dir_closedir(): bool
     {
         return true;
     }
@@ -600,16 +524,10 @@ function _dir_closedir()
      * Create a directory
      *
      * Only valid $options is STREAM_MKDIR_RECURSIVE
-     *
-     * @param string $path
-     * @param int $mode
-     * @param int $options
-     * @return bool
-     * @access public
      */
-    function _mkdir($path, $mode, $options)
+    private function _mkdir(string $path, int $mode, int $options): bool
     {
-        $path = $this->_parse_path($path);
+        $path = $this->parse_path($path);
         if ($path === false) {
             return false;
         }
@@ -624,16 +542,10 @@ function _mkdir($path, $mode, $options)
      * <http://php.net/rmdir>  does not have a $recursive parameter as mkdir() does so I don't know how
      * STREAM_MKDIR_RECURSIVE is supposed to be set. Also, when I try it out with rmdir() I get 8 as
      * $options. What does 8 correspond to?
-     *
-     * @param string $path
-     * @param int $mode
-     * @param int $options
-     * @return bool
-     * @access public
      */
-    function _rmdir($path, $options)
+    private function _rmdir(string $path, int $options): bool
     {
-        $path = $this->_parse_path($path);
+        $path = $this->parse_path($path);
         if ($path === false) {
             return false;
         }
@@ -644,23 +556,17 @@ function _rmdir($path, $options)
     /**
      * Flushes the output
      *
-     * See <http://php.net/fflush>. Always returns true because \phpseclib\Net\SFTP doesn't cache stuff before writing
-     *
-     * @return bool
-     * @access public
+     * See <http://php.net/fflush>. Always returns true because \phpseclib3\Net\SFTP doesn't cache stuff before writing
      */
-    function _stream_flush()
+    private function _stream_flush(): bool
     {
         return true;
     }
 
     /**
      * Retrieve information about a file resource
-     *
-     * @return mixed
-     * @access public
      */
-    function _stream_stat()
+    private function _stream_stat(): bool
     {
         $results = $this->sftp->stat($this->path);
         if ($results === false) {
@@ -671,14 +577,10 @@ function _stream_stat()
 
     /**
      * Delete a file
-     *
-     * @param string $path
-     * @return bool
-     * @access public
      */
-    function _unlink($path)
+    private function _unlink(string $path): bool
     {
-        $path = $this->_parse_path($path);
+        $path = $this->parse_path($path);
         if ($path === false) {
             return false;
         }
@@ -689,18 +591,13 @@ function _unlink($path)
     /**
      * Retrieve information about a file
      *
-     * Ignores the STREAM_URL_STAT_QUIET flag because the entirety of \phpseclib\Net\SFTP\Stream is quiet by default
+     * Ignores the STREAM_URL_STAT_QUIET flag because the entirety of \phpseclib3\Net\SFTP\Stream is quiet by default
      * might be worthwhile to reconstruct bits 12-16 (ie. the file type) if mode doesn't have them but we'll
      * cross that bridge when and if it's reached
-     *
-     * @param string $path
-     * @param int $flags
-     * @return mixed
-     * @access public
      */
-    function _url_stat($path, $flags)
+    private function _url_stat(string $path, int $flags): bool
     {
-        $path = $this->_parse_path($path);
+        $path = $this->parse_path($path);
         if ($path === false) {
             return false;
         }
@@ -715,12 +612,8 @@ function _url_stat($path, $flags)
 
     /**
      * Truncate stream
-     *
-     * @param int $new_size
-     * @return bool
-     * @access public
      */
-    function _stream_truncate($new_size)
+    private function _stream_truncate(int $new_size): bool
     {
         if (!$this->sftp->truncate($this->path, $new_size)) {
             return false;
@@ -736,25 +629,17 @@ function _stream_truncate($new_size)
      * Change stream options
      *
      * STREAM_OPTION_WRITE_BUFFER isn't supported for the same reason stream_flush isn't.
-     * The other two aren't supported because of limitations in \phpseclib\Net\SFTP.
-     *
-     * @param int $option
-     * @param int $arg1
-     * @param int $arg2
-     * @return bool
-     * @access public
+     * The other two aren't supported because of limitations in \phpseclib3\Net\SFTP.
      */
-    function _stream_set_option($option, $arg1, $arg2)
+    private function _stream_set_option(int $option, int $arg1, int $arg2): bool
     {
         return false;
     }
 
     /**
      * Close an resource
-     *
-     * @access public
      */
-    function _stream_close()
+    private function _stream_close(): void
     {
     }
 
@@ -767,13 +652,8 @@ function _stream_close()
      *
      * If NET_SFTP_STREAM_LOGGING is defined all calls will be output on the screen and then (regardless of whether or not
      * NET_SFTP_STREAM_LOGGING is enabled) the parameters will be passed through to the appropriate method.
-     *
-     * @param string
-     * @param array
-     * @return mixed
-     * @access public
      */
-    function __call($name, $arguments)
+    public function __call(string $name, array $arguments)
     {
         if (defined('NET_SFTP_STREAM_LOGGING')) {
             echo $name . '(';
@@ -790,6 +670,6 @@ function __call($name, $arguments)
         if (!method_exists($this, $name)) {
             return false;
         }
-        return call_user_func_array(array($this, $name), $arguments);
+        return $this->$name(...$arguments);
     }
 }
diff --git a/phpseclib/Net/SSH1.php b/phpseclib/Net/SSH1.php
deleted file mode 100644
index b0903386a..000000000
--- a/phpseclib/Net/SSH1.php
+++ /dev/null
@@ -1,1602 +0,0 @@
-<?php
-
-/**
- * Pure-PHP implementation of SSHv1.
- *
- * PHP version 5
- *
- * Here's a short example of how to use this library:
- * <code>
- * <?php
- *    include 'vendor/autoload.php';
- *
- *    $ssh = new \phpseclib\Net\SSH1('www.domain.tld');
- *    if (!$ssh->login('username', 'password')) {
- *        exit('Login Failed');
- *    }
- *
- *    echo $ssh->exec('ls -la');
- * ?>
- * </code>
- *
- * Here's another short example:
- * <code>
- * <?php
- *    include 'vendor/autoload.php';
- *
- *    $ssh = new \phpseclib\Net\SSH1('www.domain.tld');
- *    if (!$ssh->login('username', 'password')) {
- *        exit('Login Failed');
- *    }
- *
- *    echo $ssh->read('username@username:~$');
- *    $ssh->write("ls -la\n");
- *    echo $ssh->read('username@username:~$');
- * ?>
- * </code>
- *
- * More information on the SSHv1 specification can be found by reading
- * {@link http://www.snailbook.com/docs/protocol-1.5.txt protocol-1.5.txt}.
- *
- * @category  Net
- * @package   SSH1
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2007 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Net;
-
-use phpseclib\Crypt\DES;
-use phpseclib\Crypt\Random;
-use phpseclib\Crypt\TripleDES;
-use phpseclib\Math\BigInteger;
-
-/**
- * Pure-PHP implementation of SSHv1.
- *
- * @package SSH1
- * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
- */
-class SSH1
-{
-    /**#@+
-     * Encryption Methods
-     *
-     * @see \phpseclib\Net\SSH1::getSupportedCiphers()
-     * @access public
-     */
-    /**
-     * No encryption
-     *
-     * Not supported.
-     */
-    const CIPHER_NONE = 0;
-    /**
-     * IDEA in CFB mode
-     *
-     * Not supported.
-     */
-    const CIPHER_IDEA = 1;
-    /**
-     * DES in CBC mode
-     */
-    const CIPHER_DES = 2;
-    /**
-     * Triple-DES in CBC mode
-     *
-     * All implementations are required to support this
-     */
-    const CIPHER_3DES = 3;
-    /**
-     * TRI's Simple Stream encryption CBC
-     *
-     * Not supported nor is it defined in the official SSH1 specs.  OpenSSH, however, does define it (see cipher.h),
-     * although it doesn't use it (see cipher.c)
-     */
-    const CIPHER_BROKEN_TSS = 4;
-    /**
-     * RC4
-     *
-     * Not supported.
-     *
-     * @internal According to the SSH1 specs:
-     *
-     *        "The first 16 bytes of the session key are used as the key for
-     *         the server to client direction.  The remaining 16 bytes are used
-     *         as the key for the client to server direction.  This gives
-     *         independent 128-bit keys for each direction."
-     *
-     *     This library currently only supports encryption when the same key is being used for both directions.  This is
-     *     because there's only one $crypto object.  Two could be added ($encrypt and $decrypt, perhaps).
-     */
-    const CIPHER_RC4 = 5;
-    /**
-     * Blowfish
-     *
-     * Not supported nor is it defined in the official SSH1 specs.  OpenSSH, however, defines it (see cipher.h) and
-     * uses it (see cipher.c)
-     */
-    const CIPHER_BLOWFISH = 6;
-    /**#@-*/
-
-    /**#@+
-     * Authentication Methods
-     *
-     * @see \phpseclib\Net\SSH1::getSupportedAuthentications()
-     * @access public
-    */
-    /**
-     * .rhosts or /etc/hosts.equiv
-     */
-    const AUTH_RHOSTS = 1;
-    /**
-     * pure RSA authentication
-     */
-    const AUTH_RSA = 2;
-    /**
-     * password authentication
-     *
-     * This is the only method that is supported by this library.
-     */
-    const AUTH_PASSWORD = 3;
-    /**
-     * .rhosts with RSA host authentication
-     */
-    const AUTH_RHOSTS_RSA = 4;
-    /**#@-*/
-
-    /**#@+
-     * Terminal Modes
-     *
-     * @link http://3sp.com/content/developer/maverick-net/docs/Maverick.SSH.PseudoTerminalModesMembers.html
-     * @access private
-    */
-    const TTY_OP_END = 0;
-    /**#@-*/
-
-    /**
-     * The Response Type
-     *
-     * @see \phpseclib\Net\SSH1::_get_binary_packet()
-     * @access private
-     */
-    const RESPONSE_TYPE = 1;
-
-    /**
-     * The Response Data
-     *
-     * @see \phpseclib\Net\SSH1::_get_binary_packet()
-     * @access private
-     */
-    const RESPONSE_DATA = 2;
-
-    /**#@+
-     * Execution Bitmap Masks
-     *
-     * @see \phpseclib\Net\SSH1::bitmap
-     * @access private
-    */
-    const MASK_CONSTRUCTOR = 0x00000001;
-    const MASK_CONNECTED   = 0x00000002;
-    const MASK_LOGIN       = 0x00000004;
-    const MASK_SHELL       = 0x00000008;
-    /**#@-*/
-
-    /**#@+
-     * @access public
-     * @see \phpseclib\Net\SSH1::getLog()
-    */
-    /**
-     * Returns the message numbers
-     */
-    const LOG_SIMPLE = 1;
-    /**
-     * Returns the message content
-     */
-    const LOG_COMPLEX = 2;
-    /**
-     * Outputs the content real-time
-     */
-    const LOG_REALTIME = 3;
-    /**
-     * Dumps the content real-time to a file
-     */
-    const LOG_REALTIME_FILE = 4;
-    /**#@-*/
-
-    /**#@+
-     * @access public
-     * @see \phpseclib\Net\SSH1::read()
-    */
-    /**
-     * Returns when a string matching $expect exactly is found
-     */
-    const READ_SIMPLE = 1;
-    /**
-     * Returns when a string matching the regular expression $expect is found
-     */
-    const READ_REGEX = 2;
-    /**#@-*/
-
-    /**
-     * The SSH identifier
-     *
-     * @var string
-     * @access private
-     */
-    var $identifier = 'SSH-1.5-phpseclib';
-
-    /**
-     * The Socket Object
-     *
-     * @var object
-     * @access private
-     */
-    var $fsock;
-
-    /**
-     * The cryptography object
-     *
-     * @var object
-     * @access private
-     */
-    var $crypto = false;
-
-    /**
-     * Execution Bitmap
-     *
-     * The bits that are set represent functions that have been called already.  This is used to determine
-     * if a requisite function has been successfully executed.  If not, an error should be thrown.
-     *
-     * @var int
-     * @access private
-     */
-    var $bitmap = 0;
-
-    /**
-     * The Server Key Public Exponent
-     *
-     * Logged for debug purposes
-     *
-     * @see self::getServerKeyPublicExponent()
-     * @var string
-     * @access private
-     */
-    var $server_key_public_exponent;
-
-    /**
-     * The Server Key Public Modulus
-     *
-     * Logged for debug purposes
-     *
-     * @see self::getServerKeyPublicModulus()
-     * @var string
-     * @access private
-     */
-    var $server_key_public_modulus;
-
-    /**
-     * The Host Key Public Exponent
-     *
-     * Logged for debug purposes
-     *
-     * @see self::getHostKeyPublicExponent()
-     * @var string
-     * @access private
-     */
-    var $host_key_public_exponent;
-
-    /**
-     * The Host Key Public Modulus
-     *
-     * Logged for debug purposes
-     *
-     * @see self::getHostKeyPublicModulus()
-     * @var string
-     * @access private
-     */
-    var $host_key_public_modulus;
-
-    /**
-     * Supported Ciphers
-     *
-     * Logged for debug purposes
-     *
-     * @see self::getSupportedCiphers()
-     * @var array
-     * @access private
-     */
-    var $supported_ciphers = array(
-        self::CIPHER_NONE       => 'No encryption',
-        self::CIPHER_IDEA       => 'IDEA in CFB mode',
-        self::CIPHER_DES        => 'DES in CBC mode',
-        self::CIPHER_3DES       => 'Triple-DES in CBC mode',
-        self::CIPHER_BROKEN_TSS => 'TRI\'s Simple Stream encryption CBC',
-        self::CIPHER_RC4        => 'RC4',
-        self::CIPHER_BLOWFISH   => 'Blowfish'
-    );
-
-    /**
-     * Supported Authentications
-     *
-     * Logged for debug purposes
-     *
-     * @see self::getSupportedAuthentications()
-     * @var array
-     * @access private
-     */
-    var $supported_authentications = array(
-        self::AUTH_RHOSTS     => '.rhosts or /etc/hosts.equiv',
-        self::AUTH_RSA        => 'pure RSA authentication',
-        self::AUTH_PASSWORD   => 'password authentication',
-        self::AUTH_RHOSTS_RSA => '.rhosts with RSA host authentication'
-    );
-
-    /**
-     * Server Identification
-     *
-     * @see self::getServerIdentification()
-     * @var string
-     * @access private
-     */
-    var $server_identification = '';
-
-    /**
-     * Protocol Flags
-     *
-     * @see self::__construct()
-     * @var array
-     * @access private
-     */
-    var $protocol_flags = array();
-
-    /**
-     * Protocol Flag Log
-     *
-     * @see self::getLog()
-     * @var array
-     * @access private
-     */
-    var $protocol_flag_log = array();
-
-    /**
-     * Message Log
-     *
-     * @see self::getLog()
-     * @var array
-     * @access private
-     */
-    var $message_log = array();
-
-    /**
-     * Real-time log file pointer
-     *
-     * @see self::_append_log()
-     * @var resource
-     * @access private
-     */
-    var $realtime_log_file;
-
-    /**
-     * Real-time log file size
-     *
-     * @see self::_append_log()
-     * @var int
-     * @access private
-     */
-    var $realtime_log_size;
-
-    /**
-     * Real-time log file wrap boolean
-     *
-     * @see self::_append_log()
-     * @var bool
-     * @access private
-     */
-    var $realtime_log_wrap;
-
-    /**
-     * Interactive Buffer
-     *
-     * @see self::read()
-     * @var array
-     * @access private
-     */
-    var $interactiveBuffer = '';
-
-    /**
-     * Timeout
-     *
-     * @see self::setTimeout()
-     * @access private
-     */
-    var $timeout;
-
-    /**
-     * Current Timeout
-     *
-     * @see self::_get_channel_packet()
-     * @access private
-     */
-    var $curTimeout;
-
-    /**
-     * Log Boundary
-     *
-     * @see self::_format_log()
-     * @access private
-     */
-    var $log_boundary = ':';
-
-    /**
-     * Log Long Width
-     *
-     * @see self::_format_log()
-     * @access private
-     */
-    var $log_long_width = 65;
-
-    /**
-     * Log Short Width
-     *
-     * @see self::_format_log()
-     * @access private
-     */
-    var $log_short_width = 16;
-
-    /**
-     * Hostname
-     *
-     * @see self::__construct()
-     * @see self::_connect()
-     * @var string
-     * @access private
-     */
-    var $host;
-
-    /**
-     * Port Number
-     *
-     * @see self::__construct()
-     * @see self::_connect()
-     * @var int
-     * @access private
-     */
-    var $port;
-
-    /**
-     * Timeout for initial connection
-     *
-     * Set by the constructor call. Calling setTimeout() is optional. If it's not called functions like
-     * exec() won't timeout unless some PHP setting forces it too. The timeout specified in the constructor,
-     * however, is non-optional. There will be a timeout, whether or not you set it. If you don't it'll be
-     * 10 seconds. It is used by fsockopen() in that function.
-     *
-     * @see self::__construct()
-     * @see self::_connect()
-     * @var int
-     * @access private
-     */
-    var $connectionTimeout;
-
-    /**
-     * Default cipher
-     *
-     * @see self::__construct()
-     * @see self::_connect()
-     * @var int
-     * @access private
-     */
-    var $cipher;
-
-    /**
-     * Default Constructor.
-     *
-     * Connects to an SSHv1 server
-     *
-     * @param string $host
-     * @param int $port
-     * @param int $timeout
-     * @param int $cipher
-     * @return \phpseclib\Net\SSH1
-     * @access public
-     */
-    function __construct($host, $port = 22, $timeout = 10, $cipher = self::CIPHER_3DES)
-    {
-        $this->protocol_flags = array(
-            1  => 'NET_SSH1_MSG_DISCONNECT',
-            2  => 'NET_SSH1_SMSG_PUBLIC_KEY',
-            3  => 'NET_SSH1_CMSG_SESSION_KEY',
-            4  => 'NET_SSH1_CMSG_USER',
-            9  => 'NET_SSH1_CMSG_AUTH_PASSWORD',
-            10 => 'NET_SSH1_CMSG_REQUEST_PTY',
-            12 => 'NET_SSH1_CMSG_EXEC_SHELL',
-            13 => 'NET_SSH1_CMSG_EXEC_CMD',
-            14 => 'NET_SSH1_SMSG_SUCCESS',
-            15 => 'NET_SSH1_SMSG_FAILURE',
-            16 => 'NET_SSH1_CMSG_STDIN_DATA',
-            17 => 'NET_SSH1_SMSG_STDOUT_DATA',
-            18 => 'NET_SSH1_SMSG_STDERR_DATA',
-            19 => 'NET_SSH1_CMSG_EOF',
-            20 => 'NET_SSH1_SMSG_EXITSTATUS',
-            33 => 'NET_SSH1_CMSG_EXIT_CONFIRMATION'
-        );
-
-        $this->_define_array($this->protocol_flags);
-
-        $this->host = $host;
-        $this->port = $port;
-        $this->connectionTimeout = $timeout;
-        $this->cipher = $cipher;
-    }
-
-    /**
-     * Connect to an SSHv1 server
-     *
-     * @return bool
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @throws \RuntimeException on other errors
-     * @access private
-     */
-    function _connect()
-    {
-        $this->fsock = @fsockopen($this->host, $this->port, $errno, $errstr, $this->connectionTimeout);
-        if (!$this->fsock) {
-            throw new \RuntimeException(rtrim("Cannot connect to $host. Error $errno. $errstr"));
-        }
-
-        $this->server_identification = $init_line = fgets($this->fsock, 255);
-
-        if (defined('NET_SSH1_LOGGING')) {
-            $this->_append_log('<-', $this->server_identification);
-            $this->_append_log('->', $this->identifier . "\r\n");
-        }
-
-        if (!preg_match('#SSH-([0-9\.]+)-(.+)#', $init_line, $parts)) {
-            throw new \RuntimeException('Can only connect to SSH servers');
-        }
-        if ($parts[1][0] != 1) {
-            throw new \RuntimeException("Cannot connect to $parts[1] servers");
-        }
-
-        fputs($this->fsock, $this->identifier."\r\n");
-
-        $response = $this->_get_binary_packet();
-        if ($response[self::RESPONSE_TYPE] != NET_SSH1_SMSG_PUBLIC_KEY) {
-            throw new \UnexpectedValueException('Expected SSH_SMSG_PUBLIC_KEY');
-        }
-
-        $anti_spoofing_cookie = $this->_string_shift($response[self::RESPONSE_DATA], 8);
-
-        $this->_string_shift($response[self::RESPONSE_DATA], 4);
-
-        $temp = unpack('nlen', $this->_string_shift($response[self::RESPONSE_DATA], 2));
-        $server_key_public_exponent = new BigInteger($this->_string_shift($response[self::RESPONSE_DATA], ceil($temp['len'] / 8)), 256);
-        $this->server_key_public_exponent = $server_key_public_exponent;
-
-        $temp = unpack('nlen', $this->_string_shift($response[self::RESPONSE_DATA], 2));
-        $server_key_public_modulus = new BigInteger($this->_string_shift($response[self::RESPONSE_DATA], ceil($temp['len'] / 8)), 256);
-        $this->server_key_public_modulus = $server_key_public_modulus;
-
-        $this->_string_shift($response[self::RESPONSE_DATA], 4);
-
-        $temp = unpack('nlen', $this->_string_shift($response[self::RESPONSE_DATA], 2));
-        $host_key_public_exponent = new BigInteger($this->_string_shift($response[self::RESPONSE_DATA], ceil($temp['len'] / 8)), 256);
-        $this->host_key_public_exponent = $host_key_public_exponent;
-
-        $temp = unpack('nlen', $this->_string_shift($response[self::RESPONSE_DATA], 2));
-        $host_key_public_modulus = new BigInteger($this->_string_shift($response[self::RESPONSE_DATA], ceil($temp['len'] / 8)), 256);
-        $this->host_key_public_modulus = $host_key_public_modulus;
-
-        $this->_string_shift($response[self::RESPONSE_DATA], 4);
-
-        // get a list of the supported ciphers
-        extract(unpack('Nsupported_ciphers_mask', $this->_string_shift($response[self::RESPONSE_DATA], 4)));
-        foreach ($this->supported_ciphers as $mask => $name) {
-            if (($supported_ciphers_mask & (1 << $mask)) == 0) {
-                unset($this->supported_ciphers[$mask]);
-            }
-        }
-
-        // get a list of the supported authentications
-        extract(unpack('Nsupported_authentications_mask', $this->_string_shift($response[self::RESPONSE_DATA], 4)));
-        foreach ($this->supported_authentications as $mask => $name) {
-            if (($supported_authentications_mask & (1 << $mask)) == 0) {
-                unset($this->supported_authentications[$mask]);
-            }
-        }
-
-        $session_id = pack('H*', md5($host_key_public_modulus->toBytes() . $server_key_public_modulus->toBytes() . $anti_spoofing_cookie));
-
-        $session_key = Random::string(32);
-        $double_encrypted_session_key = $session_key ^ str_pad($session_id, 32, chr(0));
-
-        if ($server_key_public_modulus->compare($host_key_public_modulus) < 0) {
-            $double_encrypted_session_key = $this->_rsa_crypt(
-                $double_encrypted_session_key,
-                array(
-                    $server_key_public_exponent,
-                    $server_key_public_modulus
-                )
-            );
-            $double_encrypted_session_key = $this->_rsa_crypt(
-                $double_encrypted_session_key,
-                array(
-                    $host_key_public_exponent,
-                    $host_key_public_modulus
-                )
-            );
-        } else {
-            $double_encrypted_session_key = $this->_rsa_crypt(
-                $double_encrypted_session_key,
-                array(
-                    $host_key_public_exponent,
-                    $host_key_public_modulus
-                )
-            );
-            $double_encrypted_session_key = $this->_rsa_crypt(
-                $double_encrypted_session_key,
-                array(
-                    $server_key_public_exponent,
-                    $server_key_public_modulus
-                )
-            );
-        }
-
-        $cipher = isset($this->supported_ciphers[$this->cipher]) ? $this->cipher : self::CIPHER_3DES;
-        $data = pack('C2a*na*N', NET_SSH1_CMSG_SESSION_KEY, $cipher, $anti_spoofing_cookie, 8 * strlen($double_encrypted_session_key), $double_encrypted_session_key, 0);
-
-        if (!$this->_send_binary_packet($data)) {
-            throw new \RuntimeException('Error sending SSH_CMSG_SESSION_KEY');
-        }
-
-        switch ($cipher) {
-            //case self::CIPHER_NONE:
-            //    $this->crypto = new \phpseclib\Crypt\Null();
-            //    break;
-            case self::CIPHER_DES:
-                $this->crypto = new DES();
-                $this->crypto->disablePadding();
-                $this->crypto->enableContinuousBuffer();
-                $this->crypto->setKey(substr($session_key, 0,  8));
-                break;
-            case self::CIPHER_3DES:
-                $this->crypto = new TripleDES(TripleDES::MODE_3CBC);
-                $this->crypto->disablePadding();
-                $this->crypto->enableContinuousBuffer();
-                $this->crypto->setKey(substr($session_key, 0, 24));
-                break;
-            //case self::CIPHER_RC4:
-            //    $this->crypto = new RC4();
-            //    $this->crypto->enableContinuousBuffer();
-            //    $this->crypto->setKey(substr($session_key, 0,  16));
-            //    break;
-        }
-
-        $response = $this->_get_binary_packet();
-
-        if ($response[self::RESPONSE_TYPE] != NET_SSH1_SMSG_SUCCESS) {
-            throw new \UnexpectedValueException('Expected SSH_SMSG_SUCCESS');
-        }
-
-        $this->bitmap = self::MASK_CONNECTED;
-
-        return true;
-    }
-
-    /**
-     * Login
-     *
-     * @param string $username
-     * @param string $password
-     * @return bool
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @throws \RuntimeException on other errors
-     * @access public
-     */
-    function login($username, $password = '')
-    {
-        if (!($this->bitmap & self::MASK_CONSTRUCTOR)) {
-            $this->bitmap |= self::MASK_CONSTRUCTOR;
-            if (!$this->_connect()) {
-                return false;
-            }
-        }
-
-        if (!($this->bitmap & self::MASK_CONNECTED)) {
-            return false;
-        }
-
-        $data = pack('CNa*', NET_SSH1_CMSG_USER, strlen($username), $username);
-
-        if (!$this->_send_binary_packet($data)) {
-            throw new \RuntimeException('Error sending SSH_CMSG_USER');
-        }
-
-        $response = $this->_get_binary_packet();
-
-        if ($response === true) {
-            return false;
-        }
-        if ($response[self::RESPONSE_TYPE] == NET_SSH1_SMSG_SUCCESS) {
-            $this->bitmap |= self::MASK_LOGIN;
-            return true;
-        } elseif ($response[self::RESPONSE_TYPE] != NET_SSH1_SMSG_FAILURE) {
-            throw new \UnexpectedValueException('Expected SSH_SMSG_SUCCESS or SSH_SMSG_FAILURE');
-        }
-
-        $data = pack('CNa*', NET_SSH1_CMSG_AUTH_PASSWORD, strlen($password), $password);
-
-        if (!$this->_send_binary_packet($data)) {
-            throw new \RuntimeException('Error sending SSH_CMSG_AUTH_PASSWORD');
-        }
-
-        // remove the username and password from the last logged packet
-        if (defined('NET_SSH1_LOGGING') && NET_SSH1_LOGGING == self::LOG_COMPLEX) {
-            $data = pack('CNa*', NET_SSH1_CMSG_AUTH_PASSWORD, strlen('password'), 'password');
-            $this->message_log[count($this->message_log) - 1] = $data;
-        }
-
-        $response = $this->_get_binary_packet();
-
-        if ($response === true) {
-            return false;
-        }
-        if ($response[self::RESPONSE_TYPE] == NET_SSH1_SMSG_SUCCESS) {
-            $this->bitmap |= self::MASK_LOGIN;
-            return true;
-        } elseif ($response[self::RESPONSE_TYPE] == NET_SSH1_SMSG_FAILURE) {
-            return false;
-        } else {
-            throw new \UnexpectedValueException('Expected SSH_SMSG_SUCCESS or SSH_SMSG_FAILURE');
-        }
-    }
-
-    /**
-     * Set Timeout
-     *
-     * $ssh->exec('ping 127.0.0.1'); on a Linux host will never return and will run indefinitely.  setTimeout() makes it so it'll timeout.
-     * Setting $timeout to false or 0 will mean there is no timeout.
-     *
-     * @param mixed $timeout
-     */
-    function setTimeout($timeout)
-    {
-        $this->timeout = $this->curTimeout = $timeout;
-    }
-
-    /**
-     * Executes a command on a non-interactive shell, returns the output, and quits.
-     *
-     * An SSH1 server will close the connection after a command has been executed on a non-interactive shell.  SSH2
-     * servers don't, however, this isn't an SSH2 client.  The way this works, on the server, is by initiating a
-     * shell with the -s option, as discussed in the following links:
-     *
-     * {@link http://www.faqs.org/docs/bashman/bashref_65.html http://www.faqs.org/docs/bashman/bashref_65.html}
-     * {@link http://www.faqs.org/docs/bashman/bashref_62.html http://www.faqs.org/docs/bashman/bashref_62.html}
-     *
-     * To execute further commands, a new \phpseclib\Net\SSH1 object will need to be created.
-     *
-     * Returns false on failure and the output, otherwise.
-     *
-     * @see self::interactiveRead()
-     * @see self::interactiveWrite()
-     * @param string $cmd
-     * @return mixed
-     * @throws \RuntimeException on error sending command
-     * @access public
-     */
-    function exec($cmd, $block = true)
-    {
-        if (!($this->bitmap & self::MASK_LOGIN)) {
-            throw new \RuntimeException('Operation disallowed prior to login()');
-        }
-
-        $data = pack('CNa*', NET_SSH1_CMSG_EXEC_CMD, strlen($cmd), $cmd);
-
-        if (!$this->_send_binary_packet($data)) {
-            throw new \RuntimeException('Error sending SSH_CMSG_EXEC_CMD');
-        }
-
-        if (!$block) {
-            return true;
-        }
-
-        $output = '';
-        $response = $this->_get_binary_packet();
-
-        if ($response !== false) {
-            do {
-                $output.= substr($response[self::RESPONSE_DATA], 4);
-                $response = $this->_get_binary_packet();
-            } while (is_array($response) && $response[self::RESPONSE_TYPE] != NET_SSH1_SMSG_EXITSTATUS);
-        }
-
-        $data = pack('C', NET_SSH1_CMSG_EXIT_CONFIRMATION);
-
-        // i don't think it's really all that important if this packet gets sent or not.
-        $this->_send_binary_packet($data);
-
-        fclose($this->fsock);
-
-        // reset the execution bitmap - a new \phpseclib\Net\SSH1 object needs to be created.
-        $this->bitmap = 0;
-
-        return $output;
-    }
-
-    /**
-     * Creates an interactive shell
-     *
-     * @see self::interactiveRead()
-     * @see self::interactiveWrite()
-     * @return bool
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @throws \RuntimeException on other errors
-     * @access private
-     */
-    function _initShell()
-    {
-        // connect using the sample parameters in protocol-1.5.txt.
-        // according to wikipedia.org's entry on text terminals, "the fundamental type of application running on a text
-        // terminal is a command line interpreter or shell".  thus, opening a terminal session to run the shell.
-        $data = pack('CNa*N4C', NET_SSH1_CMSG_REQUEST_PTY, strlen('vt100'), 'vt100', 24, 80, 0, 0, self::TTY_OP_END);
-
-        if (!$this->_send_binary_packet($data)) {
-            throw new \RuntimeException('Error sending SSH_CMSG_REQUEST_PTY');
-        }
-
-        $response = $this->_get_binary_packet();
-
-        if ($response === true) {
-            return false;
-        }
-        if ($response[self::RESPONSE_TYPE] != NET_SSH1_SMSG_SUCCESS) {
-            throw new \UnexpectedValueException('Expected SSH_SMSG_SUCCESS');
-        }
-
-        $data = pack('C', NET_SSH1_CMSG_EXEC_SHELL);
-
-        if (!$this->_send_binary_packet($data)) {
-            throw new \RuntimeException('Error sending SSH_CMSG_EXEC_SHELL');
-        }
-
-        $this->bitmap |= self::MASK_SHELL;
-
-        //stream_set_blocking($this->fsock, 0);
-
-        return true;
-    }
-
-    /**
-     * Inputs a command into an interactive shell.
-     *
-     * @see self::interactiveWrite()
-     * @param string $cmd
-     * @return bool
-     * @access public
-     */
-    function write($cmd)
-    {
-        return $this->interactiveWrite($cmd);
-    }
-
-    /**
-     * Returns the output of an interactive shell when there's a match for $expect
-     *
-     * $expect can take the form of a string literal or, if $mode == self::READ__REGEX,
-     * a regular expression.
-     *
-     * @see self::write()
-     * @param string $expect
-     * @param int $mode
-     * @return bool
-     * @throws \RuntimeException on connection error
-     * @access public
-     */
-    function read($expect, $mode = self::READ__SIMPLE)
-    {
-        if (!($this->bitmap & self::MASK_LOGIN)) {
-            throw new \RuntimeException('Operation disallowed prior to login()');
-        }
-
-        if (!($this->bitmap & self::MASK_SHELL) && !$this->_initShell()) {
-            throw new \RuntimeException('Unable to initiate an interactive shell session');
-        }
-
-        $match = $expect;
-        while (true) {
-            if ($mode == self::READ__REGEX) {
-                preg_match($expect, $this->interactiveBuffer, $matches);
-                $match = isset($matches[0]) ? $matches[0] : '';
-            }
-            $pos = strlen($match) ? strpos($this->interactiveBuffer, $match) : false;
-            if ($pos !== false) {
-                return $this->_string_shift($this->interactiveBuffer, $pos + strlen($match));
-            }
-            $response = $this->_get_binary_packet();
-
-            if ($response === true) {
-                return $this->_string_shift($this->interactiveBuffer, strlen($this->interactiveBuffer));
-            }
-            $this->interactiveBuffer.= substr($response[self::RESPONSE_DATA], 4);
-        }
-    }
-
-    /**
-     * Inputs a command into an interactive shell.
-     *
-     * @see self::interactiveRead()
-     * @param string $cmd
-     * @return bool
-     * @throws \RuntimeException on connection error
-     * @access public
-     */
-    function interactiveWrite($cmd)
-    {
-        if (!($this->bitmap & self::MASK_LOGIN)) {
-            throw new \RuntimeException('Operation disallowed prior to login()');
-        }
-
-        if (!($this->bitmap & self::MASK_SHELL) && !$this->_initShell()) {
-            throw new \RuntimeException('Unable to initiate an interactive shell session');
-        }
-
-        $data = pack('CNa*', NET_SSH1_CMSG_STDIN_DATA, strlen($cmd), $cmd);
-
-        if (!$this->_send_binary_packet($data)) {
-            throw new \RuntimeException('Error sending SSH_CMSG_STDIN');
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns the output of an interactive shell when no more output is available.
-     *
-     * Requires PHP 4.3.0 or later due to the use of the stream_select() function.  If you see stuff like
-     * "^[[00m", you're seeing ANSI escape codes.  According to
-     * {@link http://support.microsoft.com/kb/101875 How to Enable ANSI.SYS in a Command Window}, "Windows NT
-     * does not support ANSI escape sequences in Win32 Console applications", so if you're a Windows user,
-     * there's not going to be much recourse.
-     *
-     * @see self::interactiveRead()
-     * @return string
-     * @throws \RuntimeException on connection error
-     * @access public
-     */
-    function interactiveRead()
-    {
-        if (!($this->bitmap & self::MASK_LOGIN)) {
-            throw new \RuntimeException('Operation disallowed prior to login()');
-        }
-
-        if (!($this->bitmap & self::MASK_SHELL) && !$this->_initShell()) {
-            throw new \RuntimeException('Unable to initiate an interactive shell session');
-        }
-
-        $read = array($this->fsock);
-        $write = $except = null;
-        if (stream_select($read, $write, $except, 0)) {
-            $response = $this->_get_binary_packet();
-            return substr($response[self::RESPONSE_DATA], 4);
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * Disconnect
-     *
-     * @access public
-     */
-    function disconnect()
-    {
-        $this->_disconnect();
-    }
-
-    /**
-     * Destructor.
-     *
-     * Will be called, automatically, if you're supporting just PHP5.  If you're supporting PHP4, you'll need to call
-     * disconnect().
-     *
-     * @access public
-     */
-    function __destruct()
-    {
-        $this->_disconnect();
-    }
-
-    /**
-     * Disconnect
-     *
-     * @param string $msg
-     * @access private
-     */
-    function _disconnect($msg = 'Client Quit')
-    {
-        if ($this->bitmap) {
-            $data = pack('C', NET_SSH1_CMSG_EOF);
-            $this->_send_binary_packet($data);
-            /*
-            $response = $this->_get_binary_packet();
-            if ($response === true) {
-                $response = array(self::RESPONSE_TYPE => -1);
-            }
-            switch ($response[self::RESPONSE_TYPE]) {
-                case NET_SSH1_SMSG_EXITSTATUS:
-                    $data = pack('C', NET_SSH1_CMSG_EXIT_CONFIRMATION);
-                    break;
-                default:
-                    $data = pack('CNa*', NET_SSH1_MSG_DISCONNECT, strlen($msg), $msg);
-            }
-            */
-            $data = pack('CNa*', NET_SSH1_MSG_DISCONNECT, strlen($msg), $msg);
-
-            $this->_send_binary_packet($data);
-            fclose($this->fsock);
-            $this->bitmap = 0;
-        }
-    }
-
-    /**
-     * Gets Binary Packets
-     *
-     * See 'The Binary Packet Protocol' of protocol-1.5.txt for more info.
-     *
-     * Also, this function could be improved upon by adding detection for the following exploit:
-     * http://www.securiteam.com/securitynews/5LP042K3FY.html
-     *
-     * @see self::_send_binary_packet()
-     * @return array
-     * @access private
-     */
-    function _get_binary_packet()
-    {
-        if (feof($this->fsock)) {
-            //user_error('connection closed prematurely');
-            return false;
-        }
-
-        if ($this->curTimeout) {
-            $read = array($this->fsock);
-            $write = $except = null;
-
-            $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838
-            $sec = floor($this->curTimeout);
-            $usec = 1000000 * ($this->curTimeout - $sec);
-            // on windows this returns a "Warning: Invalid CRT parameters detected" error
-            if (!@stream_select($read, $write, $except, $sec, $usec) && !count($read)) {
-                //$this->_disconnect('Timeout');
-                return true;
-            }
-            $elapsed = strtok(microtime(), ' ') + strtok('') - $start;
-            $this->curTimeout-= $elapsed;
-        }
-
-        $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838
-        $temp = unpack('Nlength', fread($this->fsock, 4));
-
-        $padding_length = 8 - ($temp['length'] & 7);
-        $length = $temp['length'] + $padding_length;
-        $raw = '';
-
-        while ($length > 0) {
-            $temp = fread($this->fsock, $length);
-            $raw.= $temp;
-            $length-= strlen($temp);
-        }
-        $stop = strtok(microtime(), ' ') + strtok('');
-
-        if (strlen($raw) && $this->crypto !== false) {
-            $raw = $this->crypto->decrypt($raw);
-        }
-
-        $padding = substr($raw, 0, $padding_length);
-        $type = $raw[$padding_length];
-        $data = substr($raw, $padding_length + 1, -4);
-
-        $temp = unpack('Ncrc', substr($raw, -4));
-
-        //if ( $temp['crc'] != $this->_crc($padding . $type . $data) ) {
-        //    user_error('Bad CRC in packet from server');
-        //    return false;
-        //}
-
-        $type = ord($type);
-
-        if (defined('NET_SSH1_LOGGING')) {
-            $temp = isset($this->protocol_flags[$type]) ? $this->protocol_flags[$type] : 'UNKNOWN';
-            $temp = '<- ' . $temp .
-                    ' (' . round($stop - $start, 4) . 's)';
-            $this->_append_log($temp, $data);
-        }
-
-        return array(
-            self::RESPONSE_TYPE => $type,
-            self::RESPONSE_DATA => $data
-        );
-    }
-
-    /**
-     * Sends Binary Packets
-     *
-     * Returns true on success, false on failure.
-     *
-     * @see self::_get_binary_packet()
-     * @param string $data
-     * @return bool
-     * @access private
-     */
-    function _send_binary_packet($data)
-    {
-        if (feof($this->fsock)) {
-            //user_error('connection closed prematurely');
-            return false;
-        }
-
-        $length = strlen($data) + 4;
-
-        $padding = Random::string(8 - ($length & 7));
-
-        $orig = $data;
-        $data = $padding . $data;
-        $data.= pack('N', $this->_crc($data));
-
-        if ($this->crypto !== false) {
-            $data = $this->crypto->encrypt($data);
-        }
-
-        $packet = pack('Na*', $length, $data);
-
-        $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838
-        $result = strlen($packet) == fputs($this->fsock, $packet);
-        $stop = strtok(microtime(), ' ') + strtok('');
-
-        if (defined('NET_SSH1_LOGGING')) {
-            $temp = isset($this->protocol_flags[ord($orig[0])]) ? $this->protocol_flags[ord($orig[0])] : 'UNKNOWN';
-            $temp = '-> ' . $temp .
-                    ' (' . round($stop - $start, 4) . 's)';
-            $this->_append_log($temp, $orig);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Cyclic Redundancy Check (CRC)
-     *
-     * PHP's crc32 function is implemented slightly differently than the one that SSH v1 uses, so
-     * we've reimplemented it. A more detailed discussion of the differences can be found after
-     * $crc_lookup_table's initialization.
-     *
-     * @see self::_get_binary_packet()
-     * @see self::_send_binary_packet()
-     * @param string $data
-     * @return int
-     * @access private
-     */
-    function _crc($data)
-    {
-        static $crc_lookup_table = array(
-            0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
-            0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
-            0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
-            0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
-            0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
-            0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
-            0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
-            0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
-            0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
-            0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
-            0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
-            0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
-            0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
-            0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
-            0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
-            0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
-            0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
-            0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
-            0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
-            0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
-            0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
-            0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
-            0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
-            0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
-            0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
-            0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
-            0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
-            0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
-            0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
-            0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
-            0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
-            0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
-            0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
-            0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
-            0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
-            0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
-            0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
-            0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
-            0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
-            0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
-            0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
-            0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
-            0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
-            0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
-            0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
-            0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
-            0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
-            0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
-            0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
-            0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
-            0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
-            0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
-            0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
-            0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
-            0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
-            0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
-            0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
-            0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
-            0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
-            0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
-            0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
-            0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
-            0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
-            0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
-        );
-
-        // For this function to yield the same output as PHP's crc32 function, $crc would have to be
-        // set to 0xFFFFFFFF, initially - not 0x00000000 as it currently is.
-        $crc = 0x00000000;
-        $length = strlen($data);
-
-        for ($i=0; $i<$length; $i++) {
-            // We AND $crc >> 8 with 0x00FFFFFF because we want the eight newly added bits to all
-            // be zero.  PHP, unfortunately, doesn't always do this.  0x80000000 >> 8, as an example,
-            // yields 0xFF800000 - not 0x00800000.  The following link elaborates:
-            // http://www.php.net/manual/en/language.operators.bitwise.php#57281
-            $crc = (($crc >> 8) & 0x00FFFFFF) ^ $crc_lookup_table[($crc & 0xFF) ^ ord($data[$i])];
-        }
-
-        // In addition to having to set $crc to 0xFFFFFFFF, initially, the return value must be XOR'd with
-        // 0xFFFFFFFF for this function to return the same thing that PHP's crc32 function would.
-        return $crc;
-    }
-
-    /**
-     * String Shift
-     *
-     * Inspired by array_shift
-     *
-     * @param string $string
-     * @param int $index
-     * @return string
-     * @access private
-     */
-    function _string_shift(&$string, $index = 1)
-    {
-        $substr = substr($string, 0, $index);
-        $string = substr($string, $index);
-        return $substr;
-    }
-
-    /**
-     * RSA Encrypt
-     *
-     * Returns mod(pow($m, $e), $n), where $n should be the product of two (large) primes $p and $q and where $e
-     * should be a number with the property that gcd($e, ($p - 1) * ($q - 1)) == 1.  Could just make anything that
-     * calls this call modexp, instead, but I think this makes things clearer, maybe...
-     *
-     * @see self::__construct()
-     * @param BigInteger $m
-     * @param array $key
-     * @return BigInteger
-     * @access private
-     */
-    function _rsa_crypt($m, $key)
-    {
-        /*
-        $rsa = new RSA();
-        $rsa->load($key, 'raw');
-        $rsa->setEncryptionMode(RSA::ENCRYPTION_PKCS1);
-        return $rsa->encrypt($m);
-        */
-
-        // To quote from protocol-1.5.txt:
-        // The most significant byte (which is only partial as the value must be
-        // less than the public modulus, which is never a power of two) is zero.
-        //
-        // The next byte contains the value 2 (which stands for public-key
-        // encrypted data in the PKCS standard [PKCS#1]).  Then, there are non-
-        // zero random bytes to fill any unused space, a zero byte, and the data
-        // to be encrypted in the least significant bytes, the last byte of the
-        // data in the least significant byte.
-
-        // Presumably the part of PKCS#1 they're refering to is "Section 7.2.1 Encryption Operation",
-        // under "7.2 RSAES-PKCS1-v1.5" and "7 Encryption schemes" of the following URL:
-        // ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-1/pkcs-1v2-1.pdf
-        $modulus = $key[1]->toBytes();
-        $length = strlen($modulus) - strlen($m) - 3;
-        $random = '';
-        while (strlen($random) != $length) {
-            $block = Random::string($length - strlen($random));
-            $block = str_replace("\x00", '', $block);
-            $random.= $block;
-        }
-        $temp = chr(0) . chr(2) . $random . chr(0) . $m;
-
-        $m = new BigInteger($temp, 256);
-        $m = $m->modPow($key[0], $key[1]);
-
-        return $m->toBytes();
-    }
-
-    /**
-     * Define Array
-     *
-     * Takes any number of arrays whose indices are integers and whose values are strings and defines a bunch of
-     * named constants from it, using the value as the name of the constant and the index as the value of the constant.
-     * If any of the constants that would be defined already exists, none of the constants will be defined.
-     *
-     * @param array $array
-     * @access private
-     */
-    function _define_array()
-    {
-        $args = func_get_args();
-        foreach ($args as $arg) {
-            foreach ($arg as $key => $value) {
-                if (!defined($value)) {
-                    define($value, $key);
-                } else {
-                    break 2;
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns a log of the packets that have been sent and received.
-     *
-     * Returns a string if NET_SSH1_LOGGING == self::LOG_COMPLEX, an array if NET_SSH1_LOGGING == self::LOG_SIMPLE and false if !defined('NET_SSH1_LOGGING')
-     *
-     * @access public
-     * @return array|false|string
-     */
-    function getLog()
-    {
-        if (!defined('NET_SSH1_LOGGING')) {
-            return false;
-        }
-
-        switch (NET_SSH1_LOGGING) {
-            case self::LOG_SIMPLE:
-                return $this->message_number_log;
-                break;
-            case self::LOG_COMPLEX:
-                return $this->_format_log($this->message_log, $this->protocol_flags_log);
-                break;
-            default:
-                return false;
-        }
-    }
-
-    /**
-     * Formats a log for printing
-     *
-     * @param array $message_log
-     * @param array $message_number_log
-     * @access private
-     * @return string
-     */
-    function _format_log($message_log, $message_number_log)
-    {
-        $output = '';
-        for ($i = 0; $i < count($message_log); $i++) {
-            $output.= $message_number_log[$i] . "\r\n";
-            $current_log = $message_log[$i];
-            $j = 0;
-            do {
-                if (strlen($current_log)) {
-                    $output.= str_pad(dechex($j), 7, '0', STR_PAD_LEFT) . '0  ';
-                }
-                $fragment = $this->_string_shift($current_log, $this->log_short_width);
-                $hex = substr(preg_replace_callback('#.#s', array($this, '_format_log_helper'), $fragment), strlen($this->log_boundary));
-                // replace non ASCII printable characters with dots
-                // http://en.wikipedia.org/wiki/ASCII#ASCII_printable_characters
-                // also replace < with a . since < messes up the output on web browsers
-                $raw = preg_replace('#[^\x20-\x7E]|<#', '.', $fragment);
-                $output.= str_pad($hex, $this->log_long_width - $this->log_short_width, ' ') . $raw . "\r\n";
-                $j++;
-            } while (strlen($current_log));
-            $output.= "\r\n";
-        }
-
-        return $output;
-    }
-
-    /**
-     * Helper function for _format_log
-     *
-     * For use with preg_replace_callback()
-     *
-     * @param array $matches
-     * @access private
-     * @return string
-     */
-    function _format_log_helper($matches)
-    {
-        return $this->log_boundary . str_pad(dechex(ord($matches[0])), 2, '0', STR_PAD_LEFT);
-    }
-
-    /**
-     * Return the server key public exponent
-     *
-     * Returns, by default, the base-10 representation.  If $raw_output is set to true, returns, instead,
-     * the raw bytes.  This behavior is similar to PHP's md5() function.
-     *
-     * @param bool $raw_output
-     * @return string
-     * @access public
-     */
-    function getServerKeyPublicExponent($raw_output = false)
-    {
-        return $raw_output ? $this->server_key_public_exponent->toBytes() : $this->server_key_public_exponent->toString();
-    }
-
-    /**
-     * Return the server key public modulus
-     *
-     * Returns, by default, the base-10 representation.  If $raw_output is set to true, returns, instead,
-     * the raw bytes.  This behavior is similar to PHP's md5() function.
-     *
-     * @param bool $raw_output
-     * @return string
-     * @access public
-     */
-    function getServerKeyPublicModulus($raw_output = false)
-    {
-        return $raw_output ? $this->server_key_public_modulus->toBytes() : $this->server_key_public_modulus->toString();
-    }
-
-    /**
-     * Return the host key public exponent
-     *
-     * Returns, by default, the base-10 representation.  If $raw_output is set to true, returns, instead,
-     * the raw bytes.  This behavior is similar to PHP's md5() function.
-     *
-     * @param bool $raw_output
-     * @return string
-     * @access public
-     */
-    function getHostKeyPublicExponent($raw_output = false)
-    {
-        return $raw_output ? $this->host_key_public_exponent->toBytes() : $this->host_key_public_exponent->toString();
-    }
-
-    /**
-     * Return the host key public modulus
-     *
-     * Returns, by default, the base-10 representation.  If $raw_output is set to true, returns, instead,
-     * the raw bytes.  This behavior is similar to PHP's md5() function.
-     *
-     * @param bool $raw_output
-     * @return string
-     * @access public
-     */
-    function getHostKeyPublicModulus($raw_output = false)
-    {
-        return $raw_output ? $this->host_key_public_modulus->toBytes() : $this->host_key_public_modulus->toString();
-    }
-
-    /**
-     * Return a list of ciphers supported by SSH1 server.
-     *
-     * Just because a cipher is supported by an SSH1 server doesn't mean it's supported by this library. If $raw_output
-     * is set to true, returns, instead, an array of constants.  ie. instead of array('Triple-DES in CBC mode'), you'll
-     * get array(self::CIPHER_3DES).
-     *
-     * @param bool $raw_output
-     * @return array
-     * @access public
-     */
-    function getSupportedCiphers($raw_output = false)
-    {
-        return $raw_output ? array_keys($this->supported_ciphers) : array_values($this->supported_ciphers);
-    }
-
-    /**
-     * Return a list of authentications supported by SSH1 server.
-     *
-     * Just because a cipher is supported by an SSH1 server doesn't mean it's supported by this library. If $raw_output
-     * is set to true, returns, instead, an array of constants.  ie. instead of array('password authentication'), you'll
-     * get array(self::AUTH_PASSWORD).
-     *
-     * @param bool $raw_output
-     * @return array
-     * @access public
-     */
-    function getSupportedAuthentications($raw_output = false)
-    {
-        return $raw_output ? array_keys($this->supported_authentications) : array_values($this->supported_authentications);
-    }
-
-    /**
-     * Return the server identification.
-     *
-     * @return string
-     * @access public
-     */
-    function getServerIdentification()
-    {
-        return rtrim($this->server_identification);
-    }
-
-    /**
-     * Logs data packets
-     *
-     * Makes sure that only the last 1MB worth of packets will be logged
-     *
-     * @param string $data
-     * @access private
-     */
-    function _append_log($protocol_flags, $message)
-    {
-        switch (NET_SSH1_LOGGING) {
-            // useful for benchmarks
-            case self::LOG_SIMPLE:
-                $this->protocol_flags_log[] = $protocol_flags;
-                break;
-            // the most useful log for SSH1
-            case self::LOG_COMPLEX:
-                $this->protocol_flags_log[] = $protocol_flags;
-                $this->_string_shift($message);
-                $this->log_size+= strlen($message);
-                $this->message_log[] = $message;
-                while ($this->log_size > self::LOG_MAX_SIZE) {
-                    $this->log_size-= strlen(array_shift($this->message_log));
-                    array_shift($this->protocol_flags_log);
-                }
-                break;
-            // dump the output out realtime; packets may be interspersed with non packets,
-            // passwords won't be filtered out and select other packets may not be correctly
-            // identified
-            case self::LOG_REALTIME:
-                echo "<pre>\r\n" . $this->_format_log(array($message), array($protocol_flags)) . "\r\n</pre>\r\n";
-                @flush();
-                @ob_flush();
-                break;
-            // basically the same thing as self::LOG_REALTIME with the caveat that self::LOG_REALTIME_FILE
-            // needs to be defined and that the resultant log file will be capped out at self::LOG_MAX_SIZE.
-            // the earliest part of the log file is denoted by the first <<< START >>> and is not going to necessarily
-            // at the beginning of the file
-            case self::LOG_REALTIME_FILE:
-                if (!isset($this->realtime_log_file)) {
-                    // PHP doesn't seem to like using constants in fopen()
-                    $filename = self::LOG_REALTIME_FILE;
-                    $fp = fopen($filename, 'w');
-                    $this->realtime_log_file = $fp;
-                }
-                if (!is_resource($this->realtime_log_file)) {
-                    break;
-                }
-                $entry = $this->_format_log(array($message), array($protocol_flags));
-                if ($this->realtime_log_wrap) {
-                    $temp = "<<< START >>>\r\n";
-                    $entry.= $temp;
-                    fseek($this->realtime_log_file, ftell($this->realtime_log_file) - strlen($temp));
-                }
-                $this->realtime_log_size+= strlen($entry);
-                if ($this->realtime_log_size > self::LOG_MAX_SIZE) {
-                    fseek($this->realtime_log_file, 0);
-                    $this->realtime_log_size = strlen($entry);
-                    $this->realtime_log_wrap = true;
-                }
-                fputs($this->realtime_log_file, $entry);
-        }
-    }
-}
diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php
index 409d29c55..58494a3be 100644
--- a/phpseclib/Net/SSH2.php
+++ b/phpseclib/Net/SSH2.php
@@ -10,7 +10,7 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $ssh = new \phpseclib\Net\SSH2('www.domain.tld');
+ *    $ssh = new \phpseclib3\Net\SSH2('www.domain.tld');
  *    if (!$ssh->login('username', 'password')) {
  *        exit('Login Failed');
  *    }
@@ -24,11 +24,9 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $key = new \phpseclib\Crypt\RSA();
- *    //$key->setPassword('whatever');
- *    $key->load(file_get_contents('privatekey'));
+ *    $key = \phpseclib3\Crypt\PublicKeyLoader::load('...', '(optional) password');
  *
- *    $ssh = new \phpseclib\Net\SSH2('www.domain.tld');
+ *    $ssh = new \phpseclib3\Net\SSH2('www.domain.tld');
  *    if (!$ssh->login('username', $key)) {
  *        exit('Login Failed');
  *    }
@@ -39,276 +37,311 @@
  * ?>
  * </code>
  *
- * @category  Net
- * @package   SSH2
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2007 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib\Net;
-
-use phpseclib\Crypt\Base;
-use phpseclib\Crypt\Blowfish;
-use phpseclib\Crypt\Hash;
-use phpseclib\Crypt\Random;
-use phpseclib\Crypt\RC4;
-use phpseclib\Crypt\Rijndael;
-use phpseclib\Crypt\RSA;
-use phpseclib\Crypt\TripleDES;
-use phpseclib\Crypt\Twofish;
-use phpseclib\Math\BigInteger; // Used to do Diffie-Hellman key exchange and DSA/RSA signature verification.
-use phpseclib\System\SSH\Agent;
-use phpseclib\Exception\NoSupportedAlgorithmsException;
+declare(strict_types=1);
+
+namespace phpseclib3\Net;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Blowfish;
+use phpseclib3\Crypt\ChaCha20;
+use phpseclib3\Crypt\Common\PrivateKey;
+use phpseclib3\Crypt\Common\PublicKey;
+use phpseclib3\Crypt\Common\SymmetricKey;
+use phpseclib3\Crypt\DH;
+use phpseclib3\Crypt\DSA;
+use phpseclib3\Crypt\EC;
+use phpseclib3\Crypt\Hash;
+use phpseclib3\Crypt\Random;
+use phpseclib3\Crypt\RC4;
+use phpseclib3\Crypt\Rijndael;
+use phpseclib3\Crypt\RSA;
+use phpseclib3\Crypt\TripleDES;
+use phpseclib3\Crypt\Twofish;
+use phpseclib3\Exception\ConnectionClosedException;
+use phpseclib3\Exception\InsufficientSetupException;
+use phpseclib3\Exception\InvalidArgumentException;
+use phpseclib3\Exception\InvalidPacketLengthException;
+use phpseclib3\Exception\LengthException;
+use phpseclib3\Exception\LogicException;
+use phpseclib3\Exception\NoSupportedAlgorithmsException;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Exception\TimeoutException;
+use phpseclib3\Exception\UnableToConnectException;
+use phpseclib3\Exception\UnexpectedValueException;
+use phpseclib3\Exception\UnsupportedAlgorithmException;
+use phpseclib3\Exception\UnsupportedCurveException;
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Net\SSH2\ChannelConnectionFailureReason;
+use phpseclib3\Net\SSH2\DisconnectReason;
+use phpseclib3\Net\SSH2\MessageType;
+use phpseclib3\Net\SSH2\MessageTypeExtra;
+use phpseclib3\Net\SSH2\TerminalMode;
+use phpseclib3\System\SSH\Agent;
 
 /**
  * Pure-PHP implementation of SSHv2.
  *
- * @package SSH2
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class SSH2
 {
     /**#@+
-     * Execution Bitmap Masks
+     * Compression Types
      *
-     * @see \phpseclib\Net\SSH2::bitmap
-     * @access private
      */
-    const MASK_CONSTRUCTOR   = 0x00000001;
-    const MASK_CONNECTED     = 0x00000002;
-    const MASK_LOGIN_REQ     = 0x00000004;
-    const MASK_LOGIN         = 0x00000008;
-    const MASK_SHELL         = 0x00000010;
-    const MASK_WINDOW_ADJUST = 0x00000020;
+    /**
+     * No compression
+     */
+    public const NET_SSH2_COMPRESSION_NONE = 1;
+    /**
+     * zlib compression
+     */
+    public const NET_SSH2_COMPRESSION_ZLIB = 2;
+    /**
+     * zlib@openssh.com
+     */
+    public const NET_SSH2_COMPRESSION_ZLIB_AT_OPENSSH = 3;
     /**#@-*/
 
-    /**#@+
+    // Execution Bitmap Masks
+    public const MASK_CONSTRUCTOR   = 0x00000001;
+    public const MASK_CONNECTED     = 0x00000002;
+    public const MASK_LOGIN_REQ     = 0x00000004;
+    public const MASK_LOGIN         = 0x00000008;
+    public const MASK_SHELL         = 0x00000010;
+    public const MASK_DISCONNECT    = 0x00000020;
+
+    /*
      * Channel constants
      *
      * RFC4254 refers not to client and server channels but rather to sender and recipient channels.  we don't refer
      * to them in that way because RFC4254 toggles the meaning. the client sends a SSH_MSG_CHANNEL_OPEN message with
      * a sender channel and the server sends a SSH_MSG_CHANNEL_OPEN_CONFIRMATION in response, with a sender and a
-     * recepient channel.  at first glance, you might conclude that SSH_MSG_CHANNEL_OPEN_CONFIRMATION's sender channel
-     * would be the same thing as SSH_MSG_CHANNEL_OPEN's sender channel, but it's not, per this snipet:
+     * recipient channel.  at first glance, you might conclude that SSH_MSG_CHANNEL_OPEN_CONFIRMATION's sender channel
+     * would be the same thing as SSH_MSG_CHANNEL_OPEN's sender channel, but it's not, per this snippet:
      *     The 'recipient channel' is the channel number given in the original
      *     open request, and 'sender channel' is the channel number allocated by
      *     the other side.
      *
-     * @see \phpseclib\Net\SSH2::_send_channel_packet()
-     * @see \phpseclib\Net\SSH2::_get_channel_packet()
-     * @access private
-    */
-    const CHANNEL_EXEC          = 0; // PuTTy uses 0x100
-    const CHANNEL_SHELL         = 1;
-    const CHANNEL_SUBSYSTEM     = 2;
-    const CHANNEL_AGENT_FORWARD = 3;
-    /**#@-*/
+     * @see \phpseclib3\Net\SSH2::send_channel_packet()
+     * @see \phpseclib3\Net\SSH2::get_channel_packet()
+     */
+    public const CHANNEL_EXEC          = 1; // PuTTy uses 0x100
+    public const CHANNEL_SHELL         = 2;
+    public const CHANNEL_SUBSYSTEM     = 3;
+    public const CHANNEL_AGENT_FORWARD = 4;
+    public const CHANNEL_KEEP_ALIVE    = 5;
 
-    /**#@+
-     * @access public
-     * @see \phpseclib\Net\SSH2::getLog()
-    */
     /**
      * Returns the message numbers
+     *
+     * @see \phpseclib3\Net\SSH2::getLog()
      */
-    const LOG_SIMPLE = 1;
+    public const LOG_SIMPLE = 1;
     /**
      * Returns the message content
+     *
+     * @see \phpseclib3\Net\SSH2::getLog()
      */
-    const LOG_COMPLEX = 2;
+    public const LOG_COMPLEX = 2;
     /**
      * Outputs the content real-time
      */
-    const LOG_REALTIME = 3;
+    public const LOG_REALTIME = 3;
     /**
      * Dumps the content real-time to a file
      */
-    const LOG_REALTIME_FILE = 4;
-    /**#@-*/
+    public const LOG_REALTIME_FILE = 4;
+    /**
+     * Outputs the message numbers real-time
+     */
+    public const LOG_SIMPLE_REALTIME = 5;
+    /*
+     * Dumps the message numbers real-time
+     */
+    public const LOG_REALTIME_SIMPLE = 5;
+    /**
+     * Make sure that the log never gets larger than this
+     *
+     * @see \phpseclib3\Net\SSH2::getLog()
+     */
+    public const LOG_MAX_SIZE = 1048576; // 1024 * 1024
 
-    /**#@+
-     * @access public
-     * @see \phpseclib\Net\SSH2::read()
-    */
     /**
      * Returns when a string matching $expect exactly is found
+     *
+     * @see \phpseclib3\Net\SSH2::read()
      */
-    const READ_SIMPLE = 1;
+    public const READ_SIMPLE = 1;
     /**
      * Returns when a string matching the regular expression $expect is found
+     *
+     * @see \phpseclib3\Net\SSH2::read()
      */
-    const READ_REGEX = 2;
+    public const READ_REGEX = 2;
     /**
-     * Make sure that the log never gets larger than this
+     * Returns whenever a data packet is received.
+     *
+     * Some data packets may only contain a single character so it may be necessary
+     * to call read() multiple times when using this option
+     *
+     * @see \phpseclib3\Net\SSH2::read()
      */
-    const LOG_MAX_SIZE = 1048576; // 1024 * 1024
-    /**#@-*/
+    public const READ_NEXT = 3;
 
     /**
      * The SSH identifier
-     *
-     * @var string
-     * @access private
      */
-    var $identifier;
+    private string $identifier;
 
     /**
      * The Socket Object
      *
-     * @var object
-     * @access private
+     * @var resource|closed-resource|null
      */
-    var $fsock;
+    public $fsock;
 
     /**
      * Execution Bitmap
      *
      * The bits that are set represent functions that have been called already.  This is used to determine
      * if a requisite function has been successfully executed.  If not, an error should be thrown.
-     *
-     * @var int
-     * @access private
      */
-    var $bitmap = 0;
+    protected int $bitmap = 0;
 
     /**
      * Error information
      *
      * @see self::getErrors()
      * @see self::getLastError()
-     * @var string
-     * @access private
      */
-    var $errors = array();
+    private array $errors = [];
 
     /**
      * Server Identifier
      *
      * @see self::getServerIdentification()
-     * @var array|false
-     * @access private
      */
-    var $server_identifier = false;
+    protected string|false $server_identifier = false;
 
     /**
      * Key Exchange Algorithms
      *
      * @see self::getKexAlgorithims()
-     * @var array|false
-     * @access private
      */
-    var $kex_algorithms = false;
+    private array|false $kex_algorithms = false;
+
+    /**
+     * Key Exchange Algorithm
+     *
+     * @see self::getMethodsNegotiated()
+     */
+    private string|false $kex_algorithm = false;
 
     /**
      * Minimum Diffie-Hellman Group Bit Size in RFC 4419 Key Exchange Methods
      *
      * @see self::_key_exchange()
-     * @var int
-     * @access private
      */
-    var $kex_dh_group_size_min = 1536;
+    private int $kex_dh_group_size_min = 1536;
 
     /**
      * Preferred Diffie-Hellman Group Bit Size in RFC 4419 Key Exchange Methods
      *
      * @see self::_key_exchange()
-     * @var int
-     * @access private
      */
-    var $kex_dh_group_size_preferred = 2048;
+    private int $kex_dh_group_size_preferred = 2048;
 
     /**
      * Maximum Diffie-Hellman Group Bit Size in RFC 4419 Key Exchange Methods
      *
      * @see self::_key_exchange()
-     * @var int
-     * @access private
      */
-    var $kex_dh_group_size_max = 4096;
+    private int $kex_dh_group_size_max = 4096;
 
     /**
      * Server Host Key Algorithms
      *
      * @see self::getServerHostKeyAlgorithms()
+     */
+    private array|false $server_host_key_algorithms = false;
+
+    /**
+     * Supported Private Key Algorithms
+     *
+     * In theory this should be the same as the Server Host Key Algorithms but, in practice,
+     * some servers (eg. Azure) will support rsa-sha2-512 as a server host key algorithm but
+     * not a private key algorithm
+     *
+     * @see self::privatekey_login()
      * @var array|false
-     * @access private
      */
-    var $server_host_key_algorithms = false;
+    private $supported_private_key_algorithms = false;
 
     /**
      * Encryption Algorithms: Client to Server
      *
      * @see self::getEncryptionAlgorithmsClient2Server()
-     * @var array|false
-     * @access private
      */
-    var $encryption_algorithms_client_to_server = false;
+    private array|false $encryption_algorithms_client_to_server = false;
 
     /**
      * Encryption Algorithms: Server to Client
      *
      * @see self::getEncryptionAlgorithmsServer2Client()
-     * @var array|false
-     * @access private
      */
-    var $encryption_algorithms_server_to_client = false;
+    private array|false $encryption_algorithms_server_to_client = false;
 
     /**
      * MAC Algorithms: Client to Server
      *
      * @see self::getMACAlgorithmsClient2Server()
-     * @var array|false
-     * @access private
      */
-    var $mac_algorithms_client_to_server = false;
+    private array|false $mac_algorithms_client_to_server = false;
 
     /**
      * MAC Algorithms: Server to Client
      *
      * @see self::getMACAlgorithmsServer2Client()
-     * @var array|false
-     * @access private
      */
-    var $mac_algorithms_server_to_client = false;
+    private array|false $mac_algorithms_server_to_client = false;
 
     /**
      * Compression Algorithms: Client to Server
      *
      * @see self::getCompressionAlgorithmsClient2Server()
-     * @var array|false
-     * @access private
      */
-    var $compression_algorithms_client_to_server = false;
+    private array|false $compression_algorithms_client_to_server = false;
 
     /**
      * Compression Algorithms: Server to Client
      *
      * @see self::getCompressionAlgorithmsServer2Client()
-     * @var array|false
-     * @access private
      */
-    var $compression_algorithms_server_to_client = false;
+    private array|false $compression_algorithms_server_to_client = false;
 
     /**
      * Languages: Server to Client
-     *
-     * @see self::getLanguagesServer2Client()
-     * @var array|false
-     * @access private
      */
-    var $languages_server_to_client = false;
+    private array|false $languages_server_to_client = false;
 
     /**
      * Languages: Client to Server
+     */
+    private array|false $languages_client_to_server = false;
+
+    /**
+     * Preferred Algorithms
      *
-     * @see self::getLanguagesClient2Server()
-     * @var array|false
-     * @access private
+     * @see self::setPreferredAlgorithms()
      */
-    var $languages_client_to_server = false;
+    private array $preferred = [];
 
     /**
      * Block Size for Server to Client Encryption
@@ -321,273 +354,286 @@ class SSH2
      *  -- http://tools.ietf.org/html/rfc4253#section-6
      *
      * @see self::__construct()
-     * @see self::_send_binary_packet()
-     * @var int
-     * @access private
+     * @see self::send_binary_packet()
      */
-    var $encrypt_block_size = 8;
+    private int $encrypt_block_size = 8;
 
     /**
      * Block Size for Client to Server Encryption
      *
      * @see self::__construct()
-     * @see self::_get_binary_packet()
-     * @var int
-     * @access private
+     * @see self::get_binary_packet()
      */
-    var $decrypt_block_size = 8;
+    private int $decrypt_block_size = 8;
 
     /**
      * Server to Client Encryption Object
      *
-     * @see self::_get_binary_packet()
-     * @var object
-     * @access private
+     * @see self::get_binary_packet()
      */
-    var $decrypt = false;
+    private SymmetricKey|false $decrypt = false;
 
     /**
-     * Client to Server Encryption Object
-     *
-     * @see self::_send_binary_packet()
-     * @var object
-     * @access private
+     * Decryption Algorithm Name
      */
-    var $encrypt = false;
+    private string|null $decryptName;
 
     /**
-     * Client to Server HMAC Object
+     * Decryption Invocation Counter
      *
-     * @see self::_send_binary_packet()
-     * @var object
-     * @access private
+     * Used by GCM
      */
-    var $hmac_create = false;
+    private string|null $decryptInvocationCounter;
 
     /**
-     * Server to Client HMAC Object
+     * Fixed Part of Nonce
      *
-     * @see self::_get_binary_packet()
-     * @var object
-     * @access private
+     * Used by GCM
      */
-    var $hmac_check = false;
+    private string|null $decryptFixedPart;
 
     /**
-     * Size of server to client HMAC
+     * Server to Client Length Encryption Object
      *
-     * We need to know how big the HMAC will be for the server to client direction so that we know how many bytes to read.
-     * For the client to server side, the HMAC object will make the HMAC as long as it needs to be.  All we need to do is
-     * append it.
-     *
-     * @see self::_get_binary_packet()
-     * @var int
-     * @access private
+     * @see self::get_binary_packet()
      */
-    var $hmac_size = false;
+    private SymmetricKey|false $lengthDecrypt = false;
 
     /**
-     * Server Public Host Key
+     * Client to Server Encryption Object
      *
-     * @see self::getServerPublicHostKey()
-     * @var string
-     * @access private
+     * @see self::send_binary_packet()
      */
-    var $server_public_host_key;
+    private SymmetricKey|false $encrypt = false;
 
     /**
-     * Session identifer
-     *
-     * "The exchange hash H from the first key exchange is additionally
-     *  used as the session identifier, which is a unique identifier for
-     *  this connection."
+     * Encryption Algorithm Name
+     */
+    private string|null $encryptName;
+
+    /**
+     * Encryption Invocation Counter
      *
-     *  -- http://tools.ietf.org/html/rfc4253#section-7.2
+     * Used by GCM
+     */
+    private string|null $encryptInvocationCounter;
+
+    /**
+     * Fixed Part of Nonce
      *
-     * @see self::_key_exchange()
-     * @var string
-     * @access private
+     * Used by GCM
      */
-    var $session_id = false;
+    private string|null $encryptFixedPart;
 
     /**
-     * Exchange hash
+     * Client to Server Length Encryption Object
      *
-     * The current exchange hash
+     * @see self::send_binary_packet()
+     */
+    private SymmetricKey|false $lengthEncrypt = false;
+
+    /**
+     * Client to Server HMAC Object
      *
-     * @see self::_key_exchange()
-     * @var string
-     * @access private
+     * @see self::send_binary_packet()
      */
-    var $exchange_hash = false;
+    private Hash|\stdClass|false $hmac_create = false;
 
     /**
-     * Message Numbers
+     * Client to Server HMAC Name
+     */
+    private string|false $hmac_create_name;
+
+    /**
+     * Client to Server ETM
+     */
+    private int|false $hmac_create_etm;
+
+    /**
+     * Server to Client HMAC Object
      *
-     * @see self::__construct()
-     * @var array
-     * @access private
+     * @see self::get_binary_packet()
+     */
+    private Hash|\stdClass|false $hmac_check = false;
+
+    /**
+     * Server to Client HMAC Name
+     */
+    private string|false $hmac_check_name;
+
+    /**
+     * Server to Client ETM
      */
-    var $message_numbers = array();
+    private int|false $hmac_check_etm;
 
     /**
-     * Disconnection Message 'reason codes' defined in RFC4253
+     * Size of server to client HMAC
      *
-     * @see self::__construct()
-     * @var array
-     * @access private
+     * We need to know how big the HMAC will be for the server to client direction so that we know how many bytes to read.
+     * For the client to server side, the HMAC object will make the HMAC as long as it needs to be.  All we need to do is
+     * append it.
+     *
+     * @see self::get_binary_packet()
      */
-    var $disconnect_reasons = array();
+    private int|false $hmac_size = false;
 
     /**
-     * SSH_MSG_CHANNEL_OPEN_FAILURE 'reason codes', defined in RFC4254
+     * Server Public Host Key
      *
-     * @see self::__construct()
-     * @var array
-     * @access private
+     * @see self::getServerPublicHostKey()
      */
-    var $channel_open_failure_reasons = array();
+    private string $server_public_host_key;
 
     /**
-     * Terminal Modes
+     * Session identifier
      *
-     * @link http://tools.ietf.org/html/rfc4254#section-8
-     * @see self::__construct()
-     * @var array
-     * @access private
+     * "The exchange hash H from the first key exchange is additionally
+     *  used as the session identifier, which is a unique identifier for
+     *  this connection."
+     *
+     *  -- http://tools.ietf.org/html/rfc4253#section-7.2
+     *
+     * @see self::key_exchange()
      */
-    var $terminal_modes = array();
+    private string|false $session_id = false;
 
     /**
-     * SSH_MSG_CHANNEL_EXTENDED_DATA's data_type_codes
+     * Exchange hash
      *
-     * @link http://tools.ietf.org/html/rfc4254#section-5.2
-     * @see self::__construct()
-     * @var array
-     * @access private
+     * The current exchange hash
+     *
+     * @see self::key_exchange()
      */
-    var $channel_extended_data_type_codes = array();
+    private string|false $exchange_hash = false;
 
     /**
      * Send Sequence Number
      *
      * See 'Section 6.4.  Data Integrity' of rfc4253 for more info.
      *
-     * @see self::_send_binary_packet()
-     * @var int
-     * @access private
+     * @see self::send_binary_packet()
      */
-    var $send_seq_no = 0;
+    private int $send_seq_no = 0;
 
     /**
      * Get Sequence Number
      *
      * See 'Section 6.4.  Data Integrity' of rfc4253 for more info.
      *
-     * @see self::_get_binary_packet()
-     * @var int
-     * @access private
+     * @see self::get_binary_packet()
      */
-    var $get_seq_no = 0;
+    private int $get_seq_no = 0;
 
     /**
      * Server Channels
      *
      * Maps client channels to server channels
      *
-     * @see self::_get_channel_packet()
+     * @see self::get_channel_packet()
      * @see self::exec()
-     * @var array
-     * @access private
      */
-    var $server_channels = array();
+    protected array $server_channels = [];
 
     /**
-     * Channel Buffers
+     * Channel Read Buffers
      *
      * If a client requests a packet from one channel but receives two packets from another those packets should
      * be placed in a buffer
      *
-     * @see self::_get_channel_packet()
+     * @see self::get_channel_packet()
      * @see self::exec()
+     */
+    private array $channel_buffers = [];
+
+    /**
+     * Channel Write Buffers
+     *
+     * If a client sends a packet and receives a timeout error mid-transmission, buffer the data written so it
+     * can be de-duplicated upon resuming write
+     *
+     * @see self::send_channel_packet()
      * @var array
-     * @access private
      */
-    var $channel_buffers = array();
+    private $channel_buffers_write = [];
 
     /**
      * Channel Status
      *
      * Contains the type of the last sent message
      *
-     * @see self::_get_channel_packet()
-     * @var array
-     * @access private
+     * @see self::get_channel_packet()
+     */
+    protected array $channel_status = [];
+
+    /**
+     * The identifier of the interactive channel which was opened most recently
+     *
+     * @see self::getInteractiveChannelId()
      */
-    var $channel_status = array();
+    private int $channel_id_last_interactive = 0;
 
     /**
      * Packet Size
      *
      * Maximum packet size indexed by channel
      *
-     * @see self::_send_channel_packet()
-     * @var array
-     * @access private
+     * @see self::send_channel_packet()
      */
-    var $packet_size_client_to_server = array();
+    private array $packet_size_client_to_server = [];
 
     /**
      * Message Number Log
      *
      * @see self::getLog()
-     * @var array
-     * @access private
      */
-    var $message_number_log = array();
+    private array $message_number_log = [];
 
     /**
      * Message Log
      *
      * @see self::getLog()
-     * @var array
-     * @access private
      */
-    var $message_log = array();
+    private array $message_log = [];
 
     /**
      * The Window Size
      *
      * Bytes the other party can send before it must wait for the window to be adjusted (0x7FFFFFFF = 2GB)
      *
-     * @var int
+     * @see self::send_channel_packet()
+     * @see self::exec()
+     */
+    protected int $window_size = 0x7FFFFFFF;
+
+    /**
+     * What we resize the window to
+     *
+     * When PuTTY resizes the window it doesn't add an additional 0x7FFFFFFF bytes - it adds 0x40000000 bytes.
+     * Some SFTP clients (GoAnywhere) don't support adding 0x7FFFFFFF to the window size after the fact so
+     * we'll just do what PuTTY does
+     *
      * @see self::_send_channel_packet()
      * @see self::exec()
-     * @access private
      */
-    var $window_size = 0x7FFFFFFF;
+    private int $window_resize = 0x40000000;
 
     /**
      * Window size, server to client
      *
      * Window size indexed by channel
      *
-     * @see self::_send_channel_packet()
-     * @var array
-     * @access private
+     * @see self::send_channel_packet()
      */
-    var $window_size_server_to_client = array();
+    protected array $window_size_server_to_client = [];
 
     /**
      * Window size, client to server
      *
      * Window size indexed by channel
      *
-     * @see self::_get_channel_packet()
-     * @var array
-     * @access private
+     * @see self::get_channel_packet()
      */
-    var $window_size_client_to_server = array();
+    private array $window_size_client_to_server = [];
 
     /**
      * Server signature
@@ -595,10 +641,8 @@ class SSH2
      * Verified against $this->session_id
      *
      * @see self::getServerPublicHostKey()
-     * @var string
-     * @access private
      */
-    var $signature = '';
+    private string $signature = '';
 
     /**
      * Server signature format
@@ -606,19 +650,15 @@ class SSH2
      * ssh-rsa or ssh-dss.
      *
      * @see self::getServerPublicHostKey()
-     * @var string
-     * @access private
      */
-    var $signature_format = '';
+    private string $signature_format = '';
 
     /**
      * Interactive Buffer
      *
      * @see self::read()
-     * @var array
-     * @access private
      */
-    var $interactiveBuffer = '';
+    private string $interactiveBuffer = '';
 
     /**
      * Current log size
@@ -627,136 +667,101 @@ class SSH2
      *
      * @see self::_send_binary_packet()
      * @see self::_get_binary_packet()
-     * @var int
-     * @access private
      */
-    var $log_size;
+    private int $log_size;
 
     /**
      * Timeout
      *
-     * @see self::setTimeout()
-     * @access private
+     * @see SSH2::setTimeout()
      */
-    var $timeout;
+    protected int|null $timeout = null;
 
     /**
      * Current Timeout
      *
-     * @see self::_get_channel_packet()
-     * @access private
+     * @see SSH2::get_channel_packet()
+     */
+    protected int|float|null $curTimeout = null;
+
+    /**
+     * Keep Alive Interval
+     *
+     * @see self::setKeepAlive()
      */
-    var $curTimeout;
+    private int|null $keepAlive = null;
 
     /**
      * Real-time log file pointer
      *
      * @see self::_append_log()
-     * @var resource
-     * @access private
+     * @var resource|closed-resource
      */
-    var $realtime_log_file;
+    private $realtime_log_file;
 
     /**
      * Real-time log file size
      *
      * @see self::_append_log()
-     * @var int
-     * @access private
      */
-    var $realtime_log_size;
+    private int $realtime_log_size;
 
     /**
      * Has the signature been validated?
      *
      * @see self::getServerPublicHostKey()
-     * @var bool
-     * @access private
      */
-    var $signature_validated = false;
+    private bool $signature_validated = false;
 
     /**
      * Real-time log file wrap boolean
      *
      * @see self::_append_log()
-     * @access private
      */
-    var $realtime_log_wrap;
+    private bool $realtime_log_wrap;
 
     /**
      * Flag to suppress stderr from output
      *
      * @see self::enableQuietMode()
-     * @access private
      */
-    var $quiet_mode = false;
+    private bool $quiet_mode = false;
 
     /**
-     * Time of first network activity
-     *
-     * @var int
-     * @access private
+     * Time of last read/write network activity
      */
-    var $last_packet;
+    private float|null $last_packet = null;
 
     /**
      * Exit status returned from ssh if any
-     *
-     * @var int
-     * @access private
      */
-    var $exit_status;
+    private int|null $exit_status = null;
 
     /**
      * Flag to request a PTY when using exec()
      *
-     * @var bool
      * @see self::enablePTY()
-     * @access private
-     */
-    var $request_pty = false;
-
-    /**
-     * Flag set while exec() is running when using enablePTY()
-     *
-     * @var bool
-     * @access private
-     */
-    var $in_request_pty_exec = false;
-
-    /**
-     * Flag set after startSubsystem() is called
-     *
-     * @var bool
-     * @access private
      */
-    var $in_subsystem;
+    private bool $request_pty = false;
 
     /**
      * Contents of stdError
-     *
-     * @var string
-     * @access private
      */
-    var $stdErrorLog;
+    private string $stdErrorLog;
 
     /**
      * The Last Interactive Response
      *
      * @see self::_keyboard_interactive_process()
-     * @var string
-     * @access private
      */
-    var $last_interactive_response = '';
+    private string $last_interactive_response = '';
 
     /**
      * Keyboard Interactive Request / Responses
      *
      * @see self::_keyboard_interactive_process()
-     * @var array
-     * @access private
      */
-    var $keyboard_requests_responses = array();
+    private array $keyboard_requests_responses = [];
 
     /**
      * Banner Message
@@ -766,66 +771,52 @@ class SSH2
      *
      * @see self::_filter()
      * @see self::getBannerMessage()
-     * @var string
-     * @access private
      */
-    var $banner_message = '';
+    private string $banner_message = '';
 
     /**
      * Did read() timeout or return normally?
      *
      * @see self::isTimeout()
-     * @var bool
-     * @access private
      */
-    var $is_timeout = false;
+    protected bool $is_timeout = false;
 
     /**
      * Log Boundary
      *
      * @see self::_format_log()
-     * @var string
-     * @access private
      */
-    var $log_boundary = ':';
+    private string $log_boundary = ':';
 
     /**
      * Log Long Width
      *
      * @see self::_format_log()
-     * @var int
-     * @access private
      */
-    var $log_long_width = 65;
+    private int $log_long_width = 65;
 
     /**
      * Log Short Width
      *
      * @see self::_format_log()
-     * @var int
-     * @access private
      */
-    var $log_short_width = 16;
+    private int $log_short_width = 16;
 
     /**
      * Hostname
      *
      * @see self::__construct()
      * @see self::_connect()
-     * @var string
-     * @access private
      */
-    var $host;
+    private string $host;
 
     /**
      * Port Number
      *
      * @see self::__construct()
-     * @see self::_connect()
-     * @var int
-     * @access private
+     * @see self::connect()
      */
-    var $port;
+    private int $port;
 
     /**
      * Number of columns for terminal window size
@@ -833,10 +824,8 @@ class SSH2
      * @see self::getWindowColumns()
      * @see self::setWindowColumns()
      * @see self::setWindowSize()
-     * @var int
-     * @access private
      */
-    var $windowColumns = 80;
+    private int $windowColumns = 80;
 
     /**
      * Number of columns for terminal window size
@@ -844,141 +833,200 @@ class SSH2
      * @see self::getWindowRows()
      * @see self::setWindowRows()
      * @see self::setWindowSize()
-     * @var int
-     * @access private
      */
-    var $windowRows = 24;
+    private int $windowRows = 24;
 
     /**
      * Crypto Engine
      *
      * @see self::setCryptoEngine()
      * @see self::_key_exchange()
+     */
+    private static int|false $crypto_engine = false;
+
+    /**
+     * A System_SSH_Agent for use in the SSH2 Agent Forwarding scenario
+     */
+    private Agent $agent;
+
+    /**
+     * Connection storage to replicates ssh2 extension functionality:
+     * {@link http://php.net/manual/en/wrappers.ssh2.php#refsect1-wrappers.ssh2-examples}
+     *
+     * @var array<string, \WeakReference<SSH2>>
+     */
+    private static array $connections;
+
+    /**
+     * Send the identification string first?
+     */
+    private bool $send_id_string_first = true;
+
+    /**
+     * Send the key exchange initiation packet first?
+     */
+    private bool $send_kex_first = true;
+
+    /**
+     * Some versions of OpenSSH incorrectly calculate the key size
+     */
+    private bool $bad_key_size_fix = false;
+
+    /**
+     * Should we try to re-connect to re-establish keys?
+     */
+    private bool $login_credentials_finalized = false;
+
+    /**
+     * Binary Packet Buffer
+     */
+    private object|null $binary_packet_buffer = null;
+
+    /**
+     * Authentication Credentials
+     */
+    protected array $auth = [];
+
+    /**
+     * Terminal
+     */
+    private string $term = 'vt100';
+
+    /**
+     * The authentication methods that may productively continue authentication.
+     *
+     * @see https://tools.ietf.org/html/rfc4252#section-5.1
+     */
+    private array|null $auth_methods_to_continue = null;
+
+    /**
+     * Compression method
+     */
+    private int $compress = self::NET_SSH2_COMPRESSION_NONE;
+
+    /**
+     * Decompression method
+     */
+    private int $decompress = self::NET_SSH2_COMPRESSION_NONE;
+
+    /**
+     * Compression context
+     *
+     * @var resource|false|null
+     */
+    private $compress_context;
+
+    /**
+     * Decompression context
+     *
+     * @var resource|object
+     */
+    private $decompress_context;
+
+    /**
+     * Regenerate Compression Context
+     */
+    private bool $regenerate_compression_context = false;
+
+    /**
+     * Regenerate Decompression Context
+     */
+    private bool $regenerate_decompression_context = false;
+
+    /**
+     * Smart multi-factor authentication flag
+     */
+    private bool $smartMFA = true;
+
+    /**
+     * How many channels are currently opened
+     *
      * @var int
+     */
+    private $channelCount = 0;
+
+    /**
+     * Does the server support multiple channels? If not then error out
+     * when multiple channels are attempted to be opened
+     *
+     * @var bool
+     */
+    private $errorOnMultipleChannels;
+
+    /**
+     * Bytes Transferred Since Last Key Exchange
+     *
+     * Includes outbound and inbound totals
+     *
+     * @var int
+     */
+    private $bytesTransferredSinceLastKEX = 0;
+
+    /**
+     * After how many transferred byte should phpseclib initiate a key re-exchange?
+     *
+     * @var int
+     */
+    private $doKeyReexchangeAfterXBytes = 1024 * 1024 * 1024;
+
+    /**
+     * Has a key re-exchange been initialized?
+     *
+     * @var bool
      * @access private
      */
-    var $crypto_engine = false;
+    private $keyExchangeInProgress = false;
 
     /**
-     * A System_SSH_Agent for use in the SSH2 Agent Forwarding scenario
+     * KEX Buffer
+     *
+     * If we're in the middle of a key exchange we want to buffer any additional packets we get until
+     * the key exchange is over
      *
-     * @var System_SSH_Agent
+     * @see self::_get_binary_packet()
+     * @see self::_key_exchange()
+     * @see self::exec()
+     * @var array
      * @access private
      */
-    var $agent;
+    private $kex_buffer = [];
 
     /**
-     * Connection storage to replicates ssh2 extension functionality:
-     * {@link http://php.net/manual/en/wrappers.ssh2.php#refsect1-wrappers.ssh2-examples}
+     * Strict KEX Flag
+     *
+     * If kex-strict-s-v00@openssh.com is present in the first KEX packet it need not
+     * be present in subsequent packet
      *
-     * @var SSH2[]
+     * @see self::_key_exchange()
+     * @see self::exec()
+     * @var array
+     * @access private
      */
-    static $connections;
+    private $strict_kex_flag = false;
 
     /**
      * Default Constructor.
      *
      * $host can either be a string, representing the host, or a stream resource.
+     * If $host is a stream resource then $port doesn't do anything, altho $timeout
+     * still will be used
      *
-     * @param mixed $host
-     * @param int $port
-     * @param int $timeout
      * @see self::login()
-     * @return \phpseclib\Net\SSH2
-     * @access public
      */
-    function __construct($host, $port = 22, $timeout = 10)
+    public function __construct($host, int $port = 22, int $timeout = 10)
     {
-        $this->message_numbers = array(
-            1 => 'NET_SSH2_MSG_DISCONNECT',
-            2 => 'NET_SSH2_MSG_IGNORE',
-            3 => 'NET_SSH2_MSG_UNIMPLEMENTED',
-            4 => 'NET_SSH2_MSG_DEBUG',
-            5 => 'NET_SSH2_MSG_SERVICE_REQUEST',
-            6 => 'NET_SSH2_MSG_SERVICE_ACCEPT',
-            20 => 'NET_SSH2_MSG_KEXINIT',
-            21 => 'NET_SSH2_MSG_NEWKEYS',
-            30 => 'NET_SSH2_MSG_KEXDH_INIT',
-            31 => 'NET_SSH2_MSG_KEXDH_REPLY',
-            50 => 'NET_SSH2_MSG_USERAUTH_REQUEST',
-            51 => 'NET_SSH2_MSG_USERAUTH_FAILURE',
-            52 => 'NET_SSH2_MSG_USERAUTH_SUCCESS',
-            53 => 'NET_SSH2_MSG_USERAUTH_BANNER',
-
-            80 => 'NET_SSH2_MSG_GLOBAL_REQUEST',
-            81 => 'NET_SSH2_MSG_REQUEST_SUCCESS',
-            82 => 'NET_SSH2_MSG_REQUEST_FAILURE',
-            90 => 'NET_SSH2_MSG_CHANNEL_OPEN',
-            91 => 'NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION',
-            92 => 'NET_SSH2_MSG_CHANNEL_OPEN_FAILURE',
-            93 => 'NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST',
-            94 => 'NET_SSH2_MSG_CHANNEL_DATA',
-            95 => 'NET_SSH2_MSG_CHANNEL_EXTENDED_DATA',
-            96 => 'NET_SSH2_MSG_CHANNEL_EOF',
-            97 => 'NET_SSH2_MSG_CHANNEL_CLOSE',
-            98 => 'NET_SSH2_MSG_CHANNEL_REQUEST',
-            99 => 'NET_SSH2_MSG_CHANNEL_SUCCESS',
-            100 => 'NET_SSH2_MSG_CHANNEL_FAILURE'
-        );
-        $this->disconnect_reasons = array(
-            1 => 'NET_SSH2_DISCONNECT_HOST_NOT_ALLOWED_TO_CONNECT',
-            2 => 'NET_SSH2_DISCONNECT_PROTOCOL_ERROR',
-            3 => 'NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED',
-            4 => 'NET_SSH2_DISCONNECT_RESERVED',
-            5 => 'NET_SSH2_DISCONNECT_MAC_ERROR',
-            6 => 'NET_SSH2_DISCONNECT_COMPRESSION_ERROR',
-            7 => 'NET_SSH2_DISCONNECT_SERVICE_NOT_AVAILABLE',
-            8 => 'NET_SSH2_DISCONNECT_PROTOCOL_VERSION_NOT_SUPPORTED',
-            9 => 'NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE',
-            10 => 'NET_SSH2_DISCONNECT_CONNECTION_LOST',
-            11 => 'NET_SSH2_DISCONNECT_BY_APPLICATION',
-            12 => 'NET_SSH2_DISCONNECT_TOO_MANY_CONNECTIONS',
-            13 => 'NET_SSH2_DISCONNECT_AUTH_CANCELLED_BY_USER',
-            14 => 'NET_SSH2_DISCONNECT_NO_MORE_AUTH_METHODS_AVAILABLE',
-            15 => 'NET_SSH2_DISCONNECT_ILLEGAL_USER_NAME'
-        );
-        $this->channel_open_failure_reasons = array(
-            1 => 'NET_SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED'
-        );
-        $this->terminal_modes = array(
-            0 => 'NET_SSH2_TTY_OP_END'
-        );
-        $this->channel_extended_data_type_codes = array(
-            1 => 'NET_SSH2_EXTENDED_DATA_STDERR'
-        );
+        self::$connections[$this->getResourceId()] = \WeakReference::create($this);
 
-        $this->_define_array(
-            $this->message_numbers,
-            $this->disconnect_reasons,
-            $this->channel_open_failure_reasons,
-            $this->terminal_modes,
-            $this->channel_extended_data_type_codes,
-            array(60 => 'NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ'),
-            array(60 => 'NET_SSH2_MSG_USERAUTH_PK_OK'),
-            array(60 => 'NET_SSH2_MSG_USERAUTH_INFO_REQUEST',
-                  61 => 'NET_SSH2_MSG_USERAUTH_INFO_RESPONSE'),
-            // RFC 4419 - diffie-hellman-group-exchange-sha{1,256}
-            array(30 => 'NET_SSH2_MSG_KEXDH_GEX_REQUEST_OLD',
-                  31 => 'NET_SSH2_MSG_KEXDH_GEX_GROUP',
-                  32 => 'NET_SSH2_MSG_KEXDH_GEX_INIT',
-                  33 => 'NET_SSH2_MSG_KEXDH_GEX_REPLY',
-                  34 => 'NET_SSH2_MSG_KEXDH_GEX_REQUEST'),
-            // RFC 5656 - Elliptic Curves (for curve25519-sha256@libssh.org)
-            array(30 => 'NET_SSH2_MSG_KEX_ECDH_INIT',
-                  31 => 'NET_SSH2_MSG_KEX_ECDH_REPLY')
-        );
-
-        self::$connections[$this->getResourceId()] = $this;
+        $this->timeout = $timeout;
 
         if (is_resource($host)) {
             $this->fsock = $host;
             return;
         }
 
-        if (is_string($host)) {
+        if (Strings::is_stringable($host)) {
             $this->host = $host;
             $this->port = $port;
-            $this->timeout = $timeout;
         }
     }
 
@@ -986,50 +1034,135 @@ function __construct($host, $port = 22, $timeout = 10)
      * Set Crypto Engine Mode
      *
      * Possible $engine values:
-     * CRYPT_MODE_INTERNAL, CRYPT_MODE_MCRYPT
+     * OpenSSL, Eval, PHP
+     */
+    public static function setCryptoEngine(int $engine): void
+    {
+        self::$crypto_engine = $engine;
+    }
+
+    /**
+     * Send Identification String First
      *
-     * @param int $engine
-     * @access private
+     * https://tools.ietf.org/html/rfc4253#section-4.2 says "when the connection has been established,
+     * both sides MUST send an identification string". It does not say which side sends it first. In
+     * theory it shouldn't matter but it is a fact of life that some SSH servers are simply buggy
+     */
+    public function sendIdentificationStringFirst(): void
+    {
+        $this->send_id_string_first = true;
+    }
+
+    /**
+     * Send Identification String Last
+     *
+     * https://tools.ietf.org/html/rfc4253#section-4.2 says "when the connection has been established,
+     * both sides MUST send an identification string". It does not say which side sends it first. In
+     * theory it shouldn't matter but it is a fact of life that some SSH servers are simply buggy
+     */
+    public function sendIdentificationStringLast(): void
+    {
+        $this->send_id_string_first = false;
+    }
+
+    /**
+     * Send SSH_MSG_KEXINIT First
+     *
+     * https://tools.ietf.org/html/rfc4253#section-7.1 says "key exchange begins by each sending
+     * sending the [SSH_MSG_KEXINIT] packet". It does not say which side sends it first. In theory
+     * it shouldn't matter but it is a fact of life that some SSH servers are simply buggy
      */
-    function setCryptoEngine($engine)
+    public function sendKEXINITFirst(): void
     {
-        $this->crypto_engine = $engine;
+        $this->send_kex_first = true;
+    }
+
+    /**
+     * Send SSH_MSG_KEXINIT Last
+     *
+     * https://tools.ietf.org/html/rfc4253#section-7.1 says "key exchange begins by each sending
+     * sending the [SSH_MSG_KEXINIT] packet". It does not say which side sends it first. In theory
+     * it shouldn't matter but it is a fact of life that some SSH servers are simply buggy
+     */
+    public function sendKEXINITLast(): void
+    {
+        $this->send_kex_first = false;
+    }
+
+    /**
+     * stream_select wrapper
+     *
+     * Quoting https://stackoverflow.com/a/14262151/569976,
+     * "The general approach to `EINTR` is to simply handle the error and retry the operation again"
+     *
+     * This wrapper does that loop
+     */
+    private static function stream_select(&$read, &$write, &$except, $seconds, $microseconds = null)
+    {
+        $remaining = $seconds + $microseconds / 1000000;
+        $start = microtime(true);
+        while (true) {
+            $result = @stream_select($read, $write, $except, $seconds, $microseconds);
+            if ($result !== false) {
+                return $result;
+            }
+            $elapsed = microtime(true) - $start;
+            $seconds = (int) ($remaining - floor($elapsed));
+            $microseconds = (int) (1000000 * ($remaining - $seconds));
+            if ($elapsed >= $remaining) {
+                return false;
+            }
+        }
     }
 
     /**
      * Connect to an SSHv2 server
      *
-     * @return bool
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @throws \RuntimeException on other errors
-     * @access private
+     * @throws UnexpectedValueException on receipt of unexpected packets
+     * @throws RuntimeException on other errors
      */
-    function _connect()
+    private function connect()
     {
         if ($this->bitmap & self::MASK_CONSTRUCTOR) {
-            return false;
+            return;
         }
 
         $this->bitmap |= self::MASK_CONSTRUCTOR;
 
         $this->curTimeout = $this->timeout;
 
-        $this->last_packet = microtime(true);
-
         if (!is_resource($this->fsock)) {
             $start = microtime(true);
-            $this->fsock = @fsockopen($this->host, $this->port, $errno, $errstr, $this->curTimeout);
+            // with stream_select a timeout of 0 means that no timeout takes place;
+            // with fsockopen a timeout of 0 means that you instantly timeout
+            // to resolve this incompatibility a timeout of 100,000 will be used for fsockopen if timeout is 0
+            $this->fsock = @fsockopen($this->host, $this->port, $errno, $errstr, $this->curTimeout == 0 ? 100000 : $this->curTimeout);
             if (!$this->fsock) {
                 $host = $this->host . ':' . $this->port;
-                throw new \RuntimeException(rtrim("Cannot connect to $host. Error $errno. $errstr"));
+                throw new UnableToConnectException(rtrim("Cannot connect to $host. Error $errno. $errstr"));
             }
             $elapsed = microtime(true) - $start;
 
-            $this->curTimeout-= $elapsed;
+            if ($this->curTimeout) {
+                $this->curTimeout -= $elapsed;
+                if ($this->curTimeout < 0) {
+                    throw new RuntimeException('Connection timed out whilst attempting to open socket connection');
+                }
+            }
+
+            if (defined('NET_SSH2_LOGGING')) {
+                $this->append_log('(fsockopen took ' . round($elapsed, 4) . 's)', '');
+            }
+        }
 
-            if ($this->curTimeout <= 0) {
-                $this->is_timeout = true;
-                return false;
+        $this->identifier = $this->generate_identifier();
+
+        if ($this->send_id_string_first) {
+            $start = microtime(true);
+            fwrite($this->fsock, $this->identifier . "\r\n");
+            $elapsed = round(microtime(true) - $start, 4);
+            if (defined('NET_SSH2_LOGGING')) {
+                $this->append_log("-> (network: $elapsed)", $this->identifier . "\r\n");
             }
         }
 
@@ -1040,73 +1173,100 @@ function _connect()
            Feed.  Such lines MUST NOT begin with "SSH-", and SHOULD be encoded
            in ISO-10646 UTF-8 [RFC3629] (language is not specified).  Clients
            MUST be able to process such lines." */
-        $temp = '';
-        $extra = '';
-        while (!feof($this->fsock) && !preg_match('#^SSH-(\d\.\d+)#', $temp, $matches)) {
-            if (substr($temp, -2) == "\r\n") {
-                $extra.= $temp;
-                $temp = '';
-            }
+        $data = '';
+        $totalElapsed = 0;
+        while (!feof($this->fsock) && !preg_match('#(.*)^(SSH-(\d\.\d+).*)#ms', $data, $matches)) {
+            $line = '';
+            while (true) {
+                if ($this->curTimeout) {
+                    if ($this->curTimeout < 0) {
+                        throw new RuntimeException('Connection timed out whilst receiving server identification string');
+                    }
+                    $read = [$this->fsock];
+                    $write = $except = null;
+                    $start = microtime(true);
+                    $sec = (int) floor($this->curTimeout);
+                    $usec = (int) (1000000 * ($this->curTimeout - $sec));
+                    if (static::stream_select($read, $write, $except, $sec, $usec) === false) {
+                        throw new RuntimeException('Connection timed out whilst receiving server identification string');
+                    }
+                    $elapsed = microtime(true) - $start;
+                    $totalElapsed += $elapsed;
+                    $this->curTimeout -= $elapsed;
+                }
 
-            if ($this->curTimeout) {
-                if ($this->curTimeout < 0) {
-                    $this->is_timeout = true;
-                    return false;
+                $temp = stream_get_line($this->fsock, 255, "\n");
+                if ($temp === false) {
+                    throw new RuntimeException('Error reading SSH identification string; are you sure you\'re connecting to an SSH server?');
                 }
-                $read = array($this->fsock);
-                $write = $except = null;
-                $start = microtime(true);
-                $sec = floor($this->curTimeout);
-                $usec = 1000000 * ($this->curTimeout - $sec);
-                // on windows this returns a "Warning: Invalid CRT parameters detected" error
-                // the !count() is done as a workaround for <https://bugs.php.net/42682>
-                if (!@stream_select($read, $write, $except, $sec, $usec) && !count($read)) {
-                    $this->is_timeout = true;
-                    return false;
+
+                $line .= $temp;
+                if (strlen($temp) == 255) {
+                    continue;
                 }
-                $elapsed = microtime(true) - $start;
-                $this->curTimeout-= $elapsed;
+
+                $line .= "\n";
+
+                break;
             }
 
-            $temp.= fgets($this->fsock, 255);
+            $data .= $line;
         }
 
-        if (feof($this->fsock)) {
-            throw new \RuntimeException('Connection closed by server');
+        if (defined('NET_SSH2_LOGGING')) {
+            $this->append_log('<- (network: ' . round($totalElapsed, 4) . ')', $line);
         }
 
-        $this->identifier = $this->_generate_identifier();
-
-        if (defined('NET_SSH2_LOGGING')) {
-            $this->_append_log('<-', $extra . $temp);
-            $this->_append_log('->', $this->identifier . "\r\n");
+        if (feof($this->fsock)) {
+            $this->bitmap = 0;
+            throw new ConnectionClosedException('Connection closed by server; are you sure you\'re connected to an SSH server?');
         }
 
-        $this->server_identifier = trim($temp, "\r\n");
+        $extra = $matches[1];
+
+        $this->server_identifier = trim($data, "\r\n");
         if (strlen($extra)) {
-            $this->errors[] = utf8_decode($extra);
+            $this->errors[] = $data;
         }
 
-        if ($matches[1] != '1.99' && $matches[1] != '2.0') {
-            throw new \RuntimeException("Cannot connect to SSH $matches[1] servers");
+        if (version_compare($matches[3], '1.99', '<')) {
+            $this->bitmap = 0;
+            throw new UnableToConnectException("Cannot connect to SSH $matches[3] servers");
+        }
+
+        // Ubuntu's OpenSSH from 5.8 to 6.9 didn't work with multiple channels. see
+        // https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/1334916 for more info.
+        // https://lists.ubuntu.com/archives/oneiric-changes/2011-July/005772.html discusses
+        // when consolekit was incorporated.
+        // https://marc.info/?l=openssh-unix-dev&m=163409903417589&w=2 discusses some of the
+        // issues with how Ubuntu incorporated consolekit
+        $pattern = '#^SSH-2\.0-OpenSSH_([\d.]+)[^ ]* Ubuntu-.*$#';
+        $match = preg_match($pattern, $this->server_identifier, $matches);
+        $match = $match && version_compare('5.8', $matches[1], '<=');
+        $match = $match && version_compare('6.9', $matches[1], '>=');
+        $this->errorOnMultipleChannels = $match;
+
+        if (!$this->send_id_string_first) {
+            $start = microtime(true);
+            fwrite($this->fsock, $this->identifier . "\r\n");
+            $elapsed = round(microtime(true) - $start, 4);
+            if (defined('NET_SSH2_LOGGING')) {
+                $this->append_log("-> (network: $elapsed)", $this->identifier . "\r\n");
+            }
         }
 
-        fputs($this->fsock, $this->identifier . "\r\n");
-
-        $response = $this->_get_binary_packet();
-        if ($response === false) {
-            throw new \RuntimeException('Connection closed by server');
-        }
+        $this->last_packet = microtime(true);
 
-        if (ord($response[0]) != NET_SSH2_MSG_KEXINIT) {
-            throw new \UnexpectedValueException('Expected SSH_MSG_KEXINIT');
+        if (!$this->send_kex_first) {
+            $response = $this->get_binary_packet_or_close(MessageType::KEXINIT);
+            $this->key_exchange($response);
         }
 
-        if (!$this->_key_exchange($response)) {
-            return false;
+        if ($this->send_kex_first) {
+            $this->key_exchange();
         }
 
-        $this->bitmap|= self::MASK_CONNECTED;
+        $this->bitmap |= self::MASK_CONNECTED;
 
         return true;
     }
@@ -1115,23 +1275,18 @@ function _connect()
      * Generates the SSH identifier
      *
      * You should overwrite this method in your own class if you want to use another identifier
-     *
-     * @access protected
-     * @return string
      */
-    function _generate_identifier()
+    private function generate_identifier(): string
     {
-        $identifier = 'SSH-2.0-phpseclib_2.0';
+        $identifier = 'SSH-2.0-phpseclib_3.0';
 
-        $ext = array();
-        if (extension_loaded('libsodium')) {
+        $ext = [];
+        if (extension_loaded('sodium')) {
             $ext[] = 'libsodium';
         }
 
         if (extension_loaded('openssl')) {
             $ext[] = 'openssl';
-        } elseif (extension_loaded('mcrypt')) {
-            $ext[] = 'mcrypt';
         }
 
         if (extension_loaded('gmp')) {
@@ -1150,256 +1305,240 @@ function _generate_identifier()
     /**
      * Key Exchange
      *
-     * @param string $kexinit_payload_server
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @throws \RuntimeException on other errors
-     * @throws \phpseclib\Exception\NoSupportedAlgorithmsException when none of the algorithms phpseclib has loaded are compatible
-     * @access private
+     * @param string|bool $kexinit_payload_server optional
+     * @throws UnexpectedValueException on receipt of unexpected packets
+     * @throws RuntimeException on other errors
+     * @throws NoSupportedAlgorithmsException when none of the algorithms phpseclib has loaded are compatible
      */
-    function _key_exchange($kexinit_payload_server)
+    private function key_exchange($kexinit_payload_server = false): bool
     {
-        $kex_algorithms = array(
-            // Elliptic Curve Diffie-Hellman Key Agreement (ECDH) using
-            // Curve25519. See doc/curve25519-sha256@libssh.org.txt in the
-            // libssh repository for more information.
-            'curve25519-sha256@libssh.org',
+        $this->bytesTransferredSinceLastKEX = 0;
+
+        $preferred = $this->preferred;
+        // for the initial key exchange $send_kex is true (no key re-exchange has been started)
+        // for phpseclib initiated key exchanges $send_kex is false
+        $send_kex = !$this->keyExchangeInProgress;
+        $this->keyExchangeInProgress = true;
+
+        $kex_algorithms = $preferred['kex'] ??
+            SSH2::getSupportedKEXAlgorithms();
+        $server_host_key_algorithms = $preferred['hostkey'] ??
+            SSH2::getSupportedHostKeyAlgorithms();
+        $s2c_encryption_algorithms = $preferred['server_to_client']['crypt'] ??
+            SSH2::getSupportedEncryptionAlgorithms();
+        $c2s_encryption_algorithms = $preferred['client_to_server']['crypt'] ??
+            SSH2::getSupportedEncryptionAlgorithms();
+        $s2c_mac_algorithms = $preferred['server_to_client']['mac'] ??
+            SSH2::getSupportedMACAlgorithms();
+        $c2s_mac_algorithms = $preferred['client_to_server']['mac'] ??
+            SSH2::getSupportedMACAlgorithms();
+        $s2c_compression_algorithms = $preferred['server_to_client']['comp'] ??
+            SSH2::getSupportedCompressionAlgorithms();
+        $c2s_compression_algorithms = $preferred['client_to_server']['comp'] ??
+            SSH2::getSupportedCompressionAlgorithms();
+
+        $kex_algorithms = array_merge($kex_algorithms, ['ext-info-c', 'kex-strict-c-v00@openssh.com']);
 
-            // Diffie-Hellman Key Agreement (DH) using integer modulo prime
-            // groups.
-            'diffie-hellman-group1-sha1', // REQUIRED
-            'diffie-hellman-group14-sha1', // REQUIRED
-            'diffie-hellman-group-exchange-sha1', // RFC 4419
-            'diffie-hellman-group-exchange-sha256', // RFC 4419
-        );
-        if (!class_exists('\Sodium')) {
-            $kex_algorithms = array_diff(
-                $kex_algorithms,
-                array('curve25519-sha256@libssh.org')
-            );
+        // some SSH servers have buggy implementations of some of the above algorithms
+        switch (true) {
+            case $this->server_identifier == 'SSH-2.0-SSHD':
+            case substr($this->server_identifier, 0, 13) == 'SSH-2.0-DLINK':
+                if (!isset($preferred['server_to_client']['mac'])) {
+                    $s2c_mac_algorithms = array_values(array_diff(
+                        $s2c_mac_algorithms,
+                        ['hmac-sha1-96', 'hmac-md5-96']
+                    ));
+                }
+                if (!isset($preferred['client_to_server']['mac'])) {
+                    $c2s_mac_algorithms = array_values(array_diff(
+                        $c2s_mac_algorithms,
+                        ['hmac-sha1-96', 'hmac-md5-96']
+                    ));
+                }
+                break;
+            case substr($this->server_identifier, 0, 24) == 'SSH-2.0-TurboFTP_SERVER_':
+                if (!isset($preferred['server_to_client']['crypt'])) {
+                    $s2c_encryption_algorithms = array_values(array_diff(
+                        $s2c_encryption_algorithms,
+                        ['aes128-gcm@openssh.com', 'aes256-gcm@openssh.com']
+                    ));
+                }
+                if (!isset($preferred['client_to_server']['crypt'])) {
+                    $c2s_encryption_algorithms = array_values(array_diff(
+                        $c2s_encryption_algorithms,
+                        ['aes128-gcm@openssh.com', 'aes256-gcm@openssh.com']
+                    ));
+                }
         }
 
-        $server_host_key_algorithms = array(
-            'ssh-rsa', // RECOMMENDED  sign   Raw RSA Key
-            'ssh-dss'  // REQUIRED     sign   Raw DSS Key
-        );
-
-        $encryption_algorithms = array(
-            // from <http://tools.ietf.org/html/rfc4345#section-4>:
-            'arcfour256',
-            'arcfour128',
+        $client_cookie = Random::string(16);
 
-            //'arcfour',      // OPTIONAL          the ARCFOUR stream cipher with a 128-bit key
+        $kexinit_payload_client = pack('Ca*', MessageType::KEXINIT, $client_cookie);
+        $kexinit_payload_client .= Strings::packSSH2(
+            'L10bN',
+            $kex_algorithms,
+            $server_host_key_algorithms,
+            $c2s_encryption_algorithms,
+            $s2c_encryption_algorithms,
+            $c2s_mac_algorithms,
+            $s2c_mac_algorithms,
+            $c2s_compression_algorithms,
+            $s2c_compression_algorithms,
+            [], // language, client to server
+            [], // language, server to client
+            false, // first_kex_packet_follows
+            0 // reserved for future extension
+        );
 
-            // CTR modes from <http://tools.ietf.org/html/rfc4344#section-4>:
-            'aes128-ctr',     // RECOMMENDED       AES (Rijndael) in SDCTR mode, with 128-bit key
-            'aes192-ctr',     // RECOMMENDED       AES with 192-bit key
-            'aes256-ctr',     // RECOMMENDED       AES with 256-bit key
+        if ($kexinit_payload_server === false && $send_kex) {
+            $this->send_binary_packet($kexinit_payload_client);
 
-            'twofish128-ctr', // OPTIONAL          Twofish in SDCTR mode, with 128-bit key
-            'twofish192-ctr', // OPTIONAL          Twofish with 192-bit key
-            'twofish256-ctr', // OPTIONAL          Twofish with 256-bit key
+            while (true) {
+                $kexinit_payload_server = $this->get_binary_packet();
+                switch (ord($kexinit_payload_server[0])) {
+                    case MessageType::KEXINIT:
+                        break 2;
+                    case MessageType::DISCONNECT:
+                        return $this->handleDisconnect($kexinit_payload_server);
+                }
 
-            'aes128-cbc',     // RECOMMENDED       AES with a 128-bit key
-            'aes192-cbc',     // OPTIONAL          AES with a 192-bit key
-            'aes256-cbc',     // OPTIONAL          AES in CBC mode, with a 256-bit key
+                $this->kex_buffer[] = $kexinit_payload_server;
+            }
 
-            'twofish128-cbc', // OPTIONAL          Twofish with a 128-bit key
-            'twofish192-cbc', // OPTIONAL          Twofish with a 192-bit key
-            'twofish256-cbc',
-            'twofish-cbc',    // OPTIONAL          alias for "twofish256-cbc"
-                              //                   (this is being retained for historical reasons)
+            $send_kex = false;
+        }
 
-            'blowfish-ctr',   // OPTIONAL          Blowfish in SDCTR mode
+        $response = $kexinit_payload_server;
+        Strings::shift($response, 1); // skip past the message number (it should be SSH_MSG_KEXINIT)
+        $server_cookie = Strings::shift($response, 16);
+
+        [
+            $this->kex_algorithms,
+            $this->server_host_key_algorithms,
+            $this->encryption_algorithms_client_to_server,
+            $this->encryption_algorithms_server_to_client,
+            $this->mac_algorithms_client_to_server,
+            $this->mac_algorithms_server_to_client,
+            $this->compression_algorithms_client_to_server,
+            $this->compression_algorithms_server_to_client,
+            $this->languages_client_to_server,
+            $this->languages_server_to_client,
+            $first_kex_packet_follows
+        ] = Strings::unpackSSH2('L10C', $response);
+        if (in_array('kex-strict-s-v00@openssh.com', $this->kex_algorithms)) {
+            if ($this->session_id === false) {
+                // [kex-strict-s-v00@openssh.com is] only valid in the initial SSH2_MSG_KEXINIT and MUST be ignored
+                // if [it is] present in subsequent SSH2_MSG_KEXINIT packets
+                $this->strict_kex_flag = true;
+                if (count($this->kex_buffer)) {
+                    throw new \UnexpectedValueException('Possible Terrapin Attack detected');
+                }
+            }
+        }
 
-            'blowfish-cbc',   // OPTIONAL          Blowfish in CBC mode
+        $this->supported_private_key_algorithms = $this->server_host_key_algorithms;
 
-            '3des-ctr',       // RECOMMENDED       Three-key 3DES in SDCTR mode
+        if ($send_kex) {
+            $this->send_binary_packet($kexinit_payload_client);
+        }
 
-            '3des-cbc',       // REQUIRED          three-key 3DES in CBC mode
-                //'none'         // OPTIONAL          no encryption; NOT RECOMMENDED
-        );
+        // we need to decide upon the symmetric encryption algorithms before we do the diffie-hellman key exchange
 
-        if (extension_loaded('openssl') && !extension_loaded('mcrypt')) {
-            // OpenSSL does not support arcfour256 in any capacity and arcfour128 / arcfour support is limited to
-            // instances that do not use continuous buffers
-            $encryption_algorithms = array_diff(
-                $encryption_algorithms,
-                array('arcfour256', 'arcfour128', 'arcfour')
-            );
+        // we don't initialize any crypto-objects, yet - we do that, later. for now, we need the lengths to make the
+        // diffie-hellman key exchange as fast as possible
+        $decrypt = self::array_intersect_first($s2c_encryption_algorithms, $this->encryption_algorithms_server_to_client);
+        if (!$decrypt || ($decryptKeyLength = $this->encryption_algorithm_to_key_size($decrypt)) === null) {
+            $this->disconnect_helper(DisconnectReason::KEY_EXCHANGE_FAILED);
+            throw new NoSupportedAlgorithmsException('No compatible server to client encryption algorithms found');
         }
 
-        if (class_exists('\phpseclib\Crypt\RC4') === false) {
-            $encryption_algorithms = array_diff(
-                $encryption_algorithms,
-                array('arcfour256', 'arcfour128', 'arcfour')
-            );
-        }
-        if (class_exists('\phpseclib\Crypt\Rijndael') === false) {
-            $encryption_algorithms = array_diff(
-                $encryption_algorithms,
-                array('aes128-ctr', 'aes192-ctr', 'aes256-ctr', 'aes128-cbc', 'aes192-cbc', 'aes256-cbc')
-            );
-        }
-        if (class_exists('\phpseclib\Crypt\Twofish') === false) {
-            $encryption_algorithms = array_diff(
-                $encryption_algorithms,
-                array('twofish128-ctr', 'twofish192-ctr', 'twofish256-ctr', 'twofish128-cbc', 'twofish192-cbc', 'twofish256-cbc', 'twofish-cbc')
-            );
-        }
-        if (class_exists('\phpseclib\Crypt\Blowfish') === false) {
-            $encryption_algorithms = array_diff(
-                $encryption_algorithms,
-                array('blowfish-ctr', 'blowfish-cbc')
-            );
-        }
-        if (class_exists('\phpseclib\Crypt\TripleDES') === false) {
-            $encryption_algorithms = array_diff(
-                $encryption_algorithms,
-                array('3des-ctr', '3des-cbc')
-            );
+        $encrypt = self::array_intersect_first($c2s_encryption_algorithms, $this->encryption_algorithms_client_to_server);
+        if (!$encrypt || ($encryptKeyLength = $this->encryption_algorithm_to_key_size($encrypt)) === null) {
+            $this->disconnect_helper(DisconnectReason::KEY_EXCHANGE_FAILED);
+            throw new NoSupportedAlgorithmsException('No compatible client to server encryption algorithms found');
         }
-        $encryption_algorithms = array_values($encryption_algorithms);
 
-        $mac_algorithms = array(
-            // from <http://www.ietf.org/rfc/rfc6668.txt>:
-            'hmac-sha2-256',// RECOMMENDED     HMAC-SHA256 (digest length = key length = 32)
-
-            'hmac-sha1-96', // RECOMMENDED     first 96 bits of HMAC-SHA1 (digest length = 12, key length = 20)
-            'hmac-sha1',    // REQUIRED        HMAC-SHA1 (digest length = key length = 20)
-            'hmac-md5-96',  // OPTIONAL        first 96 bits of HMAC-MD5 (digest length = 12, key length = 16)
-            'hmac-md5',     // OPTIONAL        HMAC-MD5 (digest length = key length = 16)
-            //'none'          // OPTIONAL        no MAC; NOT RECOMMENDED
-        );
-
-        $compression_algorithms = array(
-            'none'   // REQUIRED        no compression
-            //'zlib' // OPTIONAL        ZLIB (LZ77) compression
-        );
-
-        // some SSH servers have buggy implementations of some of the above algorithms
-        switch ($this->server_identifier) {
-            case 'SSH-2.0-SSHD':
-                $mac_algorithms = array_values(array_diff(
-                    $mac_algorithms,
-                    array('hmac-sha1-96', 'hmac-md5-96')
-                ));
+        // through diffie-hellman key exchange a symmetric key is obtained
+        $this->kex_algorithm = self::array_intersect_first($kex_algorithms, $this->kex_algorithms);
+        if ($this->kex_algorithm === false) {
+            $this->disconnect_helper(DisconnectReason::KEY_EXCHANGE_FAILED);
+            throw new NoSupportedAlgorithmsException('No compatible key exchange algorithms found');
         }
 
-        $str_kex_algorithms = implode(',', $kex_algorithms);
-        $str_server_host_key_algorithms = implode(',', $server_host_key_algorithms);
-        $encryption_algorithms_server_to_client = $encryption_algorithms_client_to_server = implode(',', $encryption_algorithms);
-        $mac_algorithms_server_to_client = $mac_algorithms_client_to_server = implode(',', $mac_algorithms);
-        $compression_algorithms_server_to_client = $compression_algorithms_client_to_server = implode(',', $compression_algorithms);
-
-        $client_cookie = Random::string(16);
+        $server_host_key_algorithm = self::array_intersect_first($server_host_key_algorithms, $this->server_host_key_algorithms);
+        if ($server_host_key_algorithm === false) {
+            $this->disconnect_helper(DisconnectReason::KEY_EXCHANGE_FAILED);
+            throw new NoSupportedAlgorithmsException('No compatible server host key algorithms found');
+        }
 
-        $response = $kexinit_payload_server;
-        $this->_string_shift($response, 1); // skip past the message number (it should be SSH_MSG_KEXINIT)
-        $server_cookie = $this->_string_shift($response, 16);
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->kex_algorithms = explode(',', $this->_string_shift($response, $temp['length']));
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->server_host_key_algorithms = explode(',', $this->_string_shift($response, $temp['length']));
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->encryption_algorithms_client_to_server = explode(',', $this->_string_shift($response, $temp['length']));
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->encryption_algorithms_server_to_client = explode(',', $this->_string_shift($response, $temp['length']));
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->mac_algorithms_client_to_server = explode(',', $this->_string_shift($response, $temp['length']));
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->mac_algorithms_server_to_client = explode(',', $this->_string_shift($response, $temp['length']));
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->compression_algorithms_client_to_server = explode(',', $this->_string_shift($response, $temp['length']));
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->compression_algorithms_server_to_client = explode(',', $this->_string_shift($response, $temp['length']));
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->languages_client_to_server = explode(',', $this->_string_shift($response, $temp['length']));
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->languages_server_to_client = explode(',', $this->_string_shift($response, $temp['length']));
-
-        extract(unpack('Cfirst_kex_packet_follows', $this->_string_shift($response, 1)));
-        $first_kex_packet_follows = $first_kex_packet_follows != 0;
-
-        // the sending of SSH2_MSG_KEXINIT could go in one of two places.  this is the second place.
-        $kexinit_payload_client = pack(
-            'Ca*Na*Na*Na*Na*Na*Na*Na*Na*Na*Na*CN',
-            NET_SSH2_MSG_KEXINIT,
-            $client_cookie,
-            strlen($str_kex_algorithms),
-            $str_kex_algorithms,
-            strlen($str_server_host_key_algorithms),
-            $str_server_host_key_algorithms,
-            strlen($encryption_algorithms_client_to_server),
-            $encryption_algorithms_client_to_server,
-            strlen($encryption_algorithms_server_to_client),
-            $encryption_algorithms_server_to_client,
-            strlen($mac_algorithms_client_to_server),
-            $mac_algorithms_client_to_server,
-            strlen($mac_algorithms_server_to_client),
-            $mac_algorithms_server_to_client,
-            strlen($compression_algorithms_client_to_server),
-            $compression_algorithms_client_to_server,
-            strlen($compression_algorithms_server_to_client),
-            $compression_algorithms_server_to_client,
-            0,
-            '',
-            0,
-            '',
-            0,
-            0
-        );
+        $mac_algorithm_out = self::array_intersect_first($c2s_mac_algorithms, $this->mac_algorithms_client_to_server);
+        if ($mac_algorithm_out === false) {
+            $this->disconnect_helper(DisconnectReason::KEY_EXCHANGE_FAILED);
+            throw new NoSupportedAlgorithmsException('No compatible client to server message authentication algorithms found');
+        }
 
-        if (!$this->_send_binary_packet($kexinit_payload_client)) {
-            return false;
+        $mac_algorithm_in = self::array_intersect_first($s2c_mac_algorithms, $this->mac_algorithms_server_to_client);
+        if ($mac_algorithm_in === false) {
+            $this->disconnect_helper(DisconnectReason::KEY_EXCHANGE_FAILED);
+            throw new NoSupportedAlgorithmsException('No compatible server to client message authentication algorithms found');
         }
-        // here ends the second place.
 
-        // we need to decide upon the symmetric encryption algorithms before we do the diffie-hellman key exchange
+        $compression_map = [
+            'none' => self::NET_SSH2_COMPRESSION_NONE,
+            'zlib' => self::NET_SSH2_COMPRESSION_ZLIB,
+            'zlib@openssh.com' => self::NET_SSH2_COMPRESSION_ZLIB_AT_OPENSSH,
+        ];
 
-        // we don't initialize any crypto-objects, yet - we do that, later. for now, we need the lengths to make the
-        // diffie-hellman key exchange as fast as possible
-        $decrypt = $this->_array_intersect_first($encryption_algorithms, $this->encryption_algorithms_server_to_client);
-        $decryptKeyLength = $this->_encryption_algorithm_to_key_size($decrypt);
-        if ($decryptKeyLength === null) {
-            $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-            throw new NoSupportedAlgorithmsException('No compatible server to client encryption algorithms found');
+        $compression_algorithm_in = self::array_intersect_first($s2c_compression_algorithms, $this->compression_algorithms_server_to_client);
+        if ($compression_algorithm_in === false) {
+            $this->disconnect_helper(DisconnectReason::KEY_EXCHANGE_FAILED);
+            throw new NoSupportedAlgorithmsException('No compatible server to client compression algorithms found');
         }
+        $this->decompress = $compression_map[$compression_algorithm_in];
 
-        $encrypt = $this->_array_intersect_first($encryption_algorithms, $this->encryption_algorithms_client_to_server);
-        $encryptKeyLength = $this->_encryption_algorithm_to_key_size($encrypt);
-        if ($encryptKeyLength === null) {
-            $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-            throw new NoSupportedAlgorithmsException('No compatible client to server encryption algorithms found');
+        $compression_algorithm_out = self::array_intersect_first($c2s_compression_algorithms, $this->compression_algorithms_client_to_server);
+        if ($compression_algorithm_out === false) {
+            $this->disconnect_helper(DisconnectReason::KEY_EXCHANGE_FAILED);
+            throw new NoSupportedAlgorithmsException('No compatible client to server compression algorithms found');
         }
+        $this->compress = $compression_map[$compression_algorithm_out];
 
-        // through diffie-hellman key exchange a symmetric key is obtained
-        $kex_algorithm = $this->_array_intersect_first($kex_algorithms, $this->kex_algorithms);
-        if ($kex_algorithm === false) {
-            $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-            throw new NoSupportedAlgorithmsException('No compatible key exchange algorithms found');
+        switch ($this->kex_algorithm) {
+            case 'diffie-hellman-group15-sha512':
+            case 'diffie-hellman-group16-sha512':
+            case 'diffie-hellman-group17-sha512':
+            case 'diffie-hellman-group18-sha512':
+            case 'ecdh-sha2-nistp521':
+                $kexHash = new Hash('sha512');
+                break;
+            case 'ecdh-sha2-nistp384':
+                $kexHash = new Hash('sha384');
+                break;
+            case 'diffie-hellman-group-exchange-sha256':
+            case 'diffie-hellman-group14-sha256':
+            case 'ecdh-sha2-nistp256':
+            case 'curve25519-sha256@libssh.org':
+            case 'curve25519-sha256':
+                $kexHash = new Hash('sha256');
+                break;
+            default:
+                $kexHash = new Hash('sha1');
         }
 
         // Only relevant in diffie-hellman-group-exchange-sha{1,256}, otherwise empty.
+
         $exchange_hash_rfc4419 = '';
 
-        if ($kex_algorithm === 'curve25519-sha256@libssh.org') {
-            $x = Random::string(32);
-            $eBytes = \Sodium::crypto_box_publickey_from_secretkey($x);
-            $clientKexInitMessage = NET_SSH2_MSG_KEX_ECDH_INIT;
-            $serverKexReplyMessage = NET_SSH2_MSG_KEX_ECDH_REPLY;
-            $kexHash = new Hash('sha256');
+        if (str_starts_with($this->kex_algorithm, 'curve25519-sha256') || str_starts_with($this->kex_algorithm, 'ecdh-sha2-nistp')) {
+            $curve = str_starts_with($this->kex_algorithm, 'curve25519-sha256') ?
+                'Curve25519' :
+                substr($this->kex_algorithm, 10);
+            $ourPrivate = EC::createKey($curve);
+            $ourPublicBytes = $ourPrivate->getPublicKey()->getEncodedCoordinates();
+            $clientKexInitMessage = MessageTypeExtra::KEX_ECDH_INIT;
+            $serverKexReplyMessage = MessageTypeExtra::KEX_ECDH_REPLY;
         } else {
-            if (strpos($kex_algorithm, 'diffie-hellman-group-exchange') === 0) {
+            if (str_starts_with($this->kex_algorithm, 'diffie-hellman-group-exchange')) {
                 $dh_group_sizes_packed = pack(
                     'NNN',
                     $this->kex_dh_group_size_min,
@@ -1408,160 +1547,98 @@ function _key_exchange($kexinit_payload_server)
                 );
                 $packet = pack(
                     'Ca*',
-                    NET_SSH2_MSG_KEXDH_GEX_REQUEST,
+                    MessageTypeExtra::KEXDH_GEX_REQUEST,
                     $dh_group_sizes_packed
                 );
-                if (!$this->_send_binary_packet($packet)) {
-                    return false;
-                }
+                $this->send_binary_packet($packet);
+                $this->updateLogHistory('UNKNOWN (34)', 'SSH_MSG_KEXDH_GEX_REQUEST');
 
-                $response = $this->_get_binary_packet();
-                if ($response === false) {
-                    user_error('Connection closed by server');
-                    return false;
-                }
-                extract(unpack('Ctype', $this->_string_shift($response, 1)));
-                if ($type != NET_SSH2_MSG_KEXDH_GEX_GROUP) {
-                    user_error('Expected SSH_MSG_KEX_DH_GEX_GROUP');
-                    return false;
-                }
+                $response = $this->get_binary_packet_or_close(MessageTypeExtra::KEXDH_GEX_GROUP);
+                [$type, $primeBytes, $gBytes] = Strings::unpackSSH2('Css', $response);
+                $this->updateLogHistory('UNKNOWN (31)', 'SSH_MSG_KEXDH_GEX_GROUP');
 
-                extract(unpack('NprimeLength', $this->_string_shift($response, 4)));
-                $primeBytes = $this->_string_shift($response, $primeLength);
                 $prime = new BigInteger($primeBytes, -256);
-
-                extract(unpack('NgLength', $this->_string_shift($response, 4)));
-                $gBytes = $this->_string_shift($response, $gLength);
                 $g = new BigInteger($gBytes, -256);
 
-                $exchange_hash_rfc4419 = pack(
-                    'a*Na*Na*',
-                    $dh_group_sizes_packed,
-                    $primeLength,
+                $exchange_hash_rfc4419 = $dh_group_sizes_packed . Strings::packSSH2(
+                    'ss',
                     $primeBytes,
-                    $gLength,
                     $gBytes
                 );
 
-                $clientKexInitMessage = NET_SSH2_MSG_KEXDH_GEX_INIT;
-                $serverKexReplyMessage = NET_SSH2_MSG_KEXDH_GEX_REPLY;
+                $params = DH::createParameters($prime, $g);
+                $clientKexInitMessage = MessageTypeExtra::KEXDH_GEX_INIT;
+                $serverKexReplyMessage = MessageTypeExtra::KEXDH_GEX_REPLY;
             } else {
-                switch ($kex_algorithm) {
-                    // see http://tools.ietf.org/html/rfc2409#section-6.2 and
-                    // http://tools.ietf.org/html/rfc2412, appendex E
-                    case 'diffie-hellman-group1-sha1':
-                        $prime = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
-                                '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
-                                '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
-                                'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381FFFFFFFFFFFFFFFF';
-                        break;
-                    // see http://tools.ietf.org/html/rfc3526#section-3
-                    case 'diffie-hellman-group14-sha1':
-                        $prime = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
-                                '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
-                                '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
-                                'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF05' .
-                                '98DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB' .
-                                '9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B' .
-                                'E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718' .
-                                '3995497CEA956AE515D2261898FA051015728E5A8AACAA68FFFFFFFFFFFFFFFF';
-                        break;
-                }
-                // For both diffie-hellman-group1-sha1 and diffie-hellman-group14-sha1
-                // the generator field element is 2 (decimal) and the hash function is sha1.
-                $g = new BigInteger(2);
-                $prime = new BigInteger($prime, 16);
-                $clientKexInitMessage = NET_SSH2_MSG_KEXDH_INIT;
-                $serverKexReplyMessage = NET_SSH2_MSG_KEXDH_REPLY;
-            }
-
-            switch ($kex_algorithm) {
-                case 'diffie-hellman-group-exchange-sha256':
-                    $kexHash = new Hash('sha256');
-                    break;
-                default:
-                    $kexHash = new Hash('sha1');
+                $params = DH::createParameters($this->kex_algorithm);
+                $clientKexInitMessage = MessageType::KEXDH_INIT;
+                $serverKexReplyMessage = MessageType::KEXDH_REPLY;
             }
 
-            /* To increase the speed of the key exchange, both client and server may
-            reduce the size of their private exponents.  It should be at least
-            twice as long as the key material that is generated from the shared
-            secret.  For more details, see the paper by van Oorschot and Wiener
-            [VAN-OORSCHOT].
-
-            -- http://tools.ietf.org/html/rfc4419#section-6.2 */
-            $one = new BigInteger(1);
-            $keyLength = min($kexHash->getLength(), max($encryptKeyLength, $decryptKeyLength));
-            $max = $one->bitwise_leftShift(16 * $keyLength); // 2 * 8 * $keyLength
-            $max = $max->subtract($one);
-
-            $x = $one->random($one, $max);
-            $e = $g->modPow($x, $prime);
+            $keyLength = min($kexHash->getLengthInBytes(), max($encryptKeyLength, $decryptKeyLength));
 
-            $eBytes = $e->toBytes(true);
+            $ourPrivate = DH::createKey($params, 16 * $keyLength); // 2 * 8 * $keyLength
+            $ourPublic = $ourPrivate->getPublicKey()->toBigInteger();
+            $ourPublicBytes = $ourPublic->toBytes(true);
         }
-        $data = pack('CNa*', $clientKexInitMessage, strlen($eBytes), $eBytes);
 
-        if (!$this->_send_binary_packet($data)) {
-            throw new \RuntimeException('Connection closed by server');
-        }
+        $data = pack('CNa*', $clientKexInitMessage, strlen($ourPublicBytes), $ourPublicBytes);
 
-        $response = $this->_get_binary_packet();
-        if ($response === false) {
-            throw new \RuntimeException('Connection closed by server');
-        }
-        extract(unpack('Ctype', $this->_string_shift($response, 1)));
+        $this->send_binary_packet($data);
 
-        if ($type != $serverKexReplyMessage) {
-            throw new \UnexpectedValueException('Expected SSH_MSG_KEXDH_REPLY');
+        switch ($clientKexInitMessage) {
+            case MessageTypeExtra::KEX_ECDH_INIT:
+                $this->updateLogHistory('SSH_MSG_KEXDH_INIT', 'SSH_MSG_KEX_ECDH_INIT');
+                break;
+            case MessageTypeExtra::KEXDH_GEX_INIT:
+                $this->updateLogHistory('UNKNOWN (32)', 'SSH_MSG_KEXDH_GEX_INIT');
         }
 
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->server_public_host_key = $server_public_host_key = $this->_string_shift($response, $temp['length']);
+        $response = $this->get_binary_packet_or_close($serverKexReplyMessage);
 
-        $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-        $public_key_format = $this->_string_shift($server_public_host_key, $temp['length']);
+        [
+            $type,
+            $server_public_host_key,
+            $theirPublicBytes,
+            $this->signature
+        ] = Strings::unpackSSH2('Csss', $response);
 
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $fBytes = $this->_string_shift($response, $temp['length']);
-
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->signature = $this->_string_shift($response, $temp['length']);
+        switch ($serverKexReplyMessage) {
+            case MessageTypeExtra::KEX_ECDH_REPLY:
+                $this->updateLogHistory('SSH_MSG_KEXDH_REPLY', 'SSH_MSG_KEX_ECDH_REPLY');
+                break;
+            case MessageTypeExtra::KEXDH_GEX_REPLY:
+                $this->updateLogHistory('UNKNOWN (33)', 'SSH_MSG_KEXDH_GEX_REPLY');
+        }
 
-        $temp = unpack('Nlength', $this->_string_shift($this->signature, 4));
-        $this->signature_format = $this->_string_shift($this->signature, $temp['length']);
+        $this->server_public_host_key = $server_public_host_key;
+        [$public_key_format] = Strings::unpackSSH2('s', $server_public_host_key);
+        if (strlen($this->signature) < 4) {
+            throw new LengthException('The signature needs at least four bytes');
+        }
+        $temp = unpack('Nlength', substr($this->signature, 0, 4));
+        $this->signature_format = substr($this->signature, 4, $temp['length']);
 
-        if ($kex_algorithm === 'curve25519-sha256@libssh.org') {
-            if (strlen($fBytes) !== 32) {
-                user_error('Received curve25519 public key of invalid length.');
-                return false;
-            }
-            $key = new BigInteger(\Sodium::crypto_scalarmult($x, $fBytes), 256);
-            \Sodium::sodium_memzero($x);
-        } else {
-            $f = new BigInteger($fBytes, -256);
-            $key = $f->modPow($x, $prime);
+        $keyBytes = DH::computeSecret($ourPrivate, $theirPublicBytes);
+        if (($keyBytes & "\xFF\x80") === "\x00\x00") {
+            $keyBytes = substr($keyBytes, 1);
+        } elseif (($keyBytes[0] & "\x80") === "\x80") {
+            $keyBytes = "\0$keyBytes";
         }
-        $keyBytes = $key->toBytes(true);
 
-        $this->exchange_hash = pack(
-            'Na*Na*Na*Na*Na*a*Na*Na*Na*',
-            strlen($this->identifier),
+        $this->exchange_hash = Strings::packSSH2(
+            's5',
             $this->identifier,
-            strlen($this->server_identifier),
             $this->server_identifier,
-            strlen($kexinit_payload_client),
             $kexinit_payload_client,
-            strlen($kexinit_payload_server),
             $kexinit_payload_server,
-            strlen($this->server_public_host_key),
-            $this->server_public_host_key,
-            $exchange_hash_rfc4419,
-            strlen($eBytes),
-            $eBytes,
-            strlen($fBytes),
-            $fBytes,
-            strlen($keyBytes),
+            $this->server_public_host_key
+        );
+        $this->exchange_hash .= $exchange_hash_rfc4419;
+        $this->exchange_hash .= Strings::packSSH2(
+            's3',
+            $ourPublicBytes,
+            $theirPublicBytes,
             $keyBytes
         );
 
@@ -1571,86 +1648,126 @@ function _key_exchange($kexinit_payload_server)
             $this->session_id = $this->exchange_hash;
         }
 
-        $server_host_key_algorithm = $this->_array_intersect_first($server_host_key_algorithms, $this->server_host_key_algorithms);
-        if ($server_host_key_algorithm === false) {
-            $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-            throw new NoSupportedAlgorithmsException('No compatible server host key algorithms found');
-        }
-
-        if ($public_key_format != $server_host_key_algorithm || $this->signature_format != $server_host_key_algorithm) {
-            $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-            throw new \RuntimeException('Server Host Key Algorithm Mismatch');
+        switch ($server_host_key_algorithm) {
+            case 'rsa-sha2-256':
+            case 'rsa-sha2-512':
+            //case 'ssh-rsa':
+                $expected_key_format = 'ssh-rsa';
+                break;
+            default:
+                $expected_key_format = $server_host_key_algorithm;
         }
-
-        $packet = pack(
-            'C',
-            NET_SSH2_MSG_NEWKEYS
-        );
-
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
+        if ($public_key_format != $expected_key_format || $this->signature_format != $server_host_key_algorithm) {
+            switch (true) {
+                case $this->signature_format == $server_host_key_algorithm:
+                case $server_host_key_algorithm != 'rsa-sha2-256' && $server_host_key_algorithm != 'rsa-sha2-512':
+                case $this->signature_format != 'ssh-rsa':
+                    $this->disconnect_helper(DisconnectReason::HOST_KEY_NOT_VERIFIABLE);
+                    throw new RuntimeException('Server Host Key Algorithm Mismatch (' . $this->signature_format . ' vs ' . $server_host_key_algorithm . ')');
+            }
         }
 
-        $response = $this->_get_binary_packet();
+        $packet = pack('C', MessageType::NEWKEYS);
+        $this->send_binary_packet($packet);
+        $this->get_binary_packet_or_close(MessageType::NEWKEYS);
 
-        if ($response === false) {
-            throw new \RuntimeException('Connection closed by server');
-        }
+        $this->keyExchangeInProgress = false;
 
-        extract(unpack('Ctype', $this->_string_shift($response, 1)));
-
-        if ($type != NET_SSH2_MSG_NEWKEYS) {
-            throw new \UnexpectedValueException('Expected SSH_MSG_NEWKEYS');
+        if ($this->strict_kex_flag) {
+            $this->get_seq_no = $this->send_seq_no = 0;
         }
 
         $keyBytes = pack('Na*', strlen($keyBytes), $keyBytes);
 
-        $this->encrypt = $this->_encryption_algorithm_to_crypt_instance($encrypt);
+        $this->encrypt = self::encryption_algorithm_to_crypt_instance($encrypt);
         if ($this->encrypt) {
-            if ($this->crypto_engine) {
-                $this->encrypt->setEngine($this->crypto_engine);
+            if (self::$crypto_engine) {
+                $this->encrypt->setPreferredEngine(self::$crypto_engine);
             }
-            if ($this->encrypt->block_size) {
-                $this->encrypt_block_size = $this->encrypt->block_size;
+            if ($this->encrypt->getBlockLengthInBytes()) {
+                $this->encrypt_block_size = $this->encrypt->getBlockLengthInBytes();
             }
-            $this->encrypt->enableContinuousBuffer();
             $this->encrypt->disablePadding();
 
-            $iv = $kexHash->hash($keyBytes . $this->exchange_hash . 'A' . $this->session_id);
-            while ($this->encrypt_block_size > strlen($iv)) {
-                $iv.= $kexHash->hash($keyBytes . $this->exchange_hash . $iv);
+            if ($this->encrypt->usesIV()) {
+                $iv = $kexHash->hash($keyBytes . $this->exchange_hash . 'A' . $this->session_id);
+                while ($this->encrypt_block_size > strlen($iv)) {
+                    $iv .= $kexHash->hash($keyBytes . $this->exchange_hash . $iv);
+                }
+                $this->encrypt->setIV(substr($iv, 0, $this->encrypt_block_size));
+            }
+
+            switch ($encrypt) {
+                case 'aes128-gcm@openssh.com':
+                case 'aes256-gcm@openssh.com':
+                    $nonce = $kexHash->hash($keyBytes . $this->exchange_hash . 'A' . $this->session_id);
+                    $this->encryptFixedPart = substr($nonce, 0, 4);
+                    $this->encryptInvocationCounter = substr($nonce, 4, 8);
+                    // fall-through
+                case 'chacha20-poly1305@openssh.com':
+                    break;
+                default:
+                    $this->encrypt->enableContinuousBuffer();
             }
-            $this->encrypt->setIV(substr($iv, 0, $this->encrypt_block_size));
 
             $key = $kexHash->hash($keyBytes . $this->exchange_hash . 'C' . $this->session_id);
             while ($encryptKeyLength > strlen($key)) {
-                $key.= $kexHash->hash($keyBytes . $this->exchange_hash . $key);
+                $key .= $kexHash->hash($keyBytes . $this->exchange_hash . $key);
+            }
+            switch ($encrypt) {
+                case 'chacha20-poly1305@openssh.com':
+                    $encryptKeyLength = 32;
+                    $this->lengthEncrypt = self::encryption_algorithm_to_crypt_instance($encrypt);
+                    $this->lengthEncrypt->setKey(substr($key, 32, 32));
             }
             $this->encrypt->setKey(substr($key, 0, $encryptKeyLength));
+            $this->encryptName = $encrypt;
         }
 
-        $this->decrypt = $this->_encryption_algorithm_to_crypt_instance($decrypt);
+        $this->decrypt = self::encryption_algorithm_to_crypt_instance($decrypt);
         if ($this->decrypt) {
-            if ($this->crypto_engine) {
-                $this->decrypt->setEngine($this->crypto_engine);
+            if (self::$crypto_engine) {
+                $this->decrypt->setPreferredEngine(self::$crypto_engine);
             }
-            if ($this->decrypt->block_size) {
-                $this->decrypt_block_size = $this->decrypt->block_size;
+            if ($this->decrypt->getBlockLengthInBytes()) {
+                $this->decrypt_block_size = $this->decrypt->getBlockLengthInBytes();
             }
-            $this->decrypt->enableContinuousBuffer();
             $this->decrypt->disablePadding();
 
-            $iv = $kexHash->hash($keyBytes . $this->exchange_hash . 'B' . $this->session_id);
-            while ($this->decrypt_block_size > strlen($iv)) {
-                $iv.= $kexHash->hash($keyBytes . $this->exchange_hash . $iv);
+            if ($this->decrypt->usesIV()) {
+                $iv = $kexHash->hash($keyBytes . $this->exchange_hash . 'B' . $this->session_id);
+                while ($this->decrypt_block_size > strlen($iv)) {
+                    $iv .= $kexHash->hash($keyBytes . $this->exchange_hash . $iv);
+                }
+                $this->decrypt->setIV(substr($iv, 0, $this->decrypt_block_size));
+            }
+
+            switch ($decrypt) {
+                case 'aes128-gcm@openssh.com':
+                case 'aes256-gcm@openssh.com':
+                    // see https://tools.ietf.org/html/rfc5647#section-7.1
+                    $nonce = $kexHash->hash($keyBytes . $this->exchange_hash . 'B' . $this->session_id);
+                    $this->decryptFixedPart = substr($nonce, 0, 4);
+                    $this->decryptInvocationCounter = substr($nonce, 4, 8);
+                    // fall-through
+                case 'chacha20-poly1305@openssh.com':
+                    break;
+                default:
+                    $this->decrypt->enableContinuousBuffer();
             }
-            $this->decrypt->setIV(substr($iv, 0, $this->decrypt_block_size));
 
             $key = $kexHash->hash($keyBytes . $this->exchange_hash . 'D' . $this->session_id);
             while ($decryptKeyLength > strlen($key)) {
-                $key.= $kexHash->hash($keyBytes . $this->exchange_hash . $key);
+                $key .= $kexHash->hash($keyBytes . $this->exchange_hash . $key);
+            }
+            switch ($decrypt) {
+                case 'chacha20-poly1305@openssh.com':
+                    $decryptKeyLength = 32;
+                    $this->lengthDecrypt = self::encryption_algorithm_to_crypt_instance($decrypt);
+                    $this->lengthDecrypt->setKey(substr($key, 32, 32));
             }
             $this->decrypt->setKey(substr($key, 0, $decryptKeyLength));
+            $this->decryptName = $decrypt;
         }
 
         /* The "arcfour128" algorithm is the RC4 cipher, as described in
@@ -1667,95 +1784,47 @@ function _key_exchange($kexinit_payload_server)
             $this->decrypt->decrypt(str_repeat("\0", 1536));
         }
 
-        $mac_algorithm = $this->_array_intersect_first($mac_algorithms, $this->mac_algorithms_client_to_server);
-        if ($mac_algorithm === false) {
-            $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-            throw new NoSupportedAlgorithmsException('No compatible client to server message authentication algorithms found');
-        }
-
-        $createKeyLength = 0; // ie. $mac_algorithm == 'none'
-        switch ($mac_algorithm) {
-            case 'hmac-sha2-256':
-                $this->hmac_create = new Hash('sha256');
-                $createKeyLength = 32;
-                break;
-            case 'hmac-sha1':
-                $this->hmac_create = new Hash('sha1');
-                $createKeyLength = 20;
-                break;
-            case 'hmac-sha1-96':
-                $this->hmac_create = new Hash('sha1-96');
-                $createKeyLength = 20;
-                break;
-            case 'hmac-md5':
-                $this->hmac_create = new Hash('md5');
-                $createKeyLength = 16;
-                break;
-            case 'hmac-md5-96':
-                $this->hmac_create = new Hash('md5-96');
-                $createKeyLength = 16;
-        }
-
-        $mac_algorithm = $this->_array_intersect_first($mac_algorithms, $this->mac_algorithms_server_to_client);
-        if ($mac_algorithm === false) {
-            $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-            throw new NoSupportedAlgorithmsException('No compatible server to client message authentication algorithms found');
-        }
-
-        $checkKeyLength = 0;
-        $this->hmac_size = 0;
-        switch ($mac_algorithm) {
-            case 'hmac-sha2-256':
-                $this->hmac_check = new Hash('sha256');
-                $checkKeyLength = 32;
-                $this->hmac_size = 32;
-                break;
-            case 'hmac-sha1':
-                $this->hmac_check = new Hash('sha1');
-                $checkKeyLength = 20;
-                $this->hmac_size = 20;
-                break;
-            case 'hmac-sha1-96':
-                $this->hmac_check = new Hash('sha1-96');
-                $checkKeyLength = 20;
-                $this->hmac_size = 12;
-                break;
-            case 'hmac-md5':
-                $this->hmac_check = new Hash('md5');
-                $checkKeyLength = 16;
-                $this->hmac_size = 16;
-                break;
-            case 'hmac-md5-96':
-                $this->hmac_check = new Hash('md5-96');
-                $checkKeyLength = 16;
-                $this->hmac_size = 12;
+        if (!$this->encrypt->usesNonce()) {
+            [$this->hmac_create, $createKeyLength] = self::mac_algorithm_to_hash_instance($mac_algorithm_out);
+        } else {
+            $this->hmac_create = new \stdClass();
+            $this->hmac_create_name = $mac_algorithm_out;
+            //$mac_algorithm_out = 'none';
+            $createKeyLength = 0;
         }
 
-        $key = $kexHash->hash($keyBytes . $this->exchange_hash . 'E' . $this->session_id);
-        while ($createKeyLength > strlen($key)) {
-            $key.= $kexHash->hash($keyBytes . $this->exchange_hash . $key);
+        if ($this->hmac_create instanceof Hash) {
+            $key = $kexHash->hash($keyBytes . $this->exchange_hash . 'E' . $this->session_id);
+            while ($createKeyLength > strlen($key)) {
+                $key .= $kexHash->hash($keyBytes . $this->exchange_hash . $key);
+            }
+            $this->hmac_create->setKey(substr($key, 0, $createKeyLength));
+            $this->hmac_create_name = $mac_algorithm_out;
+            $this->hmac_create_etm = preg_match('#-etm@openssh\.com$#', $mac_algorithm_out);
         }
-        $this->hmac_create->setKey(substr($key, 0, $createKeyLength));
 
-        $key = $kexHash->hash($keyBytes . $this->exchange_hash . 'F' . $this->session_id);
-        while ($checkKeyLength > strlen($key)) {
-            $key.= $kexHash->hash($keyBytes . $this->exchange_hash . $key);
+        if (!$this->decrypt->usesNonce()) {
+            [$this->hmac_check, $checkKeyLength] = self::mac_algorithm_to_hash_instance($mac_algorithm_in);
+            $this->hmac_size = $this->hmac_check->getLengthInBytes();
+        } else {
+            $this->hmac_check = new \stdClass();
+            $this->hmac_check_name = $mac_algorithm_in;
+            //$mac_algorithm_in = 'none';
+            $checkKeyLength = 0;
+            $this->hmac_size = 0;
         }
-        $this->hmac_check->setKey(substr($key, 0, $checkKeyLength));
 
-        $compression_algorithm = $this->_array_intersect_first($compression_algorithms, $this->compression_algorithms_server_to_client);
-        if ($compression_algorithm === false) {
-            $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-            throw new NoSupportedAlgorithmsException('No compatible server to client compression algorithms found');
+        if ($this->hmac_check instanceof Hash) {
+            $key = $kexHash->hash($keyBytes . $this->exchange_hash . 'F' . $this->session_id);
+            while ($checkKeyLength > strlen($key)) {
+                $key .= $kexHash->hash($keyBytes . $this->exchange_hash . $key);
+            }
+            $this->hmac_check->setKey(substr($key, 0, $checkKeyLength));
+            $this->hmac_check_name = $mac_algorithm_in;
+            $this->hmac_check_etm = preg_match('#-etm@openssh\.com$#', $mac_algorithm_in);
         }
-        $this->decompress = $compression_algorithm == 'zlib';
 
-        $compression_algorithm = $this->_array_intersect_first($compression_algorithms, $this->compression_algorithms_client_to_server);
-        if ($compression_algorithm === false) {
-            $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-            throw new NoSupportedAlgorithmsException('No compatible client to server compression algorithms found');
-        }
-        $this->compress = $compression_algorithm == 'zlib';
+        $this->regenerate_compression_context = $this->regenerate_decompression_context = true;
 
         return true;
     }
@@ -1765,13 +1834,17 @@ function _key_exchange($kexinit_payload_server)
      *
      * @param string $algorithm Name of the encryption algorithm
      * @return int|null Number of bytes as an integer or null for unknown
-     * @access private
      */
-    function _encryption_algorithm_to_key_size($algorithm)
+    private function encryption_algorithm_to_key_size(string $algorithm): ?int
     {
+        if ($this->bad_key_size_fix && self::bad_algorithm_candidate($algorithm)) {
+            return 16;
+        }
+
         switch ($algorithm) {
             case 'none':
                 return 0;
+            case 'aes128-gcm@openssh.com':
             case 'aes128-cbc':
             case 'aes128-ctr':
             case 'arcfour':
@@ -1788,6 +1861,7 @@ function _encryption_algorithm_to_key_size($algorithm)
             case 'twofish192-cbc':
             case 'twofish192-ctr':
                 return 24;
+            case 'aes256-gcm@openssh.com':
             case 'aes256-cbc':
             case 'aes256-ctr':
             case 'arcfour256':
@@ -1795,98 +1869,230 @@ function _encryption_algorithm_to_key_size($algorithm)
             case 'twofish256-cbc':
             case 'twofish256-ctr':
                 return 32;
+            case 'chacha20-poly1305@openssh.com':
+                return 64;
         }
         return null;
     }
 
     /**
      * Maps an encryption algorithm name to an instance of a subclass of
-     * \phpseclib\Crypt\Base.
+     * \phpseclib3\Crypt\Common\SymmetricKey.
      *
      * @param string $algorithm Name of the encryption algorithm
-     * @return mixed Instance of \phpseclib\Crypt\Base or null for unknown
-     * @access private
+     * @return SymmetricKey|null
      */
-    function _encryption_algorithm_to_crypt_instance($algorithm)
+    private static function encryption_algorithm_to_crypt_instance(string $algorithm)
     {
         switch ($algorithm) {
             case '3des-cbc':
-                return new TripleDES();
+                return new TripleDES('cbc');
             case '3des-ctr':
-                return new TripleDES(Base::MODE_CTR);
+                return new TripleDES('ctr');
             case 'aes256-cbc':
             case 'aes192-cbc':
             case 'aes128-cbc':
-                return new Rijndael();
+                return new Rijndael('cbc');
             case 'aes256-ctr':
             case 'aes192-ctr':
             case 'aes128-ctr':
-                return new Rijndael(Base::MODE_CTR);
+                return new Rijndael('ctr');
             case 'blowfish-cbc':
-                return new Blowfish();
+                return new Blowfish('cbc');
             case 'blowfish-ctr':
-                return new Blowfish(Base::MODE_CTR);
+                return new Blowfish('ctr');
             case 'twofish128-cbc':
             case 'twofish192-cbc':
             case 'twofish256-cbc':
             case 'twofish-cbc':
-                return new Twofish();
+                return new Twofish('cbc');
             case 'twofish128-ctr':
             case 'twofish192-ctr':
             case 'twofish256-ctr':
-                return new Twofish(Base::MODE_CTR);
+                return new Twofish('ctr');
             case 'arcfour':
             case 'arcfour128':
             case 'arcfour256':
                 return new RC4();
+            case 'aes128-gcm@openssh.com':
+            case 'aes256-gcm@openssh.com':
+                return new Rijndael('gcm');
+            case 'chacha20-poly1305@openssh.com':
+                return new ChaCha20();
         }
         return null;
     }
 
+    /**
+     * Maps an encryption algorithm name to an instance of a subclass of
+     * \phpseclib3\Crypt\Hash.
+     *
+     * @param string $algorithm Name of the encryption algorithm
+     * @return array{Hash, int}|null
+     */
+    private static function mac_algorithm_to_hash_instance(string $algorithm): ?array
+    {
+        switch ($algorithm) {
+            case 'umac-64@openssh.com':
+            case 'umac-64-etm@openssh.com':
+                return [new Hash('umac-64'), 16];
+            case 'umac-128@openssh.com':
+            case 'umac-128-etm@openssh.com':
+                return [new Hash('umac-128'), 16];
+            case 'hmac-sha2-512':
+            case 'hmac-sha2-512-etm@openssh.com':
+                return [new Hash('sha512'), 64];
+            case 'hmac-sha2-256':
+            case 'hmac-sha2-256-etm@openssh.com':
+                return [new Hash('sha256'), 32];
+            case 'hmac-sha1':
+            case 'hmac-sha1-etm@openssh.com':
+                return [new Hash('sha1'), 20];
+            case 'hmac-sha1-96':
+                return [new Hash('sha1-96'), 20];
+            case 'hmac-md5':
+                return [new Hash('md5'), 16];
+            case 'hmac-md5-96':
+                return [new Hash('md5-96'), 16];
+        }
+    }
+
+    /**
+     * Tests whether or not proposed algorithm has a potential for issues
+     *
+     * @link https://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/ssh2-aesctr-openssh.html
+     * @link https://bugzilla.mindrot.org/show_bug.cgi?id=1291
+     * @param string $algorithm Name of the encryption algorithm
+     */
+    private static function bad_algorithm_candidate($algorithm): bool
+    {
+        switch ($algorithm) {
+            case 'arcfour256':
+            case 'aes192-ctr':
+            case 'aes256-ctr':
+                return true;
+        }
+
+        return false;
+    }
+
     /**
      * Login
      *
-     * The $password parameter can be a plaintext password, a \phpseclib\Crypt\RSA object or an array
+     * The $password parameter can be a plaintext password, a \phpseclib3\Crypt\RSA|EC|DSA object, a \phpseclib3\System\SSH\Agent object or an array
      *
-     * @param string $username
-     * @param mixed $password
-     * @param mixed $...
-     * @return bool
+     * @param string|PrivateKey|array[]|Agent|null ...$args
      * @see self::_login()
-     * @access public
      */
-    function login($username)
+    public function login(string $username, ...$args): bool
     {
-        $args = func_get_args();
-        return call_user_func_array(array(&$this, '_login'), $args);
+        if (!$this->login_credentials_finalized) {
+            $this->auth[] = func_get_args();
+        }
+
+        // try logging with 'none' as an authentication method first since that's what
+        // PuTTY does
+        if (
+            substr($this->server_identifier ?: '', 0, 15) !== 'SSH-2.0-CoreFTP' &&
+            $this->auth_methods_to_continue === null
+        ) {
+            if ($this->sublogin($username)) {
+                return true;
+            }
+            if (!count($args)) {
+                return false;
+            }
+        }
+        return $this->sublogin($username, ...$args);
     }
 
     /**
      * Login Helper
      *
-     * @param string $username
-     * @param mixed $password
-     * @param mixed $...
-     * @return bool
+     * @param string|PrivateKey|array[]|Agent|null ...$args
      * @see self::_login_helper()
-     * @access private
      */
-    function _login($username)
+    protected function sublogin(string $username, ...$args): bool
     {
         if (!($this->bitmap & self::MASK_CONSTRUCTOR)) {
-            if (!$this->_connect()) {
-                return false;
-            }
+            $this->connect();
         }
 
-        $args = array_slice(func_get_args(), 1);
         if (empty($args)) {
-            return $this->_login_helper($username);
+            return $this->login_helper($username);
         }
 
         foreach ($args as $arg) {
-            if ($this->_login_helper($username, $arg)) {
-                return true;
+            switch (true) {
+                case $arg instanceof PublicKey:
+                    throw new UnexpectedValueException('A PublicKey object was passed to the login method instead of a PrivateKey object');
+                case $arg instanceof PrivateKey:
+                case $arg instanceof Agent:
+                case is_array($arg):
+                case Strings::is_stringable($arg):
+                    break;
+                default:
+                    throw new UnexpectedValueException('$password needs to either be an instance of \phpseclib3\Crypt\Common\PrivateKey, \System\SSH\Agent, an array or a string');
+            }
+        }
+
+        while (count($args)) {
+            if (!$this->auth_methods_to_continue || !$this->smartMFA) {
+                $newargs = $args;
+                $args = [];
+            } else {
+                $newargs = [];
+                foreach ($this->auth_methods_to_continue as $method) {
+                    switch ($method) {
+                        case 'publickey':
+                            foreach ($args as $key => $arg) {
+                                if ($arg instanceof PrivateKey || $arg instanceof Agent) {
+                                    $newargs[] = $arg;
+                                    unset($args[$key]);
+                                    break;
+                                }
+                            }
+                            break;
+                        case 'keyboard-interactive':
+                            $hasArray = $hasString = false;
+                            foreach ($args as $arg) {
+                                if ($hasArray || is_array($arg)) {
+                                    $hasArray = true;
+                                    break;
+                                }
+                                if ($hasString || Strings::is_stringable($arg)) {
+                                    $hasString = true;
+                                    break;
+                                }
+                            }
+                            if ($hasArray && $hasString) {
+                                foreach ($args as $key => $arg) {
+                                    if (is_array($arg)) {
+                                        $newargs[] = $arg;
+                                        break 2;
+                                    }
+                                }
+                            }
+                            // fall-through
+                        case 'password':
+                            foreach ($args as $key => $arg) {
+                                $newargs[] = $arg;
+                                unset($args[$key]);
+                                break;
+                            }
+                    }
+                }
+            }
+
+            if (!count($newargs)) {
+                return false;
+            }
+
+            foreach ($newargs as $arg) {
+                if ($this->login_helper($username, $arg)) {
+                    $this->login_credentials_finalized = true;
+                    return true;
+                }
             }
         }
         return false;
@@ -1895,58 +2101,60 @@ function _login($username)
     /**
      * Login Helper
      *
-     * @param string $username
-     * @param string $password
-     * @return bool
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @throws \RuntimeException on other errors
-     * @access private
-     * @internal It might be worthwhile, at some point, to protect against {@link http://tools.ietf.org/html/rfc4251#section-9.3.9 traffic analysis}
-     *           by sending dummy SSH_MSG_IGNORE messages.
+     * {@internal It might be worthwhile, at some point, to protect against {@link http://tools.ietf.org/html/rfc4251#section-9.3.9 traffic analysis}
+     *           by sending dummy SSH_MSG_IGNORE messages.}
+     *
+     * @throws UnexpectedValueException on receipt of unexpected packets
+     * @throws RuntimeException on other errors
      */
-    function _login_helper($username, $password = null)
+    private function login_helper(string $username, $password = null): bool
     {
         if (!($this->bitmap & self::MASK_CONNECTED)) {
             return false;
         }
 
         if (!($this->bitmap & self::MASK_LOGIN_REQ)) {
-            $packet = pack(
-                'CNa*',
-                NET_SSH2_MSG_SERVICE_REQUEST,
-                strlen('ssh-userauth'),
-                'ssh-userauth'
-            );
-
-            if (!$this->_send_binary_packet($packet)) {
-                return false;
-            }
-
-            $response = $this->_get_binary_packet();
-            if ($response === false) {
-                throw new \RuntimeException('Connection closed by server');
+            $packet = Strings::packSSH2('Cs', MessageType::SERVICE_REQUEST, 'ssh-userauth');
+            $this->send_binary_packet($packet);
+
+            try {
+                $response = $this->get_binary_packet_or_close(MessageType::SERVICE_ACCEPT);
+            } catch (InvalidPacketLengthException $e) {
+                // the first opportunity to encounter the "bad key size" error
+                if (!$this->bad_key_size_fix && $this->decryptName != null && self::bad_algorithm_candidate($this->decryptName)) {
+                    // bad_key_size_fix is only ever re-assigned to true here
+                    // retry the connection with that new setting but we'll
+                    // only try it once.
+                    $this->bad_key_size_fix = true;
+                    return $this->reconnect();
+                }
+                throw $e;
             }
 
-            extract(unpack('Ctype', $this->_string_shift($response, 1)));
+            [$type] = Strings::unpackSSH2('C', $response);
+            [$service] = Strings::unpackSSH2('s', $response);
 
-            if ($type != NET_SSH2_MSG_SERVICE_ACCEPT) {
+            if ($service != 'ssh-userauth') {
+                $this->disconnect_helper(DisconnectReason::PROTOCOL_ERROR);
                 throw new \UnexpectedValueException('Expected SSH_MSG_SERVICE_ACCEPT');
             }
             $this->bitmap |= self::MASK_LOGIN_REQ;
         }
 
         if (strlen($this->last_interactive_response)) {
-            return !is_string($password) && !is_array($password) ? false : $this->_keyboard_interactive_process($password);
+            return !Strings::is_stringable($password) && !is_array($password) ? false : $this->keyboard_interactive_process($password);
+        }
+
+        if ($password instanceof PrivateKey) {
+            return $this->privatekey_login($username, $password);
         }
 
-        if ($password instanceof RSA) {
-            return $this->_privatekey_login($username, $password);
-        } elseif ($password instanceof Agent) {
-            return $this->_ssh_agent_login($username, $password);
+        if ($password instanceof Agent) {
+            return $this->ssh_agent_login($username, $password);
         }
 
         if (is_array($password)) {
-            if ($this->_keyboard_interactive_login($username, $password)) {
+            if ($this->keyboard_interactive_login($username, $password)) {
                 $this->bitmap |= self::MASK_LOGIN;
                 return true;
             }
@@ -1954,49 +2162,39 @@ function _login_helper($username, $password = null)
         }
 
         if (!isset($password)) {
-            $packet = pack(
-                'CNa*Na*Na*',
-                NET_SSH2_MSG_USERAUTH_REQUEST,
-                strlen($username),
+            $packet = Strings::packSSH2(
+                'Cs3',
+                MessageType::USERAUTH_REQUEST,
                 $username,
-                strlen('ssh-connection'),
                 'ssh-connection',
-                strlen('none'),
                 'none'
             );
 
-            if (!$this->_send_binary_packet($packet)) {
-                return false;
-            }
-
-            $response = $this->_get_binary_packet();
-            if ($response === false) {
-                throw new \RuntimeException('Connection closed by server');
-            }
+            $this->send_binary_packet($packet);
 
-            extract(unpack('Ctype', $this->_string_shift($response, 1)));
+            $response = $this->get_binary_packet_or_close();
 
+            [$type] = Strings::unpackSSH2('C', $response);
             switch ($type) {
-                case NET_SSH2_MSG_USERAUTH_SUCCESS:
+                case MessageType::USERAUTH_SUCCESS:
                     $this->bitmap |= self::MASK_LOGIN;
                     return true;
-                //case NET_SSH2_MSG_USERAUTH_FAILURE:
+                case MessageType::USERAUTH_FAILURE:
+                    [$auth_methods] = Strings::unpackSSH2('L', $response);
+                    $this->auth_methods_to_continue = $auth_methods;
+                    // fall-through
                 default:
                     return false;
             }
         }
 
-        $packet = pack(
-            'CNa*Na*Na*CNa*',
-            NET_SSH2_MSG_USERAUTH_REQUEST,
-            strlen($username),
+        $packet = Strings::packSSH2(
+            'Cs3bs',
+            MessageType::USERAUTH_REQUEST,
             $username,
-            strlen('ssh-connection'),
             'ssh-connection',
-            strlen('password'),
             'password',
-            0,
-            strlen($password),
+            false,
             $password
         );
 
@@ -2004,57 +2202,44 @@ function _login_helper($username, $password = null)
         if (!defined('NET_SSH2_LOGGING')) {
             $logged = null;
         } else {
-            $logged = pack(
-                'CNa*Na*Na*CNa*',
-                NET_SSH2_MSG_USERAUTH_REQUEST,
-                strlen('username'),
-                'username',
-                strlen('ssh-connection'),
+            $logged = Strings::packSSH2(
+                'Cs3bs',
+                MessageType::USERAUTH_REQUEST,
+                $username,
                 'ssh-connection',
-                strlen('password'),
                 'password',
-                0,
-                strlen('password'),
+                false,
                 'password'
             );
         }
 
-        if (!$this->_send_binary_packet($packet, $logged)) {
-            return false;
-        }
-
-        $response = $this->_get_binary_packet();
-        if ($response === false) {
-            throw new \RuntimeException('Connection closed by server');
-        }
+        $this->send_binary_packet($packet, $logged);
 
-        extract(unpack('Ctype', $this->_string_shift($response, 1)));
+        $response = $this->get_binary_packet_or_close();
+        [$type] = Strings::unpackSSH2('C', $response);
 
         switch ($type) {
-            case NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ: // in theory, the password can be changed
-                if (defined('NET_SSH2_LOGGING')) {
-                    $this->message_number_log[count($this->message_number_log) - 1] = 'NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ';
-                }
-                extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                $this->errors[] = 'SSH_MSG_USERAUTH_PASSWD_CHANGEREQ: ' . utf8_decode($this->_string_shift($response, $length));
-                return $this->_disconnect(NET_SSH2_DISCONNECT_AUTH_CANCELLED_BY_USER);
-            case NET_SSH2_MSG_USERAUTH_FAILURE:
+            case MessageTypeExtra::USERAUTH_PASSWD_CHANGEREQ: // in theory, the password can be changed
+                $this->updateLogHistory('SSH_MSG_USERAUTH_INFO_REQUEST', 'SSH_MSG_USERAUTH_PASSWD_CHANGEREQ');
+
+                [$message] = Strings::unpackSSH2('s', $response);
+                $this->errors[] = 'SSH_MSG_USERAUTH_PASSWD_CHANGEREQ: ' . $message;
+
+                return $this->disconnect_helper(DisconnectReason::AUTH_CANCELLED_BY_USER);
+            case MessageType::USERAUTH_FAILURE:
                 // can we use keyboard-interactive authentication?  if not then either the login is bad or the server employees
                 // multi-factor authentication
-                extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                $auth_methods = explode(',', $this->_string_shift($response, $length));
-                extract(unpack('Cpartial_success', $this->_string_shift($response, 1)));
-                $partial_success = $partial_success != 0;
-
+                [$auth_methods, $partial_success] = Strings::unpackSSH2('Lb', $response);
+                $this->auth_methods_to_continue = $auth_methods;
                 if (!$partial_success && in_array('keyboard-interactive', $auth_methods)) {
-                    if ($this->_keyboard_interactive_login($username, $password)) {
+                    if ($this->keyboard_interactive_login($username, $password)) {
                         $this->bitmap |= self::MASK_LOGIN;
                         return true;
                     }
                     return false;
                 }
                 return false;
-            case NET_SSH2_MSG_USERAUTH_SUCCESS:
+            case MessageType::USERAUTH_SUCCESS:
                 $this->bitmap |= self::MASK_LOGIN;
                 return true;
         }
@@ -2067,67 +2252,46 @@ function _login_helper($username, $password = null)
      *
      * See {@link http://tools.ietf.org/html/rfc4256 RFC4256} for details.  This is not a full-featured keyboard-interactive authenticator.
      *
-     * @param string $username
-     * @param string $password
-     * @return bool
-     * @access private
+     * @param string|array $password
      */
-    function _keyboard_interactive_login($username, $password)
+    private function keyboard_interactive_login(string $username, $password): bool
     {
-        $packet = pack(
-            'CNa*Na*Na*Na*Na*',
-            NET_SSH2_MSG_USERAUTH_REQUEST,
-            strlen($username),
+        $packet = Strings::packSSH2(
+            'Cs5',
+            MessageType::USERAUTH_REQUEST,
             $username,
-            strlen('ssh-connection'),
             'ssh-connection',
-            strlen('keyboard-interactive'),
             'keyboard-interactive',
-            0,
-            '',
-            0,
-            ''
+            '', // language tag
+            '' // submethods
         );
+        $this->send_binary_packet($packet);
 
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        return $this->_keyboard_interactive_process($password);
+        return $this->keyboard_interactive_process($password);
     }
 
     /**
      * Handle the keyboard-interactive requests / responses.
      *
-     * @param string $responses...
-     * @return bool
-     * @throws \RuntimeException on connection error
-     * @access private
+     * @throws RuntimeException on connection error
      */
-    function _keyboard_interactive_process()
+    private function keyboard_interactive_process(...$responses)
     {
-        $responses = func_get_args();
-
         if (strlen($this->last_interactive_response)) {
             $response = $this->last_interactive_response;
         } else {
-            $orig = $response = $this->_get_binary_packet();
-            if ($response === false) {
-                throw new \RuntimeException('Connection closed by server');
-            }
+            $orig = $response = $this->get_binary_packet_or_close();
         }
 
-        extract(unpack('Ctype', $this->_string_shift($response, 1)));
-
+        [$type] = Strings::unpackSSH2('C', $response);
         switch ($type) {
-            case NET_SSH2_MSG_USERAUTH_INFO_REQUEST:
-                extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                $this->_string_shift($response, $length); // name; may be empty
-                extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                $this->_string_shift($response, $length); // instruction; may be empty
-                extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                $this->_string_shift($response, $length); // language tag; may be empty
-                extract(unpack('Nnum_prompts', $this->_string_shift($response, 4)));
+            case MessageType::USERAUTH_INFO_REQUEST:
+                [
+                    , // name; may be empty
+                    , // instruction; may be empty
+                    , // language tag; may be empty
+                    $num_prompts
+                ] = Strings::unpackSSH2('s3N', $response);
 
                 for ($i = 0; $i < count($responses); $i++) {
                     if (is_array($responses[$i])) {
@@ -2141,10 +2305,10 @@ function _keyboard_interactive_process()
 
                 if (isset($this->keyboard_requests_responses)) {
                     for ($i = 0; $i < $num_prompts; $i++) {
-                        extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                        // prompt - ie. "Password: "; must not be empty
-                        $prompt = $this->_string_shift($response, $length);
-                        //$echo = $this->_string_shift($response) != chr(0);
+                        [
+                            $prompt, // prompt - ie. "Password: "; must not be empty
+                            // echo
+                        ] = Strings::unpackSSH2('sC', $response);
                         foreach ($this->keyboard_requests_responses as $key => $value) {
                             if (substr($prompt, 0, strlen($key)) == $key) {
                                 $responses[] = $value;
@@ -2157,12 +2321,8 @@ function _keyboard_interactive_process()
                 // see http://tools.ietf.org/html/rfc4256#section-3.2
                 if (strlen($this->last_interactive_response)) {
                     $this->last_interactive_response = '';
-                } elseif (defined('NET_SSH2_LOGGING')) {
-                    $this->message_number_log[count($this->message_number_log) - 1] = str_replace(
-                        'UNKNOWN',
-                        'NET_SSH2_MSG_USERAUTH_INFO_REQUEST',
-                        $this->message_number_log[count($this->message_number_log) - 1]
-                    );
+                } else {
+                    $this->updateLogHistory('UNKNOWN (60)', 'SSH_MSG_USERAUTH_INFO_REQUEST');
                 }
 
                 if (!count($responses) && $num_prompts) {
@@ -2175,23 +2335,15 @@ function _keyboard_interactive_process()
                    MUST respond with an SSH_MSG_USERAUTH_INFO_RESPONSE message.
                 */
                 // see http://tools.ietf.org/html/rfc4256#section-3.4
-                $packet = $logged = pack('CN', NET_SSH2_MSG_USERAUTH_INFO_RESPONSE, count($responses));
+                $packet = $logged = pack('CN', MessageType::USERAUTH_INFO_RESPONSE, count($responses));
                 for ($i = 0; $i < count($responses); $i++) {
-                    $packet.= pack('Na*', strlen($responses[$i]), $responses[$i]);
-                    $logged.= pack('Na*', strlen('dummy-answer'), 'dummy-answer');
+                    $packet .= Strings::packSSH2('s', $responses[$i]);
+                    $logged .= Strings::packSSH2('s', 'dummy-answer');
                 }
 
-                if (!$this->_send_binary_packet($packet, $logged)) {
-                    return false;
-                }
+                $this->send_binary_packet($packet, $logged);
 
-                if (defined('NET_SSH2_LOGGING') && NET_SSH2_LOGGING == self::LOG_COMPLEX) {
-                    $this->message_number_log[count($this->message_number_log) - 1] = str_replace(
-                        'UNKNOWN',
-                        'NET_SSH2_MSG_USERAUTH_INFO_RESPONSE',
-                        $this->message_number_log[count($this->message_number_log) - 1]
-                    );
-                }
+                $this->updateLogHistory('UNKNOWN (61)', 'SSH_MSG_USERAUTH_INFO_RESPONSE');
 
                 /*
                    After receiving the response, the server MUST send either an
@@ -2200,10 +2352,12 @@ function _keyboard_interactive_process()
                 */
                 // maybe phpseclib should force close the connection after x request / responses?  unless something like that is done
                 // there could be an infinite loop of request / responses.
-                return $this->_keyboard_interactive_process();
-            case NET_SSH2_MSG_USERAUTH_SUCCESS:
+                return $this->keyboard_interactive_process();
+            case MessageType::USERAUTH_SUCCESS:
                 return true;
-            case NET_SSH2_MSG_USERAUTH_FAILURE:
+            case MessageType::USERAUTH_FAILURE:
+                [$auth_methods] = Strings::unpackSSH2('L', $response);
+                $this->auth_methods_to_continue = $auth_methods;
                 return false;
         }
 
@@ -2212,20 +2366,17 @@ function _keyboard_interactive_process()
 
     /**
      * Login with an ssh-agent provided key
-     *
-     * @param string $username
-     * @param \phpseclib\System\SSH\Agent $agent
-     * @return bool
-     * @access private
      */
-    function _ssh_agent_login($username, $agent)
+    private function ssh_agent_login(string $username, Agent $agent): bool
     {
         $this->agent = $agent;
         $keys = $agent->requestIdentities();
+        $orig_algorithms = $this->supported_private_key_algorithms;
         foreach ($keys as $key) {
-            if ($this->_privatekey_login($username, $key)) {
+            if ($this->privatekey_login($username, $key)) {
                 return true;
             }
+            $this->supported_private_key_algorithms = $orig_algorithms;
         }
 
         return false;
@@ -2234,126 +2385,172 @@ function _ssh_agent_login($username, $agent)
     /**
      * Login with an RSA private key
      *
-     * @param string $username
-     * @param \phpseclib\Crypt\RSA $password
-     * @return bool
-     * @throws \RuntimeException on connection error
-     * @access private
-     * @internal It might be worthwhile, at some point, to protect against {@link http://tools.ietf.org/html/rfc4251#section-9.3.9 traffic analysis}
-     *           by sending dummy SSH_MSG_IGNORE messages.
+     * {@internal It might be worthwhile, at some point, to protect against {@link http://tools.ietf.org/html/rfc4251#section-9.3.9 traffic analysis}
+     *           by sending dummy SSH_MSG_IGNORE messages.}
+     *
+     * @throws RuntimeException on connection error
      */
-    function _privatekey_login($username, $privatekey)
+    private function privatekey_login(string $username, PrivateKey $privatekey): bool
     {
-        // see http://tools.ietf.org/html/rfc4253#page-15
-        $publickey = $privatekey->getPublicKey('Raw');
-        if ($publickey === false) {
-            return false;
+        $publickey = $privatekey->getPublicKey();
+
+        if ($publickey instanceof RSA) {
+            $privatekey = $privatekey->withPadding(RSA::SIGNATURE_PKCS1);
+            $algos = ['rsa-sha2-256', 'rsa-sha2-512', 'ssh-rsa'];
+            if (isset($this->preferred['hostkey'])) {
+                $algos = array_intersect($algos, $this->preferred['hostkey']);
+            }
+            $algo = self::array_intersect_first($algos, $this->supported_private_key_algorithms);
+            switch ($algo) {
+                case 'rsa-sha2-512':
+                    $hash = 'sha512';
+                    $signatureType = 'rsa-sha2-512';
+                    break;
+                case 'rsa-sha2-256':
+                    $hash = 'sha256';
+                    $signatureType = 'rsa-sha2-256';
+                    break;
+                //case 'ssh-rsa':
+                default:
+                    $hash = 'sha1';
+                    $signatureType = 'ssh-rsa';
+            }
+        } elseif ($publickey instanceof EC) {
+            $privatekey = $privatekey->withSignatureFormat('SSH2');
+            $curveName = $privatekey->getCurve();
+            switch ($curveName) {
+                case 'Ed25519':
+                    $hash = 'sha512';
+                    $signatureType = 'ssh-ed25519';
+                    break;
+                case 'secp256r1': // nistp256
+                    $hash = 'sha256';
+                    $signatureType = 'ecdsa-sha2-nistp256';
+                    break;
+                case 'secp384r1': // nistp384
+                    $hash = 'sha384';
+                    $signatureType = 'ecdsa-sha2-nistp384';
+                    break;
+                case 'secp521r1': // nistp521
+                    $hash = 'sha512';
+                    $signatureType = 'ecdsa-sha2-nistp521';
+                    break;
+                default:
+                    if (is_array($curveName)) {
+                        throw new UnsupportedCurveException('Specified Curves are not supported by SSH2');
+                    }
+                    throw new UnsupportedCurveException('Named Curve of ' . $curveName . ' is not supported by phpseclib3\'s SSH2 implementation');
+            }
+        } elseif ($publickey instanceof DSA) {
+            $privatekey = $privatekey->withSignatureFormat('SSH2');
+            $hash = 'sha1';
+            $signatureType = 'ssh-dss';
+        } else {
+            throw new UnsupportedAlgorithmException('Please use either an RSA key, an EC one or a DSA key');
         }
 
-        $publickey = array(
-            'e' => $publickey['e']->toBytes(true),
-            'n' => $publickey['n']->toBytes(true)
-        );
-        $publickey = pack(
-            'Na*Na*Na*',
-            strlen('ssh-rsa'),
-            'ssh-rsa',
-            strlen($publickey['e']),
-            $publickey['e'],
-            strlen($publickey['n']),
-            $publickey['n']
-        );
+        $publickeyStr = $publickey->toString('OpenSSH', ['binary' => true]);
 
-        $part1 = pack(
-            'CNa*Na*Na*',
-            NET_SSH2_MSG_USERAUTH_REQUEST,
-            strlen($username),
+        $part1 = Strings::packSSH2(
+            'Csss',
+            MessageType::USERAUTH_REQUEST,
             $username,
-            strlen('ssh-connection'),
             'ssh-connection',
-            strlen('publickey'),
             'publickey'
         );
-        $part2 = pack('Na*Na*', strlen('ssh-rsa'), 'ssh-rsa', strlen($publickey), $publickey);
+        $part2 = Strings::packSSH2('ss', $signatureType, $publickeyStr);
 
         $packet = $part1 . chr(0) . $part2;
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
+        $this->send_binary_packet($packet);
 
-        $response = $this->_get_binary_packet();
-        if ($response === false) {
-            throw new \RuntimeException('Connection closed by server');
-        }
-
-        extract(unpack('Ctype', $this->_string_shift($response, 1)));
+        $response = $this->get_binary_packet_or_close(
+            MessageType::USERAUTH_SUCCESS,
+            MessageType::USERAUTH_FAILURE,
+            MessageTypeExtra::USERAUTH_PK_OK
+        );
 
+        [$type] = Strings::unpackSSH2('C', $response);
         switch ($type) {
-            case NET_SSH2_MSG_USERAUTH_FAILURE:
-                extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                $this->errors[] = 'SSH_MSG_USERAUTH_FAILURE: ' . $this->_string_shift($response, $length);
+            case MessageType::USERAUTH_FAILURE:
+                [$auth_methods] = Strings::unpackSSH2('L', $response);
+                if (in_array('publickey', $auth_methods) && substr($signatureType, 0, 9) == 'rsa-sha2-') {
+                    $this->supported_private_key_algorithms = array_diff($this->supported_private_key_algorithms, ['rsa-sha2-256', 'rsa-sha2-512']);
+                    return $this->privatekey_login($username, $privatekey);
+                }
+                $this->auth_methods_to_continue = $auth_methods;
+                $this->errors[] = 'SSH_MSG_USERAUTH_FAILURE';
                 return false;
-            case NET_SSH2_MSG_USERAUTH_PK_OK:
+            case MessageTypeExtra::USERAUTH_PK_OK:
                 // we'll just take it on faith that the public key blob and the public key algorithm name are as
                 // they should be
-                if (defined('NET_SSH2_LOGGING') && NET_SSH2_LOGGING == self::LOG_COMPLEX) {
-                    $this->message_number_log[count($this->message_number_log) - 1] = str_replace(
-                        'UNKNOWN',
-                        'NET_SSH2_MSG_USERAUTH_PK_OK',
-                        $this->message_number_log[count($this->message_number_log) - 1]
-                    );
-                }
+                $this->updateLogHistory('SSH_MSG_USERAUTH_INFO_REQUEST', 'SSH_MSG_USERAUTH_PK_OK');
+                break;
+            case MessageType::USERAUTH_SUCCESS:
+                $this->bitmap |= self::MASK_LOGIN;
+                return true;
         }
 
         $packet = $part1 . chr(1) . $part2;
-        $privatekey->setSignatureMode(RSA::SIGNATURE_PKCS1);
-        $signature = $privatekey->sign(pack('Na*a*', strlen($this->session_id), $this->session_id, $packet));
-        $signature = pack('Na*Na*', strlen('ssh-rsa'), 'ssh-rsa', strlen($signature), $signature);
-        $packet.= pack('Na*', strlen($signature), $signature);
-
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
+        $privatekey = $privatekey->withHash($hash);
+        $signature = $privatekey->sign(Strings::packSSH2('s', $this->session_id) . $packet);
+        if ($publickey instanceof RSA) {
+            $signature = Strings::packSSH2('ss', $signatureType, $signature);
         }
+        $packet .= Strings::packSSH2('s', $signature);
 
-        $response = $this->_get_binary_packet();
-        if ($response === false) {
-            throw new \RuntimeException('Connection closed by server');
-        }
+        $this->send_binary_packet($packet);
 
-        extract(unpack('Ctype', $this->_string_shift($response, 1)));
+        $response = $this->get_binary_packet_or_close(
+            MessageType::USERAUTH_SUCCESS,
+            MessageType::USERAUTH_FAILURE
+        );
 
+        [$type] = Strings::unpackSSH2('C', $response);
         switch ($type) {
-            case NET_SSH2_MSG_USERAUTH_FAILURE:
+            case MessageType::USERAUTH_FAILURE:
                 // either the login is bad or the server employs multi-factor authentication
+                [$auth_methods] = Strings::unpackSSH2('L', $response);
+                $this->auth_methods_to_continue = $auth_methods;
                 return false;
-            case NET_SSH2_MSG_USERAUTH_SUCCESS:
+            case MessageType::USERAUTH_SUCCESS:
                 $this->bitmap |= self::MASK_LOGIN;
                 return true;
         }
+    }
 
-        return false;
+    /**
+     * Return the currently configured timeout
+     */
+    public function getTimeout(): int
+    {
+        return $this->timeout;
     }
 
     /**
      * Set Timeout
      *
      * $ssh->exec('ping 127.0.0.1'); on a Linux host will never return and will run indefinitely.  setTimeout() makes it so it'll timeout.
-     * Setting $timeout to false or 0 will mean there is no timeout.
-     *
-     * @param mixed $timeout
-     * @access public
+     * Setting $timeout to false or 0 will revert to the default socket timeout.
      */
-    function setTimeout($timeout)
+    public function setTimeout(int $timeout): void
     {
         $this->timeout = $this->curTimeout = $timeout;
     }
 
     /**
-     * Get the output from stdError
+     * Set Keep Alive
      *
-     * @access public
+     * Sends an SSH2_MSG_IGNORE message every x seconds, if x is a positive non-zero number.
+     */
+    public function setKeepAlive(int $interval): void
+    {
+        $this->keepAlive = $interval;
+    }
+
+    /**
+     * Get the output from stdError
      */
-    function getStdError()
+    public function getStdError(): string
     {
         return $this->stdErrorLog;
     }
@@ -2361,98 +2558,56 @@ function getStdError()
     /**
      * Execute Command
      *
-     * If $callback is set to false then \phpseclib\Net\SSH2::_get_channel_packet(self::CHANNEL_EXEC) will need to be called manually.
+     * If $callback is set to false then \phpseclib3\Net\SSH2::get_channel_packet(self::CHANNEL_EXEC) will need to be called manually.
      * In all likelihood, this is not a feature you want to be taking advantage of.
      *
-     * @param string $command
-     * @param Callback $callback
-     * @return string
-     * @throws \RuntimeException on connection error
-     * @access public
+     * @return string|bool
+     * @psalm-return ($callback is callable ? bool : string|bool)
+     * @throws RuntimeException on connection error
      */
-    function exec($command, $callback = null)
+    public function exec(string $command, ?callable $callback = null)
     {
         $this->curTimeout = $this->timeout;
         $this->is_timeout = false;
         $this->stdErrorLog = '';
 
-        if (!($this->bitmap & self::MASK_LOGIN)) {
-            return false;
-        }
-
-        // RFC4254 defines the (client) window size as "bytes the other party can send before it must wait for the window to
-        // be adjusted".  0x7FFFFFFF is, at 2GB, the max size.  technically, it should probably be decremented, but,
-        // honestly, if you're transfering more than 2GB, you probably shouldn't be using phpseclib, anyway.
-        // see http://tools.ietf.org/html/rfc4254#section-5.2 for more info
-        $this->window_size_server_to_client[self::CHANNEL_EXEC] = $this->window_size;
-        // 0x8000 is the maximum max packet size, per http://tools.ietf.org/html/rfc4253#section-6.1, although since PuTTy
-        // uses 0x4000, that's what will be used here, as well.
-        $packet_size = 0x4000;
-
-        $packet = pack(
-            'CNa*N3',
-            NET_SSH2_MSG_CHANNEL_OPEN,
-            strlen('session'),
-            'session',
-            self::CHANNEL_EXEC,
-            $this->window_size_server_to_client[self::CHANNEL_EXEC],
-            $packet_size
-        );
-
-        if (!$this->_send_binary_packet($packet)) {
+        if (!$this->isAuthenticated()) {
             return false;
         }
 
-        $this->channel_status[self::CHANNEL_EXEC] = NET_SSH2_MSG_CHANNEL_OPEN;
+        //if ($this->isPTYOpen()) {
+        //    throw new RuntimeException('If you want to run multiple exec()\'s you will need to disable (and re-enable if appropriate) a PTY for each one.');
+        //}
 
-        $response = $this->_get_channel_packet(self::CHANNEL_EXEC);
-        if ($response === false) {
-            return false;
-        }
+        $this->open_channel(self::CHANNEL_EXEC);
 
         if ($this->request_pty === true) {
-            $terminal_modes = pack('C', NET_SSH2_TTY_OP_END);
-            $packet = pack(
-                'CNNa*CNa*N5a*',
-                NET_SSH2_MSG_CHANNEL_REQUEST,
+            $terminal_modes = pack('C', TerminalMode::TTY_OP_END);
+            $packet = Strings::packSSH2(
+                'CNsCsN4s',
+                MessageType::CHANNEL_REQUEST,
                 $this->server_channels[self::CHANNEL_EXEC],
-                strlen('pty-req'),
                 'pty-req',
                 1,
-                strlen('vt100'),
-                'vt100',
+                $this->term,
                 $this->windowColumns,
                 $this->windowRows,
                 0,
                 0,
-                strlen($terminal_modes),
                 $terminal_modes
             );
 
-            if (!$this->_send_binary_packet($packet)) {
-                return false;
-            }
-
-            $response = $this->_get_binary_packet();
-            if ($response === false) {
-                throw new \RuntimeException('Connection closed by server');
-            }
-
-            list(, $type) = unpack('C', $this->_string_shift($response, 1));
+            $this->send_binary_packet($packet);
 
-            switch ($type) {
-                case NET_SSH2_MSG_CHANNEL_SUCCESS:
-                    break;
-                case NET_SSH2_MSG_CHANNEL_FAILURE:
-                default:
-                    $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                    throw new \RuntimeException('Unable to request pseudo-terminal');
+            $this->channel_status[self::CHANNEL_EXEC] = MessageType::CHANNEL_REQUEST;
+            if (!$this->get_channel_packet(self::CHANNEL_EXEC)) {
+                $this->disconnect_helper(DisconnectReason::BY_APPLICATION);
+                throw new RuntimeException('Unable to request pseudo-terminal');
             }
-            $this->in_request_pty_exec = true;
         }
 
         // sending a pty-req SSH_MSG_CHANNEL_REQUEST message is unnecessary and, in fact, in most cases, slows things
-        // down.  the one place where it might be desirable is if you're doing something like \phpseclib\Net\SSH2::exec('ping localhost &').
+        // down.  the one place where it might be desirable is if you're doing something like \phpseclib3\Net\SSH2::exec('ping localhost &').
         // with a pty-req SSH_MSG_CHANNEL_REQUEST, exec() will return immediately and the ping process will then
         // then immediately terminate.  without such a request exec() will loop indefinitely.  the ping process won't end but
         // neither will your script.
@@ -2460,36 +2615,32 @@ function exec($command, $callback = null)
         // although, in theory, the size of SSH_MSG_CHANNEL_REQUEST could exceed the maximum packet size established by
         // SSH_MSG_CHANNEL_OPEN_CONFIRMATION, RFC4254#section-5.1 states that the "maximum packet size" refers to the
         // "maximum size of an individual data packet". ie. SSH_MSG_CHANNEL_DATA.  RFC4254#section-5.2 corroborates.
-        $packet = pack(
-            'CNNa*CNa*',
-            NET_SSH2_MSG_CHANNEL_REQUEST,
+        $packet = Strings::packSSH2(
+            'CNsCs',
+            MessageType::CHANNEL_REQUEST,
             $this->server_channels[self::CHANNEL_EXEC],
-            strlen('exec'),
             'exec',
             1,
-            strlen($command),
             $command
         );
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
+        $this->send_binary_packet($packet);
 
-        $this->channel_status[self::CHANNEL_EXEC] = NET_SSH2_MSG_CHANNEL_REQUEST;
+        $this->channel_status[self::CHANNEL_EXEC] = MessageType::CHANNEL_REQUEST;
 
-        $response = $this->_get_channel_packet(self::CHANNEL_EXEC);
-        if ($response === false) {
+        if (!$this->get_channel_packet(self::CHANNEL_EXEC)) {
             return false;
         }
 
-        $this->channel_status[self::CHANNEL_EXEC] = NET_SSH2_MSG_CHANNEL_DATA;
+        $this->channel_status[self::CHANNEL_EXEC] = MessageType::CHANNEL_DATA;
 
-        if ($callback === false || $this->in_request_pty_exec) {
+        if ($this->request_pty === true) {
+            $this->channel_id_last_interactive = self::CHANNEL_EXEC;
             return true;
         }
 
         $output = '';
         while (true) {
-            $temp = $this->_get_channel_packet(self::CHANNEL_EXEC);
+            $temp = $this->get_channel_packet(self::CHANNEL_EXEC);
             switch (true) {
                 case $temp === true:
                     return is_callable($callback) ? true : $output;
@@ -2497,116 +2648,128 @@ function exec($command, $callback = null)
                     return false;
                 default:
                     if (is_callable($callback)) {
-                        if (call_user_func($callback, $temp) === true) {
-                            $this->_close_channel(self::CHANNEL_EXEC);
+                        if ($callback($temp) === true) {
+                            $this->close_channel(self::CHANNEL_EXEC);
                             return true;
                         }
                     } else {
-                        $output.= $temp;
+                        $output .= $temp;
                     }
             }
         }
     }
 
     /**
-     * Creates an interactive shell
+     * How many channels are currently open?
      *
-     * @see self::read()
-     * @see self::write()
-     * @return bool
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @throws \RuntimeException on other errors
-     * @access private
+     * @return int
      */
-    function _initShell()
+    public function getOpenChannelCount()
     {
-        if ($this->in_request_pty_exec === true) {
-            return true;
+        return $this->channelCount;
+    }
+
+    /**
+     * Opens a channel
+     */
+    protected function open_channel(int $channel, bool $skip_extended = false): bool
+    {
+        if (isset($this->channel_status[$channel])) {
+            throw new \RuntimeException('Please close the channel (' . $channel . ') before trying to open it again');
+        }
+
+        $this->channelCount++;
+
+        if ($this->channelCount > 1 && $this->errorOnMultipleChannels) {
+            throw new RuntimeException("Ubuntu's OpenSSH from 5.8 to 6.9 doesn't work with multiple channels");
         }
 
-        $this->window_size_server_to_client[self::CHANNEL_SHELL] = $this->window_size;
+        // RFC4254 defines the (client) window size as "bytes the other party can send before it must wait for the window to
+        // be adjusted".  0x7FFFFFFF is, at 2GB, the max size.  technically, it should probably be decremented, but,
+        // honestly, if you're transferring more than 2GB, you probably shouldn't be using phpseclib, anyway.
+        // see http://tools.ietf.org/html/rfc4254#section-5.2 for more info
+        $this->window_size_server_to_client[$channel] = $this->window_size;
+        // 0x8000 is the maximum max packet size, per http://tools.ietf.org/html/rfc4253#section-6.1, although since PuTTy
+        // uses 0x4000, that's what will be used here, as well.
         $packet_size = 0x4000;
 
-        $packet = pack(
-            'CNa*N3',
-            NET_SSH2_MSG_CHANNEL_OPEN,
-            strlen('session'),
+        $packet = Strings::packSSH2(
+            'CsN3',
+            MessageType::CHANNEL_OPEN,
             'session',
-            self::CHANNEL_SHELL,
-            $this->window_size_server_to_client[self::CHANNEL_SHELL],
+            $channel,
+            $this->window_size_server_to_client[$channel],
             $packet_size
         );
 
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
+        $this->send_binary_packet($packet);
 
-        $this->channel_status[self::CHANNEL_SHELL] = NET_SSH2_MSG_CHANNEL_OPEN;
+        $this->channel_status[$channel] = MessageType::CHANNEL_OPEN;
 
-        $response = $this->_get_channel_packet(self::CHANNEL_SHELL);
-        if ($response === false) {
-            return false;
+        return $this->get_channel_packet($channel, $skip_extended);
+    }
+
+    /**
+     * Creates an interactive shell
+     *
+     * Returns bool(true) if the shell was opened.
+     * Returns bool(false) if the shell was already open.
+     *
+     * @throws InsufficientSetupException if not authenticated
+     * @throws UnexpectedValueException on receipt of unexpected packets
+     * @throws RuntimeException on other errors
+     * @see self::isShellOpen()
+     * @see self::read()
+     * @see self::write()
+     */
+    public function openShell(): bool
+    {
+        if (!$this->isAuthenticated()) {
+            throw new InsufficientSetupException('Operation disallowed prior to login()');
         }
 
-        $terminal_modes = pack('C', NET_SSH2_TTY_OP_END);
-        $packet = pack(
-            'CNNa*CNa*N5a*',
-            NET_SSH2_MSG_CHANNEL_REQUEST,
+        $this->open_channel(self::CHANNEL_SHELL);
+
+        $terminal_modes = pack('C', TerminalMode::TTY_OP_END);
+        $packet = Strings::packSSH2(
+            'CNsbsN4s',
+            MessageType::CHANNEL_REQUEST,
             $this->server_channels[self::CHANNEL_SHELL],
-            strlen('pty-req'),
             'pty-req',
-            1,
-            strlen('vt100'),
-            'vt100',
+            true, // want reply
+            $this->term,
             $this->windowColumns,
             $this->windowRows,
             0,
             0,
-            strlen($terminal_modes),
             $terminal_modes
         );
 
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $response = $this->_get_binary_packet();
-        if ($response === false) {
-            throw new \RuntimeException('Connection closed by server');
-        }
+        $this->send_binary_packet($packet);
 
-        list(, $type) = unpack('C', $this->_string_shift($response, 1));
+        $this->channel_status[self::CHANNEL_SHELL] = MessageType::CHANNEL_REQUEST;
 
-        switch ($type) {
-            case NET_SSH2_MSG_CHANNEL_SUCCESS:
-            // if a pty can't be opened maybe commands can still be executed
-            case NET_SSH2_MSG_CHANNEL_FAILURE:
-                break;
-            default:
-                $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                throw new \UnexpectedValueException('Unable to request pseudo-terminal');
+        if (!$this->get_channel_packet(self::CHANNEL_SHELL)) {
+            throw new RuntimeException('Unable to request pty');
         }
 
-        $packet = pack(
-            'CNNa*C',
-            NET_SSH2_MSG_CHANNEL_REQUEST,
+        $packet = Strings::packSSH2(
+            'CNsb',
+            MessageType::CHANNEL_REQUEST,
             $this->server_channels[self::CHANNEL_SHELL],
-            strlen('shell'),
             'shell',
-            1
+            true // want reply
         );
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $this->channel_status[self::CHANNEL_SHELL] = NET_SSH2_MSG_CHANNEL_REQUEST;
+        $this->send_binary_packet($packet);
 
-        $response = $this->_get_channel_packet(self::CHANNEL_SHELL);
+        $response = $this->get_channel_packet(self::CHANNEL_SHELL);
         if ($response === false) {
-            return false;
+            throw new RuntimeException('Unable to request shell');
         }
 
-        $this->channel_status[self::CHANNEL_SHELL] = NET_SSH2_MSG_CHANNEL_DATA;
+        $this->channel_status[self::CHANNEL_SHELL] = MessageType::CHANNEL_DATA;
+
+        $this->channel_id_last_interactive = self::CHANNEL_SHELL;
 
         $this->bitmap |= self::MASK_SHELL;
 
@@ -2614,36 +2777,43 @@ function _initShell()
     }
 
     /**
-     * Return the channel to be used with read() / write()
-     *
+     * Return the channel to be used with read(), write(), and reset(), if none were specified
+     * @deprecated for lack of transparency in intended channel target, to be potentially replaced
+     *             with method which guarantees open-ness of all yielded channels and throws
+     *             error for multiple open channels
      * @see self::read()
      * @see self::write()
-     * @return int
-     * @access public
      */
-    function _get_interactive_channel()
+    private function get_interactive_channel(): int
     {
         switch (true) {
-            case $this->in_subsystem:
+            case $this->is_channel_status_data(self::CHANNEL_SUBSYSTEM):
                 return self::CHANNEL_SUBSYSTEM;
-            case $this->in_request_pty_exec:
+            case $this->is_channel_status_data(self::CHANNEL_EXEC):
                 return self::CHANNEL_EXEC;
             default:
                 return self::CHANNEL_SHELL;
         }
     }
 
+    /**
+     * Indicates the DATA status on the given channel
+     */
+    private function is_channel_status_data(int $channel): bool
+    {
+        return isset($this->channel_status[$channel]) && $this->channel_status[$channel] == MessageType::CHANNEL_DATA;
+    }
+
     /**
      * Return an available open channel
      *
      * @return int
-     * @access public
      */
-    function _get_open_channel()
+    private function get_open_channel()
     {
         $channel = self::CHANNEL_EXEC;
         do {
-            if (isset($this->channel_status[$channel]) && $this->channel_status[$channel] == NET_SSH2_MSG_CHANNEL_OPEN) {
+            if (isset($this->channel_status[$channel]) && $this->channel_status[$channel] == MessageType::CHANNEL_OPEN) {
                 return $channel;
             }
         } while ($channel++ < self::CHANNEL_SUBSYSTEM);
@@ -2651,74 +2821,138 @@ function _get_open_channel()
         return false;
     }
 
+    /**
+     * Request agent forwarding of remote server
+     */
+    public function requestAgentForwarding(): bool
+    {
+        $request_channel = $this->get_open_channel();
+        if ($request_channel === false) {
+            return false;
+        }
+
+        $packet = Strings::packSSH2(
+            'CNsC',
+            MessageType::CHANNEL_REQUEST,
+            $this->server_channels[$request_channel],
+            'auth-agent-req@openssh.com',
+            1
+        );
+
+        $this->channel_status[$request_channel] = MessageType::CHANNEL_REQUEST;
+
+        $this->send_binary_packet($packet);
+
+        if (!$this->get_channel_packet($request_channel)) {
+            return false;
+        }
+
+        $this->channel_status[$request_channel] = MessageType::CHANNEL_OPEN;
+
+        return true;
+    }
+
     /**
      * Returns the output of an interactive shell
      *
      * Returns when there's a match for $expect, which can take the form of a string literal or,
      * if $mode == self::READ_REGEX, a regular expression.
      *
+     * If not specifying a channel, an open interactive channel will be selected, or, if there are
+     * no open channels, an interactive shell will be created. If there are multiple open
+     * interactive channels, a legacy behavior will apply in which channel selection prioritizes
+     * an active subsystem, the exec pty, and, lastly, the shell. If using multiple interactive
+     * channels, callers are discouraged from relying on this legacy behavior and should specify
+     * the intended channel.
+     *
+     * @param int $mode One of the self::READ_* constants
+     * @param int|null $channel Channel id returned by self::getInteractiveChannelId()
+     * @return string|bool|null
+     * @throws RuntimeException on connection error
+     * @throws InsufficientSetupException on unexpected channel status, possibly due to closure
      * @see self::write()
-     * @param string $expect
-     * @param int $mode
-     * @return string
-     * @throws \RuntimeException on connection error
-     * @access public
      */
-    function read($expect = '', $mode = self::READ_SIMPLE)
+    public function read(string $expect = '', int $mode = self::READ_SIMPLE, ?int $channel = null)
     {
+        if (!$this->isAuthenticated()) {
+            throw new InsufficientSetupException('Operation disallowed prior to login()');
+        }
+
         $this->curTimeout = $this->timeout;
         $this->is_timeout = false;
 
-        if (!($this->bitmap & self::MASK_LOGIN)) {
-            throw new \RuntimeException('Operation disallowed prior to login()');
+        if ($channel === null) {
+            $channel = $this->get_interactive_channel();
         }
 
-        if (!($this->bitmap & self::MASK_SHELL) && !$this->_initShell()) {
-            throw new \RuntimeException('Unable to initiate an interactive shell session');
+        if (!$this->is_channel_status_data($channel) && empty($this->channel_buffers[$channel])) {
+            if ($channel != self::CHANNEL_SHELL) {
+                throw new InsufficientSetupException('Data is not available on channel');
+            } elseif (!$this->openShell()) {
+                throw new RuntimeException('Unable to initiate an interactive shell session');
+            }
         }
 
-        $channel = $this->_get_interactive_channel();
+        if ($mode == self::READ_NEXT) {
+            return $this->get_channel_packet($channel);
+        }
 
         $match = $expect;
         while (true) {
             if ($mode == self::READ_REGEX) {
                 preg_match($expect, substr($this->interactiveBuffer, -1024), $matches);
-                $match = isset($matches[0]) ? $matches[0] : '';
+                $match = $matches[0] ?? '';
             }
             $pos = strlen($match) ? strpos($this->interactiveBuffer, $match) : false;
             if ($pos !== false) {
-                return $this->_string_shift($this->interactiveBuffer, $pos + strlen($match));
+                return Strings::shift($this->interactiveBuffer, $pos + strlen($match));
             }
-            $response = $this->_get_channel_packet($channel);
-            if (is_bool($response)) {
-                $this->in_request_pty_exec = false;
-                return $response ? $this->_string_shift($this->interactiveBuffer, strlen($this->interactiveBuffer)) : false;
+            $response = $this->get_channel_packet($channel);
+            if ($response === true) {
+                return Strings::shift($this->interactiveBuffer, strlen($this->interactiveBuffer));
             }
 
-            $this->interactiveBuffer.= $response;
+            $this->interactiveBuffer .= $response;
         }
     }
 
     /**
      * Inputs a command into an interactive shell.
      *
-     * @see self::read()
-     * @param string $cmd
-     * @return bool
-     * @throws \RuntimeException on connection error
-     * @access public
+     * If not specifying a channel, an open interactive channel will be selected, or, if there are
+     * no open channels, an interactive shell will be created. If there are multiple open
+     * interactive channels, a legacy behavior will apply in which channel selection prioritizes
+     * an active subsystem, the exec pty, and, lastly, the shell. If using multiple interactive
+     * channels, callers are discouraged from relying on this legacy behavior and should specify
+     * the intended channel.
+     *
+     * @param int|null $channel Channel id returned by self::getInteractiveChannelId()
+     * @throws RuntimeException on connection error
+     * @throws InsufficientSetupException on unexpected channel status, possibly due to closure
+     * @throws TimeoutException if the write could not be completed within the requested self::setTimeout()
+     * @see SSH2::read()
      */
-    function write($cmd)
+    public function write(string $cmd, ?int $channel = null): void
     {
-        if (!($this->bitmap & self::MASK_LOGIN)) {
-            throw new \RuntimeException('Operation disallowed prior to login()');
+        if (!$this->isAuthenticated()) {
+            throw new InsufficientSetupException('Operation disallowed prior to login()');
         }
 
-        if (!($this->bitmap & self::MASK_SHELL) && !$this->_initShell()) {
-            throw new \RuntimeException('Unable to initiate an interactive shell session');
+        if ($channel === null) {
+            $channel = $this->get_interactive_channel();
         }
 
-        return $this->_send_channel_packet($this->_get_interactive_channel(), $cmd);
+        if (!$this->is_channel_status_data($channel)) {
+            if ($channel != self::CHANNEL_SHELL) {
+                throw new InsufficientSetupException('Data is not available on channel');
+            } elseif (!$this->openShell()) {
+                throw new RuntimeException('Unable to initiate an interactive shell session');
+            }
+        }
+
+        $this->curTimeout = $this->timeout;
+        $this->is_timeout = false;
+        $this->send_channel_packet($channel, $cmd);
     }
 
     /**
@@ -2730,62 +2964,31 @@ function write($cmd)
      * returns that and then that that was passed into stopSubsystem() but that'll be saved for a future date and implemented
      * if there's sufficient demand for such a feature.
      *
-     * @see self::stopSubsystem()
-     * @param string $subsystem
-     * @return bool
-     * @access public
+          * @see self::stopSubsystem()
      */
-    function startSubsystem($subsystem)
+    public function startSubsystem(string $subsystem): bool
     {
-        $this->window_size_server_to_client[self::CHANNEL_SUBSYSTEM] = $this->window_size;
-
-        $packet = pack(
-            'CNa*N3',
-            NET_SSH2_MSG_CHANNEL_OPEN,
-            strlen('session'),
-            'session',
-            self::CHANNEL_SUBSYSTEM,
-            $this->window_size,
-            0x4000
-        );
-
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $this->channel_status[self::CHANNEL_SUBSYSTEM] = NET_SSH2_MSG_CHANNEL_OPEN;
-
-        $response = $this->_get_channel_packet(self::CHANNEL_SUBSYSTEM);
-        if ($response === false) {
-            return false;
-        }
+        $this->open_channel(self::CHANNEL_SUBSYSTEM);
 
-        $packet = pack(
-            'CNNa*CNa*',
-            NET_SSH2_MSG_CHANNEL_REQUEST,
+        $packet = Strings::packSSH2(
+            'CNsCs',
+            MessageType::CHANNEL_REQUEST,
             $this->server_channels[self::CHANNEL_SUBSYSTEM],
-            strlen('subsystem'),
             'subsystem',
             1,
-            strlen($subsystem),
             $subsystem
         );
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
+        $this->send_binary_packet($packet);
 
-        $this->channel_status[self::CHANNEL_SUBSYSTEM] = NET_SSH2_MSG_CHANNEL_REQUEST;
+        $this->channel_status[self::CHANNEL_SUBSYSTEM] = MessageType::CHANNEL_REQUEST;
 
-        $response = $this->_get_channel_packet(self::CHANNEL_SUBSYSTEM);
-
-        if ($response === false) {
+        if (!$this->get_channel_packet(self::CHANNEL_SUBSYSTEM)) {
             return false;
         }
 
-        $this->channel_status[self::CHANNEL_SUBSYSTEM] = NET_SSH2_MSG_CHANNEL_DATA;
+        $this->channel_status[self::CHANNEL_SUBSYSTEM] = MessageType::CHANNEL_DATA;
 
-        $this->bitmap |= self::MASK_SHELL;
-        $this->in_subsystem = true;
+        $this->channel_id_last_interactive = self::CHANNEL_SUBSYSTEM;
 
         return true;
     }
@@ -2794,13 +2997,12 @@ function startSubsystem($subsystem)
      * Stops a subsystem.
      *
      * @see self::startSubsystem()
-     * @return bool
-     * @access public
      */
-    function stopSubsystem()
+    public function stopSubsystem(): bool
     {
-        $this->in_subsystem = false;
-        $this->_close_channel(self::CHANNEL_SUBSYSTEM);
+        if ($this->isInteractiveChannelOpen(self::CHANNEL_SUBSYSTEM)) {
+            $this->close_channel(self::CHANNEL_SUBSYSTEM);
+        }
         return true;
     }
 
@@ -2809,33 +3011,61 @@ function stopSubsystem()
      *
      * If read() timed out you might want to just close the channel and have it auto-restart on the next read() call
      *
-     * @access public
+     * If not specifying a channel, an open interactive channel will be selected. If there are
+     * multiple open interactive channels, a legacy behavior will apply in which channel selection
+     * prioritizes an active subsystem, the exec pty, and, lastly, the shell. If using multiple
+     * interactive channels, callers are discouraged from relying on this legacy behavior and
+     * should specify the intended channel.
+     *
+     * @param int|null $channel Channel id returned by self::getInteractiveChannelId()
+     */
+    public function reset(?int $channel = null): void
+    {
+        if ($channel === null) {
+            $channel = $this->get_interactive_channel();
+        }
+        if ($this->isInteractiveChannelOpen($channel)) {
+            $this->close_channel($channel);
+        }
+    }
+
+    /**
+     * Send EOF on a channel
+     *
+     * Sends an EOF to the stream; this is typically used to close standard
+     * input, while keeping output and error alive.
+     *
+     * @param int|null $channel Channel id returned by self::getInteractiveChannelId()
+     * @return void
      */
-    function reset()
+    public function sendEOF(?int $channel = null): void
     {
-        $this->_close_channel($this->_get_interactive_channel());
+        if ($channel === null) {
+            $channel = $this->get_interactive_channel();
+        }
+
+        $excludeStatuses = [MessageType::CHANNEL_EOF, MessageType::CHANNEL_CLOSE];
+        if (isset($this->channel_status[$channel]) && !in_array($this->channel_status[$channel], $excludeStatuses)) {
+            $this->send_binary_packet(pack('CN', MessageType::CHANNEL_EOF, $this->server_channels[$channel]));
+        }
     }
 
     /**
      * Is timeout?
      *
      * Did exec() or read() return because they timed out or because they encountered the end?
-     *
-     * @access public
      */
-    function isTimeout()
+    public function isTimeout(): bool
     {
         return $this->is_timeout;
     }
 
     /**
      * Disconnect
-     *
-     * @access public
      */
-    function disconnect()
+    public function disconnect(): void
     {
-        $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
+        $this->disconnect_helper(DisconnectReason::BY_APPLICATION);
         if (isset($this->realtime_log_file) && is_resource($this->realtime_log_file)) {
             fclose($this->realtime_log_file);
         }
@@ -2847,10 +3077,8 @@ function disconnect()
      *
      * Will be called, automatically, if you're supporting just PHP5.  If you're supporting PHP4, you'll need to call
      * disconnect().
-     *
-     * @access public
      */
-    function __destruct()
+    public function __destruct()
     {
         $this->disconnect();
     }
@@ -2858,111 +3086,482 @@ function __destruct()
     /**
      * Is the connection still active?
      *
-     * @return bool
-     * @access public
+     * $level has 3x possible values:
+     * 0 (default): phpseclib takes a passive approach to see if the connection is still active by calling feof()
+     *    on the socket
+     * 1: phpseclib takes an active approach to see if the connection is still active by sending an SSH_MSG_IGNORE
+     *    packet that doesn't require a response
+     * 2: phpseclib takes an active approach to see if the connection is still active by sending an SSH_MSG_CHANNEL_OPEN
+     *    packet and imediately trying to close that channel. some routers, in particular, however, will only let you
+     *    open one channel, so this approach could yield false positives
      */
-    function isConnected()
+    public function isConnected(int $level = 0): bool
     {
-        return (bool) ($this->bitmap & self::MASK_CONNECTED);
+        if ($level < 0 || $level > 2) {
+            throw new InvalidArgumentException('$level must be 0, 1 or 2');
+        }
+
+        if ($level == 0) {
+            return ($this->bitmap & self::MASK_CONNECTED) && is_resource($this->fsock) && !feof($this->fsock);
+        }
+        try {
+            if ($level == 1) {
+                $this->send_binary_packet(pack('CN', MessageType::IGNORE, 0));
+            } else {
+                $this->open_channel(self::CHANNEL_KEEP_ALIVE);
+                $this->close_channel(self::CHANNEL_KEEP_ALIVE);
+            }
+            return true;
+        } catch (\Exception $e) {
+            return false;
+        }
     }
 
     /**
      * Have you successfully been logged in?
-     *
-     * @return bool
-     * @access public
      */
-    function isAuthenticated()
+    public function isAuthenticated(): bool
     {
         return (bool) ($this->bitmap & self::MASK_LOGIN);
     }
 
+    /**
+     * Is the interactive shell active?
+     */
+    public function isShellOpen(): bool
+    {
+        return $this->isInteractiveChannelOpen(self::CHANNEL_SHELL);
+    }
+
+    /**
+     * Is the exec pty active?
+     */
+    public function isPTYOpen(): bool
+    {
+        return $this->isInteractiveChannelOpen(self::CHANNEL_EXEC);
+    }
+
+    /**
+     * Is the given interactive channel active?
+     *
+     * @param int $channel Channel id returned by self::getInteractiveChannelId()
+     */
+    public function isInteractiveChannelOpen(int $channel): bool
+    {
+        return $this->isAuthenticated() && $this->is_channel_status_data($channel);
+    }
+
+    /**
+     * Returns a channel identifier, presently of the last interactive channel opened, regardless of current status.
+     * Returns 0 if no interactive channel has been opened.
+     *
+     * @see self::isInteractiveChannelOpen()
+     */
+    public function getInteractiveChannelId(): int
+    {
+        return $this->channel_id_last_interactive;
+    }
+
+    /**
+     * Pings a server connection, or tries to reconnect if the connection has gone down
+     *
+     * Inspired by http://php.net/manual/en/mysqli.ping.php
+     */
+    public function ping(): bool
+    {
+        if (!$this->isAuthenticated()) {
+            if (!empty($this->auth)) {
+                return $this->reconnect();
+            }
+            return false;
+        }
+
+        try {
+            $this->open_channel(self::CHANNEL_KEEP_ALIVE);
+        } catch (\RuntimeException $e) {
+            return $this->reconnect();
+        }
+
+        $this->close_channel(self::CHANNEL_KEEP_ALIVE);
+        return true;
+    }
+
+    /**
+     * In situ reconnect method
+     *
+     * @return boolean
+     */
+    private function reconnect(): bool
+    {
+        $this->disconnect_helper(DisconnectReason::BY_APPLICATION);
+        $this->connect();
+        foreach ($this->auth as $auth) {
+            $result = $this->login(...$auth);
+        }
+        return $result;
+    }
+
+    /**
+     * Resets a connection for re-use
+     */
+    protected function reset_connection(): void
+    {
+        if (is_resource($this->fsock) && get_resource_type($this->fsock) === 'stream') {
+            fclose($this->fsock);
+        }
+        $this->fsock = null;
+        $this->bitmap = 0;
+        $this->binary_packet_buffer = null;
+        $this->decrypt = $this->encrypt = false;
+        $this->decrypt_block_size = $this->encrypt_block_size = 8;
+        $this->hmac_check = $this->hmac_create = false;
+        $this->hmac_size = false;
+        $this->session_id = false;
+        $this->get_seq_no = $this->send_seq_no = 0;
+        $this->channel_status = [];
+        $this->channel_id_last_interactive = 0;
+        $this->channel_buffers = [];
+        $this->channel_buffers_write = [];
+    }
+
+    /**
+     * @return int[] second and microsecond stream timeout options based on user-requested timeout and keep-alive, or the default socket timeout by default, which mirrors PHP socket streams.
+     */
+    private function get_stream_timeout()
+    {
+        $sec = (int) ini_get('default_socket_timeout');
+        $usec = 0;
+        if ($this->curTimeout > 0) {
+            $sec = (int) floor($this->curTimeout);
+            $usec = (int) (1000000 * ($this->curTimeout - $sec));
+        }
+        if ($this->keepAlive > 0) {
+            $elapsed = microtime(true) - $this->last_packet;
+            $timeout = max($this->keepAlive - $elapsed, 0);
+            if (!$this->curTimeout || $timeout < $this->curTimeout) {
+                $sec = (int) floor($timeout);
+                $usec = (int) (1000000 * ($timeout - $sec));
+            }
+        }
+        return [$sec, $usec];
+    }
+
+    /**
+     * Retrieves the next packet with added timeout and type handling
+     *
+     * @param string $message_types Message types to enforce in response, closing if not met
+     * @return string
+     * @throws ConnectionClosedException If an error has occurred preventing read of the next packet
+     */
+    private function get_binary_packet_or_close(...$message_types)
+    {
+        try {
+            $packet = $this->get_binary_packet();
+            if (count($message_types) > 0 && !in_array(ord($packet[0]), $message_types)) {
+                $this->disconnect_helper(DisconnectReason::PROTOCOL_ERROR);
+                throw new ConnectionClosedException('Bad message type. Expected: #'
+                    . implode(', #', $message_types) . '. Got: #' . ord($packet[0]));
+            }
+            return $packet;
+        } catch (TimeoutException $e) {
+            $this->disconnect_helper(DisconnectReason::BY_APPLICATION);
+            throw new ConnectionClosedException('Connection closed due to timeout');
+        }
+    }
+
     /**
      * Gets Binary Packets
      *
      * See '6. Binary Packet Protocol' of rfc4253 for more info.
      *
      * @see self::_send_binary_packet()
-     * @return string
-     * @throws \RuntimeException on connection errors
-     * @access private
+     * @throws TimeoutException If user requested timeout was reached while waiting for next packet
+     * @throws ConnectionClosedException If an error has occurred preventing read of the next packet
      */
-    function _get_binary_packet()
+    private function get_binary_packet(): string
     {
-        if (!is_resource($this->fsock) || feof($this->fsock)) {
-            $this->bitmap = 0;
-            throw new \RuntimeException('Connection closed prematurely');
+        if (!is_resource($this->fsock)) {
+            throw new InvalidArgumentException('fsock is not a resource.');
+        }
+        if (!$this->keyExchangeInProgress && count($this->kex_buffer)) {
+            return $this->filter(array_shift($this->kex_buffer));
+        }
+        if ($this->binary_packet_buffer == null) {
+            // buffer the packet to permit continued reads across timeouts
+            $this->binary_packet_buffer = (object) [
+                'read_time' => 0, // the time to read the packet from the socket
+                'raw' => '', // the raw payload read from the socket
+                'plain' => '', // the packet in plain text, excluding packet_length header
+                'packet_length' => null, // the packet_length value pulled from the payload
+                'size' => $this->decrypt_block_size, // the total size of this packet to be read from the socket
+                                                     // initialize to read single block until packet_length is available
+            ];
+        }
+        $packet = $this->binary_packet_buffer;
+        while (strlen($packet->raw) < $packet->size) {
+            if (feof($this->fsock)) {
+                $this->disconnect_helper(DisconnectReason::CONNECTION_LOST);
+                throw new ConnectionClosedException('Connection closed by server');
+            }
+            if ($this->curTimeout < 0) {
+                $this->is_timeout = true;
+                throw new TimeoutException('Timed out waiting for server');
+            }
+            $this->send_keep_alive();
+
+            [$sec, $usec] = $this->get_stream_timeout();
+            stream_set_timeout($this->fsock, $sec, $usec);
+            $start = microtime(true);
+            $raw = stream_get_contents($this->fsock, $packet->size - strlen($packet->raw));
+            $elapsed = microtime(true) - $start;
+            $packet->read_time += $elapsed;
+            if ($this->curTimeout > 0) {
+                $this->curTimeout -= $elapsed;
+            }
+            if ($raw === false) {
+                $this->disconnect_helper(DisconnectReason::CONNECTION_LOST);
+                throw new ConnectionClosedException('Connection closed by server');
+            } elseif (!strlen($raw)) {
+                continue;
+            }
+            $packet->raw .= $raw;
+            if (!$packet->packet_length) {
+                $this->get_binary_packet_size($packet);
+            }
+        }
+
+        if (strlen($packet->raw) != $packet->size) {
+            throw new \RuntimeException('Size of packet was not expected length');
+        }
+        // destroy buffer as packet represents the entire payload and should be processed in full
+        $this->binary_packet_buffer = null;
+        // copy the raw payload, so as not to destroy original
+        $raw = $packet->raw;
+        if ($this->hmac_check instanceof Hash) {
+            $hmac = Strings::pop($raw, $this->hmac_size);
+        }
+        $packet_length_header_size = 4;
+        if ($this->decrypt) {
+            switch ($this->decryptName) {
+                case 'aes128-gcm@openssh.com':
+                case 'aes256-gcm@openssh.com':
+                    $this->decrypt->setNonce(
+                        $this->decryptFixedPart .
+                        $this->decryptInvocationCounter
+                    );
+                    Strings::increment_str($this->decryptInvocationCounter);
+                    $this->decrypt->setAAD(Strings::shift($raw, $packet_length_header_size));
+                    $this->decrypt->setTag(Strings::pop($raw, $this->decrypt_block_size));
+                    $packet->plain = $this->decrypt->decrypt($raw);
+                    break;
+                case 'chacha20-poly1305@openssh.com':
+                    // This should be impossible, but we are checking anyway to narrow the type for Psalm.
+                    if (!($this->decrypt instanceof ChaCha20)) {
+                        throw new LogicException('$this->decrypt is not a ' . ChaCha20::class);
+                    }
+                    $this->decrypt->setNonce(pack('N2', 0, $this->get_seq_no));
+                    $this->decrypt->setCounter(0);
+                    // this is the same approach that's implemented in Salsa20::createPoly1305Key()
+                    // but we don't want to use the same AEAD construction that RFC8439 describes
+                    // for ChaCha20-Poly1305 so we won't rely on it (see Salsa20::poly1305())
+                    $this->decrypt->setPoly1305Key(
+                        $this->decrypt->encrypt(str_repeat("\0", 32))
+                    );
+                    $this->decrypt->setAAD(Strings::shift($raw, $packet_length_header_size));
+                    $this->decrypt->setCounter(1);
+                    $this->decrypt->setTag(Strings::pop($raw, 16));
+                    $packet->plain = $this->decrypt->decrypt($raw);
+                    break;
+                default:
+                    if (!$this->hmac_check instanceof Hash || !$this->hmac_check_etm) {
+                        // first block was already decrypted for contained packet_length header
+                        Strings::shift($raw, $this->decrypt_block_size);
+                        if (strlen($raw) > 0) {
+                            $packet->plain .= $this->decrypt->decrypt($raw);
+                        }
+                    } else {
+                        Strings::shift($raw, $packet_length_header_size);
+                        $packet->plain = $this->decrypt->decrypt($raw);
+                    }
+                    break;
+            }
+        } else {
+            Strings::shift($raw, $packet_length_header_size);
+            $packet->plain = $raw;
+        }
+        if ($this->hmac_check instanceof Hash) {
+            $reconstructed = !$this->hmac_check_etm ?
+                pack('Na*', $packet->packet_length, $packet->plain) :
+                substr($packet->raw, 0, -$this->hmac_size);
+            if (($this->hmac_check->getHash() & "\xFF\xFF\xFF\xFF") == 'umac') {
+                $this->hmac_check->setNonce("\0\0\0\0" . pack('N', $this->get_seq_no));
+                if ($hmac != $this->hmac_check->hash($reconstructed)) {
+                    $this->disconnect_helper(DisconnectReason::MAC_ERROR);
+                    throw new ConnectionClosedException('Invalid UMAC');
+                }
+            } else {
+                if ($hmac != $this->hmac_check->hash(pack('Na*', $this->get_seq_no, $reconstructed))) {
+                    $this->disconnect_helper(DisconnectReason::MAC_ERROR);
+                    throw new ConnectionClosedException('Invalid HMAC');
+                }
+            }
         }
-
-        $start = microtime(true);
-        $raw = fread($this->fsock, $this->decrypt_block_size);
-
-        if (!strlen($raw)) {
-            return '';
+        $padding_length = 0;
+        $payload = $packet->plain;
+        ['padding_length' => $padding_length] = unpack('Cpadding_length', Strings::shift($payload, 1));
+        if ($padding_length > 0) {
+            Strings::pop($payload, $padding_length);
         }
 
-        if ($this->decrypt !== false) {
-            $raw = $this->decrypt->decrypt($raw);
+        if (!$this->keyExchangeInProgress) {
+            $this->bytesTransferredSinceLastKEX += $packet->packet_length + $padding_length + 5;
         }
-        if ($raw === false) {
-            throw new \RuntimeException('Unable to decrypt content');
+
+        if (empty($payload)) {
+            $this->disconnect_helper(DisconnectReason::PROTOCOL_ERROR);
+            throw new ConnectionClosedException('Plaintext is too short');
         }
 
-        extract(unpack('Npacket_length/Cpadding_length', $this->_string_shift($raw, 5)));
+        switch ($this->decompress) {
+            case self::NET_SSH2_COMPRESSION_ZLIB_AT_OPENSSH:
+                if (!$this->isAuthenticated()) {
+                    break;
+                }
+                // fall-through
+            case self::NET_SSH2_COMPRESSION_ZLIB:
+                if ($this->regenerate_decompression_context) {
+                    $this->regenerate_decompression_context = false;
+
+                    $cmf = ord($payload[0]);
+                    $cm = $cmf & 0x0F;
+                    if ($cm != 8) { // deflate
+                        throw new UnsupportedAlgorithmException("Only CM = 8 ('deflate') is supported ($cm)");
+                    }
+                    $cinfo = ($cmf & 0xF0) >> 4;
+                    if ($cinfo > 7) {
+                        throw new RuntimeException("CINFO above 7 is not allowed ($cinfo)");
+                    }
+                    $windowSize = 1 << ($cinfo + 8);
 
-        $remaining_length = $packet_length + 4 - $this->decrypt_block_size;
+                    $flg = ord($payload[1]);
+                    //$fcheck = $flg && 0x0F;
+                    if ((($cmf << 8) | $flg) % 31) {
+                        throw new RuntimeException('fcheck failed');
+                    }
+                    $fdict = boolval($flg & 0x20);
+                    $flevel = ($flg & 0xC0) >> 6;
 
-        // quoting <http://tools.ietf.org/html/rfc4253#section-6.1>,
-        // "implementations SHOULD check that the packet length is reasonable"
-        // PuTTY uses 0x9000 as the actual max packet size and so to shall we
-        if ($remaining_length < -$this->decrypt_block_size || $remaining_length > 0x9000 || $remaining_length % $this->decrypt_block_size != 0) {
-            throw new \RuntimeException('Invalid size');
+                    $this->decompress_context = inflate_init(ZLIB_ENCODING_RAW, ['window' => $cinfo + 8]);
+                    $payload = substr($payload, 2);
+                }
+                if ($this->decompress_context) {
+                    $payload = inflate_add($this->decompress_context, $payload, ZLIB_PARTIAL_FLUSH);
+                }
         }
 
-        $buffer = '';
-        while ($remaining_length > 0) {
-            $temp = fread($this->fsock, $remaining_length);
-            if ($temp === false || feof($this->fsock)) {
-                $this->bitmap = 0;
-                throw new \RuntimeException('Error reading from socket');
-            }
-            $buffer.= $temp;
-            $remaining_length-= strlen($temp);
+        $this->get_seq_no++;
+
+        if (defined('NET_SSH2_LOGGING')) {
+            $current = microtime(true);
+            $message_number = sprintf(
+                '<- %s (since last: %s, network: %ss)',
+                ($constantName = MessageType::findConstantNameByValue($value = ord($payload[0])))
+                    ? "SSH_MSG_$constantName"
+                    : "UNKNOWN ($value)",
+                round($current - $this->last_packet, 4),
+                round($packet->read_time, 4)
+            );
+            $this->append_log($message_number, $payload);
         }
-        $stop = microtime(true);
-        if (strlen($buffer)) {
-            $raw.= $this->decrypt !== false ? $this->decrypt->decrypt($buffer) : $buffer;
+        $this->last_packet = microtime(true);
+
+        if ($this->bytesTransferredSinceLastKEX > $this->doKeyReexchangeAfterXBytes) {
+            $this->key_exchange();
         }
 
-        $payload = $this->_string_shift($raw, $packet_length - $padding_length - 1);
-        $padding = $this->_string_shift($raw, $padding_length); // should leave $raw empty
+        // don't filter if we're in the middle of a key exchange (since _filter might send out packets)
+        return $this->keyExchangeInProgress ? $payload : $this->filter($payload);
+    }
 
-        if ($this->hmac_check !== false) {
-            $hmac = fread($this->fsock, $this->hmac_size);
-            if ($hmac === false || strlen($hmac) != $this->hmac_size) {
-                $this->bitmap = 0;
-                throw new \RuntimeException('Error reading socket');
-            } elseif ($hmac != $this->hmac_check->hash(pack('NNCa*', $this->get_seq_no, $packet_length, $padding_length, $payload . $padding))) {
-                throw new \RuntimeException('Invalid HMAC');
+    /**
+     * @param object $packet The packet object being constructed, passed by reference
+     *        The size, packet_length, and plain properties of this object may be modified in processing
+     * @throws InvalidPacketLengthException if the packet length header is invalid
+     */
+    private function get_binary_packet_size(object &$packet): void
+    {
+        $packet_length_header_size = 4;
+        if (strlen($packet->raw) < $packet_length_header_size) {
+            return;
+        }
+        $packet_length = 0;
+        $added_validation_length = 0; // indicates when the packet length header is included when validating packet length against block size
+        if ($this->decrypt) {
+            switch ($this->decryptName) {
+                case 'aes128-gcm@openssh.com':
+                case 'aes256-gcm@openssh.com':
+                    ['packet_length' => $packet_length] = unpack('Npacket_length', substr($packet->raw, 0, $packet_length_header_size));
+                    $packet->size = $packet_length_header_size + $packet_length + $this->decrypt_block_size; // expect tag
+                    break;
+                case 'chacha20-poly1305@openssh.com':
+                    $this->lengthDecrypt->setNonce(pack('N2', 0, $this->get_seq_no));
+                    $packet_length_header = $this->lengthDecrypt->decrypt(substr($packet->raw, 0, $packet_length_header_size));
+                    ['packet_length' => $packet_length] = unpack('Npacket_length', $packet_length_header);
+                    $packet->size = $packet_length_header_size + $packet_length + 16; // expect tag
+                    break;
+                default:
+                    if (!$this->hmac_check instanceof Hash || !$this->hmac_check_etm) {
+                        if (strlen($packet->raw) < $this->decrypt_block_size) {
+                            return;
+                        }
+                        $packet->plain = $this->decrypt->decrypt(substr($packet->raw, 0, $this->decrypt_block_size));
+                        ['packet_length' => $packet_length] = unpack('Npacket_length', Strings::shift($packet->plain, $packet_length_header_size));
+                        $packet->size = $packet_length_header_size + $packet_length;
+                        $added_validation_length = $packet_length_header_size;
+                    } else {
+                        ['packet_length' => $packet_length] = unpack('Npacket_length', substr($packet->raw, 0, $packet_length_header_size));
+                        $packet->size = $packet_length_header_size + $packet_length;
+                    }
+                    break;
             }
+        } else {
+            ['packet_length' => $packet_length] = unpack('Npacket_length', substr($packet->raw, 0, $packet_length_header_size));
+            $packet->size = $packet_length_header_size + $packet_length;
+            $added_validation_length = $packet_length_header_size;
         }
-
-        //if ($this->decompress) {
-        //    $payload = gzinflate(substr($payload, 2));
-        //}
-
-        $this->get_seq_no++;
-
-        if (defined('NET_SSH2_LOGGING')) {
-            $current = microtime(true);
-            $message_number = isset($this->message_numbers[ord($payload[0])]) ? $this->message_numbers[ord($payload[0])] : 'UNKNOWN (' . ord($payload[0]) . ')';
-            $message_number = '<- ' . $message_number .
-                              ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)';
-            $this->_append_log($message_number, $payload);
-            $this->last_packet = $current;
+        // quoting <http://tools.ietf.org/html/rfc4253#section-6.1>,
+        // "implementations SHOULD check that the packet length is reasonable"
+        // PuTTY uses 0x9000 as the actual max packet size and so to shall we
+        if (
+            $packet_length <= 0 || $packet_length > 0x9000
+            || ($packet_length + $added_validation_length) % $this->decrypt_block_size != 0
+        ) {
+            $this->disconnect_helper(DisconnectReason::PROTOCOL_ERROR);
+            throw new InvalidPacketLengthException('Invalid packet length');
         }
+        if ($this->hmac_check instanceof Hash) {
+            $packet->size += $this->hmac_size;
+        }
+        $packet->packet_length = $packet_length;
+    }
 
-        return $this->_filter($payload);
+    /**
+     * Handle Disconnect
+     *
+     * Because some binary packets need to be ignored...
+     *
+     * @see self::filter()
+     * @see self::key_exchange()
+     * @return boolean
+     * @access private
+     */
+    private function handleDisconnect($payload)
+    {
+        Strings::shift($payload, 1);
+        [$reason_code, $message] = Strings::unpackSSH2('Ns', $payload);
+        $this->errors[] = 'SSH_MSG_DISCONNECT: ' . self::$disconnect_reasons[$reason_code] . "\r\n$message";
+        $this->disconnect_helper(DisconnectReason::CONNECTION_LOST);
+        throw new ConnectionClosedException('Connection closed by server');
     }
 
     /**
@@ -2971,73 +3570,90 @@ function _get_binary_packet()
      * Because some binary packets need to be ignored...
      *
      * @see self::_get_binary_packet()
-     * @return string
-     * @access private
      */
-    function _filter($payload)
+    private function filter(string $payload): string
     {
         switch (ord($payload[0])) {
-            case NET_SSH2_MSG_DISCONNECT:
-                $this->_string_shift($payload, 1);
-                extract(unpack('Nreason_code/Nlength', $this->_string_shift($payload, 8)));
-                $this->errors[] = 'SSH_MSG_DISCONNECT: ' . $this->disconnect_reasons[$reason_code] . "\r\n" . utf8_decode($this->_string_shift($payload, $length));
-                $this->bitmap = 0;
-                return false;
-            case NET_SSH2_MSG_IGNORE:
-                $payload = $this->_get_binary_packet();
+            case MessageType::DISCONNECT:
+                return $this->handleDisconnect($payload);
+            case MessageType::IGNORE:
+                $payload = $this->get_binary_packet();
                 break;
-            case NET_SSH2_MSG_DEBUG:
-                $this->_string_shift($payload, 2);
-                extract(unpack('Nlength', $this->_string_shift($payload, 4)));
-                $this->errors[] = 'SSH_MSG_DEBUG: ' . utf8_decode($this->_string_shift($payload, $length));
-                $payload = $this->_get_binary_packet();
+            case MessageType::DEBUG:
+                Strings::shift($payload, 2); // second byte is "always_display"
+                [$message] = Strings::unpackSSH2('s', $payload);
+                $this->errors[] = "SSH_MSG_DEBUG: $message";
+                $payload = $this->get_binary_packet();
                 break;
-            case NET_SSH2_MSG_UNIMPLEMENTED:
-                return false;
-            case NET_SSH2_MSG_KEXINIT:
+            case MessageType::UNIMPLEMENTED:
+                break;
+            case MessageType::KEXINIT:
+                // this is here for server key re-exchanges after the initial key exchange
                 if ($this->session_id !== false) {
-                    if (!$this->_key_exchange($payload)) {
-                        $this->bitmap = 0;
-                        return false;
+                    if (!$this->key_exchange($payload)) {
+                        $this->disconnect_helper(DisconnectReason::KEY_EXCHANGE_FAILED);
+                        throw new ConnectionClosedException('Key exchange failed');
+                    }
+                    $payload = $this->get_binary_packet();
+                }
+                break;
+            case MessageType::EXT_INFO:
+                Strings::shift($payload, 1);
+                [$nr_extensions] = Strings::unpackSSH2('N', $payload);
+                for ($i = 0; $i < $nr_extensions; $i++) {
+                    [$extension_name, $extension_value] = Strings::unpackSSH2('ss', $payload);
+                    if ($extension_name == 'server-sig-algs') {
+                        $this->supported_private_key_algorithms = explode(',', $extension_value);
                     }
-                    $payload = $this->_get_binary_packet();
                 }
+                $payload = $this->get_binary_packet();
         }
 
         // see http://tools.ietf.org/html/rfc4252#section-5.4; only called when the encryption has been activated and when we haven't already logged in
-        if (($this->bitmap & self::MASK_CONNECTED) && !($this->bitmap & self::MASK_LOGIN) && ord($payload[0]) == NET_SSH2_MSG_USERAUTH_BANNER) {
-            $this->_string_shift($payload, 1);
-            extract(unpack('Nlength', $this->_string_shift($payload, 4)));
-            $this->banner_message = utf8_decode($this->_string_shift($payload, $length));
-            $payload = $this->_get_binary_packet();
+        if (($this->bitmap & self::MASK_CONNECTED) && !$this->isAuthenticated() && ord($payload[0]) == MessageType::USERAUTH_BANNER) {
+            Strings::shift($payload, 1);
+            [$this->banner_message] = Strings::unpackSSH2('s', $payload);
+            $payload = $this->get_binary_packet();
         }
 
         // only called when we've already logged in
-        if (($this->bitmap & self::MASK_CONNECTED) && ($this->bitmap & self::MASK_LOGIN)) {
+        if (($this->bitmap & self::MASK_CONNECTED) && $this->isAuthenticated()) {
             switch (ord($payload[0])) {
-                case NET_SSH2_MSG_GLOBAL_REQUEST: // see http://tools.ietf.org/html/rfc4254#section-4
-                    extract(unpack('Nlength', $this->_string_shift($payload, 4)));
-                    $this->errors[] = 'SSH_MSG_GLOBAL_REQUEST: ' . $this->_string_shift($payload, $length);
-
-                    if (!$this->_send_binary_packet(pack('C', NET_SSH2_MSG_REQUEST_FAILURE))) {
-                        return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
+                case MessageType::CHANNEL_REQUEST:
+                    if (strlen($payload) == 31) {
+                        [
+                            'packet_type' => $packet_type,
+                            'channel' => $channel,
+                            'length' => $length
+                        ] = unpack('cpacket_type/Nchannel/Nlength', $payload);
+                        if (substr($payload, 9, $length) == 'keepalive@openssh.com' && isset($this->server_channels[$channel])) {
+                            if (ord(substr($payload, 9 + $length))) { // want reply
+                                $this->send_binary_packet(pack('CN', MessageType::CHANNEL_SUCCESS, $this->server_channels[$channel]));
+                            }
+                            $payload = $this->get_binary_packet();
+                        }
                     }
-
-                    $payload = $this->_get_binary_packet();
                     break;
-                case NET_SSH2_MSG_CHANNEL_OPEN: // see http://tools.ietf.org/html/rfc4254#section-5.1
-                    $this->_string_shift($payload, 1);
-                    extract(unpack('Nlength', $this->_string_shift($payload, 4)));
-                    $data = $this->_string_shift($payload, $length);
-                    extract(unpack('Nserver_channel', $this->_string_shift($payload, 4)));
+                case MessageType::GLOBAL_REQUEST: // see http://tools.ietf.org/html/rfc4254#section-4
+                    Strings::shift($payload, 1);
+                    [$request_name] = Strings::unpackSSH2('s', $payload);
+                    $this->errors[] = "SSH_MSG_GLOBAL_REQUEST: $request_name";
+                    $this->send_binary_packet(pack('C', MessageType::REQUEST_FAILURE));
+                    $payload = $this->get_binary_packet();
+                    break;
+                case MessageType::CHANNEL_OPEN: // see http://tools.ietf.org/html/rfc4254#section-5.1
+                    Strings::shift($payload, 1);
+                    [$data, $server_channel] = Strings::unpackSSH2('sN', $payload);
                     switch ($data) {
                         case 'auth-agent':
                         case 'auth-agent@openssh.com':
                             if (isset($this->agent)) {
                                 $new_channel = self::CHANNEL_AGENT_FORWARD;
 
-                                extract(unpack('Nremote_window_size', $this->_string_shift($payload, 4)));
-                                extract(unpack('Nremote_maximum_packet_size', $this->_string_shift($payload, 4)));
+                                [
+                                    $remote_window_size,
+                                    $remote_maximum_packet_size
+                                ] = Strings::unpackSSH2('NN', $payload);
 
                                 $this->packet_size_client_to_server[$new_channel] = $remote_window_size;
                                 $this->window_size_server_to_client[$new_channel] = $remote_maximum_packet_size;
@@ -3047,7 +3663,7 @@ function _filter($payload)
 
                                 $packet = pack(
                                     'CN4',
-                                    NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION,
+                                    MessageType::CHANNEL_OPEN_CONFIRMATION,
                                     $server_channel,
                                     $new_channel,
                                     $packet_size,
@@ -3055,37 +3671,24 @@ function _filter($payload)
                                 );
 
                                 $this->server_channels[$new_channel] = $server_channel;
-                                $this->channel_status[$new_channel] = NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION;
-                                if (!$this->_send_binary_packet($packet)) {
-                                    return false;
-                                }
+                                $this->channel_status[$new_channel] = MessageType::CHANNEL_OPEN_CONFIRMATION;
+                                $this->send_binary_packet($packet);
                             }
                             break;
                         default:
-                            $packet = pack(
-                                'CN3a*Na*',
-                                NET_SSH2_MSG_REQUEST_FAILURE,
+                            $packet = Strings::packSSH2(
+                                'CN2ss',
+                                MessageType::CHANNEL_OPEN_FAILURE,
                                 $server_channel,
-                                NET_SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED,
-                                0,
-                                '',
-                                0,
-                                ''
+                                ChannelConnectionFailureReason::ADMINISTRATIVELY_PROHIBITED,
+                                '', // description
+                                '' // language tag
                             );
 
-                            if (!$this->_send_binary_packet($packet)) {
-                                return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                            }
+                            $this->send_binary_packet($packet);
                     }
-                    $payload = $this->_get_binary_packet();
-                    break;
-                case NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST:
-                    $this->_string_shift($payload, 1);
-                    extract(unpack('Nchannel', $this->_string_shift($payload, 4)));
-                    extract(unpack('Nwindow_size', $this->_string_shift($payload, 4)));
-                    $this->window_size_client_to_server[$channel]+= $window_size;
 
-                    $payload = ($this->bitmap & self::MASK_WINDOW_ADJUST) ? true : $this->_get_binary_packet();
+                    $payload = $this->get_binary_packet();
             }
         }
 
@@ -3096,10 +3699,8 @@ function _filter($payload)
      * Enable Quiet Mode
      *
      * Suppress stderr from output
-     *
-     * @access public
      */
-    function enableQuietMode()
+    public function enableQuietMode(): void
     {
         $this->quiet_mode = true;
     }
@@ -3108,10 +3709,8 @@ function enableQuietMode()
      * Disable Quiet Mode
      *
      * Show stderr in output
-     *
-     * @access public
      */
-    function disableQuietMode()
+    public function disableQuietMode(): void
     {
         $this->quiet_mode = false;
     }
@@ -3121,31 +3720,28 @@ function disableQuietMode()
      *
      * @see self::enableQuietMode()
      * @see self::disableQuietMode()
-     * @access public
-     * @return bool
      */
-    function isQuietModeEnabled()
+    public function isQuietModeEnabled(): bool
     {
         return $this->quiet_mode;
     }
 
     /**
      * Enable request-pty when using exec()
-     *
-     * @access public
      */
-    function enablePTY()
+    public function enablePTY(): void
     {
         $this->request_pty = true;
     }
 
     /**
      * Disable request-pty when using exec()
-     *
-     * @access public
      */
-    function disablePTY()
+    public function disablePTY(): void
     {
+        if ($this->isPTYOpen()) {
+            $this->close_channel(self::CHANNEL_EXEC);
+        }
         $this->request_pty = false;
     }
 
@@ -3154,10 +3750,8 @@ function disablePTY()
      *
      * @see self::enablePTY()
      * @see self::disablePTY()
-     * @access public
-     * @return bool
      */
-    function isPTYEnabled()
+    public function isPTYEnabled(): bool
     {
         return $this->request_pty;
     }
@@ -3165,131 +3759,209 @@ function isPTYEnabled()
     /**
      * Gets channel data
      *
-     * Returns the data as a string if it's available and false if not.
+     * Returns the data as a string. bool(true) is returned if:
      *
-     * @param $client_channel
-     * @return mixed
-     * @throws \RuntimeException on connection error
-     * @access private
+     * - the server closes the channel
+     * - if the connection times out
+     * - if a window adjust packet is received on the given negated client channel
+     * - if the channel status is CHANNEL_OPEN and the response was CHANNEL_OPEN_CONFIRMATION
+     * - if the channel status is CHANNEL_REQUEST and the response was CHANNEL_SUCCESS
+     * - if the channel status is CHANNEL_CLOSE and the response was CHANNEL_CLOSE
+     *
+     * bool(false) is returned if:
+     *
+     * - if the channel status is CHANNEL_REQUEST and the response was CHANNEL_FAILURE
+     *
+     * @param int $client_channel Specifies the channel to return data for, and data received
+     *        on other channels is buffered. The respective negative value of a channel is
+     *        also supported for the case that the caller is awaiting adjustment of the data
+     *        window, and where data received on that respective channel is also buffered.
+     * @throws RuntimeException on connection error
      */
-    function _get_channel_packet($client_channel, $skip_extended = false)
+    protected function get_channel_packet(int $client_channel, bool $skip_extended = false)
     {
         if (!empty($this->channel_buffers[$client_channel])) {
-            return array_shift($this->channel_buffers[$client_channel]);
+            // in phpseclib 4.0 this should be changed to $this->channel_status[$client_channel] ?? null
+            switch (isset($this->channel_status[$client_channel]) ?? null) {
+                case MessageType::CHANNEL_REQUEST:
+                    foreach ($this->channel_buffers[$client_channel] as $i => $packet) {
+                        switch (ord($packet[0])) {
+                            case MessageType::CHANNEL_SUCCESS:
+                            case MessageType::CHANNEL_FAILURE:
+                                unset($this->channel_buffers[$client_channel][$i]);
+                                return substr($packet, 1);
+                        }
+                    }
+                    break;
+                default:
+                    return substr(array_shift($this->channel_buffers[$client_channel]), 1);
+            }
         }
 
         while (true) {
-            if ($this->curTimeout) {
-                if ($this->curTimeout < 0) {
-                    $this->is_timeout = true;
-                    return true;
-                }
-
-                $read = array($this->fsock);
-                $write = $except = null;
-
-                $start = microtime(true);
-                $sec = floor($this->curTimeout);
-                $usec = 1000000 * ($this->curTimeout - $sec);
-                // on windows this returns a "Warning: Invalid CRT parameters detected" error
-                if (!@stream_select($read, $write, $except, $sec, $usec) && !count($read)) {
-                    $this->is_timeout = true;
-                    return true;
-                }
-                $elapsed = microtime(true) - $start;
-                $this->curTimeout-= $elapsed;
-            }
-
-            $response = $this->_get_binary_packet();
-            if ($response === false) {
-                throw new \RuntimeException('Connection closed by server');
-            }
-            if ($client_channel == -1 && $response === true) {
+            try {
+                $response = $this->get_binary_packet();
+            } catch (TimeoutException $e) {
                 return true;
             }
-            if (!strlen($response)) {
-                return '';
-            }
-
-            extract(unpack('Ctype', $this->_string_shift($response, 1)));
-
-            if ($type == NET_SSH2_MSG_CHANNEL_OPEN) {
-                extract(unpack('Nlength', $this->_string_shift($response, 4)));
-            } else {
-                extract(unpack('Nchannel', $this->_string_shift($response, 4)));
+            [$type] = Strings::unpackSSH2('C', $response);
+            if (strlen($response) >= 4) {
+                [$channel] = Strings::unpackSSH2('N', $response);
             }
 
             // will not be setup yet on incoming channel open request
             if (isset($channel) && isset($this->channel_status[$channel]) && isset($this->window_size_server_to_client[$channel])) {
-                $this->window_size_server_to_client[$channel]-= strlen($response);
+                $this->window_size_server_to_client[$channel] -= strlen($response);
 
                 // resize the window, if appropriate
                 if ($this->window_size_server_to_client[$channel] < 0) {
-                    $packet = pack('CNN', NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST, $this->server_channels[$channel], $this->window_size);
-                    if (!$this->_send_binary_packet($packet)) {
-                        return false;
-                    }
-                    $this->window_size_server_to_client[$channel]+= $this->window_size;
+                // PuTTY does something more analogous to the following:
+                //if ($this->window_size_server_to_client[$channel] < 0x3FFFFFFF) {
+                    $packet = pack('CNN', MessageType::CHANNEL_WINDOW_ADJUST, $this->server_channels[$channel], $this->window_resize);
+                    $this->send_binary_packet($packet);
+                    $this->window_size_server_to_client[$channel] += $this->window_resize;
+                }
+
+                switch ($type) {
+                    case MessageType::CHANNEL_WINDOW_ADJUST:
+                        [$window_size] = Strings::unpackSSH2('N', $response);
+                        $this->window_size_client_to_server[$channel] += $window_size;
+                        if ($channel == -$client_channel) {
+                            return true;
+                        }
+
+                        continue 2;
+                    case MessageType::CHANNEL_EXTENDED_DATA:
+                        /*
+                        if ($client_channel == self::CHANNEL_EXEC) {
+                            $this->send_channel_packet($client_channel, chr(0));
+                        }
+                        */
+                        // currently, there's only one possible value for $data_type_code: NET_SSH2_EXTENDED_DATA_STDERR
+                        [$data_type_code, $data] = Strings::unpackSSH2('Ns', $response);
+                        $this->stdErrorLog .= $data;
+                        if ($skip_extended || $this->quiet_mode) {
+                            continue 2;
+                        }
+                        if ($client_channel == $channel && $this->channel_status[$channel] == MessageType::CHANNEL_DATA) {
+                            return $data;
+                        }
+                        $this->channel_buffers[$channel][] = chr($type) . $data;
+
+                        continue 2;
+                    case MessageType::CHANNEL_REQUEST:
+                        if (!isset($this->channel_status[$channel])) {
+                            continue 2;
+                        }
+                        [$value] = Strings::unpackSSH2('s', $response);
+                        switch ($value) {
+                            case 'exit-signal':
+                                [
+                                    , // FALSE
+                                    $signal_name,
+                                    , // core dumped
+                                    $error_message
+                                ] = Strings::unpackSSH2('bsbs', $response);
+
+                                $this->errors[] = "SSH_MSG_CHANNEL_REQUEST (exit-signal): $signal_name";
+                                if (strlen($error_message)) {
+                                    $this->errors[count($this->errors) - 1] .= "\r\n$error_message";
+                                }
+
+                                if (isset($this->channel_status[$channel]) && $this->channel_status[$channel] != MessageType::CHANNEL_CLOSE) {
+                                    if ($this->channel_status[$channel] != MessageType::CHANNEL_EOF) {
+                                        $this->send_binary_packet(pack('CN', MessageType::CHANNEL_EOF, $this->server_channels[$channel]));
+                                    }
+                                    $this->send_binary_packet(pack('CN', MessageType::CHANNEL_CLOSE, $this->server_channels[$channel]));
+
+                                    $this->channel_status[$channel] = MessageType::CHANNEL_CLOSE;
+                                }
+
+                                continue 3;
+                            case 'exit-status':
+                                [, $this->exit_status] = Strings::unpackSSH2('CN', $response);
+
+                                // "The client MAY ignore these messages."
+                                // -- http://tools.ietf.org/html/rfc4254#section-6.10
+
+                                continue 3;
+                            default:
+                                // "Some systems may not implement signals, in which case they SHOULD ignore this message."
+                                //  -- http://tools.ietf.org/html/rfc4254#section-6.9
+                                continue 3;
+                        }
                 }
 
                 switch ($this->channel_status[$channel]) {
-                    case NET_SSH2_MSG_CHANNEL_OPEN:
+                    case MessageType::CHANNEL_OPEN:
                         switch ($type) {
-                            case NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION:
-                                extract(unpack('Nserver_channel', $this->_string_shift($response, 4)));
-                                $this->server_channels[$channel] = $server_channel;
-                                extract(unpack('Nwindow_size', $this->_string_shift($response, 4)));
+                            case MessageType::CHANNEL_OPEN_CONFIRMATION:
+                                [
+                                    $this->server_channels[$channel],
+                                    $window_size,
+                                    $this->packet_size_client_to_server[$channel]
+                                ] = Strings::unpackSSH2('NNN', $response);
+
                                 if ($window_size < 0) {
-                                    $window_size&= 0x7FFFFFFF;
-                                    $window_size+= 0x80000000;
+                                    $window_size &= 0x7FFFFFFF;
+                                    $window_size += 0x80000000;
                                 }
                                 $this->window_size_client_to_server[$channel] = $window_size;
-                                $temp = unpack('Npacket_size_client_to_server', $this->_string_shift($response, 4));
-                                $this->packet_size_client_to_server[$channel] = $temp['packet_size_client_to_server'];
-                                $result = $client_channel == $channel ? true : $this->_get_channel_packet($client_channel, $skip_extended);
-                                $this->_on_channel_open();
+                                $result = $client_channel == $channel ? true : $this->get_channel_packet($client_channel, $skip_extended);
+                                $this->on_channel_open();
                                 return $result;
-                            //case NET_SSH2_MSG_CHANNEL_OPEN_FAILURE:
+                            case MessageType::CHANNEL_OPEN_FAILURE:
+                                $this->disconnect_helper(DisconnectReason::BY_APPLICATION);
+                                throw new RuntimeException('Unable to open channel');
                             default:
-                                $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                                throw new \RuntimeException('Unable to open channel');
+                                if ($client_channel == $channel) {
+                                    $this->disconnect_helper(DisconnectReason::BY_APPLICATION);
+                                    throw new RuntimeException('Unexpected response to open request');
+                                }
+                                return $this->get_channel_packet($client_channel, $skip_extended);
                         }
                         break;
-                    case NET_SSH2_MSG_CHANNEL_REQUEST:
+                    case MessageType::CHANNEL_REQUEST:
                         switch ($type) {
-                            case NET_SSH2_MSG_CHANNEL_SUCCESS:
+                            case MessageType::CHANNEL_SUCCESS:
                                 return true;
-                            case NET_SSH2_MSG_CHANNEL_FAILURE:
+                            case MessageType::CHANNEL_FAILURE:
                                 return false;
+                            case MessageType::CHANNEL_DATA:
+                                [$data] = Strings::unpackSSH2('s', $response);
+                                $this->channel_buffers[$channel][] = chr($type) . $data;
+                                return $this->get_channel_packet($client_channel, $skip_extended);
                             default:
-                                $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                                throw new \RuntimeException('Unable to fulfill channel request');
+                                $this->disconnect_helper(DisconnectReason::BY_APPLICATION);
+                                throw new RuntimeException('Unable to fulfill channel request');
                         }
-                    case NET_SSH2_MSG_CHANNEL_CLOSE:
-                        return $type == NET_SSH2_MSG_CHANNEL_CLOSE ? true : $this->_get_channel_packet($client_channel, $skip_extended);
+                    case MessageType::CHANNEL_CLOSE:
+                        if ($client_channel == $channel && $type == MessageType::CHANNEL_CLOSE) {
+                            return true;
+                        }
+                        return $this->get_channel_packet($client_channel, $skip_extended);
                 }
             }
 
-            // ie. $this->channel_status[$channel] == NET_SSH2_MSG_CHANNEL_DATA
+            // ie. $this->channel_status[$channel] == MessageType::CHANNEL_DATA
 
             switch ($type) {
-                case NET_SSH2_MSG_CHANNEL_DATA:
+                case MessageType::CHANNEL_DATA:
                     /*
                     if ($channel == self::CHANNEL_EXEC) {
                         // SCP requires null packets, such as this, be sent.  further, in the case of the ssh.com SSH server
                         // this actually seems to make things twice as fast.  more to the point, the message right after
                         // SSH_MSG_CHANNEL_DATA (usually SSH_MSG_IGNORE) won't block for as long as it would have otherwise.
                         // in OpenSSH it slows things down but only by a couple thousandths of a second.
-                        $this->_send_channel_packet($channel, chr(0));
+                        $this->send_channel_packet($channel, chr(0));
                     }
                     */
-                    extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                    $data = $this->_string_shift($response, $length);
+                    [$data] = Strings::unpackSSH2('s', $response);
 
                     if ($channel == self::CHANNEL_AGENT_FORWARD) {
-                        $agent_response = $this->agent->_forward_data($data);
+                        $agent_response = $this->agent->forwardData($data);
                         if (!is_bool($agent_response)) {
-                            $this->_send_channel_packet($channel, $agent_response);
+                            $this->send_channel_packet($channel, $agent_response);
                         }
                         break;
                     }
@@ -3297,83 +3969,29 @@ function _get_channel_packet($client_channel, $skip_extended = false)
                     if ($client_channel == $channel) {
                         return $data;
                     }
-                    if (!isset($this->channel_buffers[$channel])) {
-                        $this->channel_buffers[$channel] = array();
-                    }
-                    $this->channel_buffers[$channel][] = $data;
-                    break;
-                case NET_SSH2_MSG_CHANNEL_EXTENDED_DATA:
-                    /*
-                    if ($client_channel == self::CHANNEL_EXEC) {
-                        $this->_send_channel_packet($client_channel, chr(0));
-                    }
-                    */
-                    // currently, there's only one possible value for $data_type_code: NET_SSH2_EXTENDED_DATA_STDERR
-                    extract(unpack('Ndata_type_code/Nlength', $this->_string_shift($response, 8)));
-                    $data = $this->_string_shift($response, $length);
-                    $this->stdErrorLog.= $data;
-                    if ($skip_extended || $this->quiet_mode) {
-                        break;
-                    }
-                    if ($client_channel == $channel) {
-                        return $data;
-                    }
-                    if (!isset($this->channel_buffers[$channel])) {
-                        $this->channel_buffers[$channel] = array();
-                    }
-                    $this->channel_buffers[$channel][] = $data;
+                    $this->channel_buffers[$channel][] = chr($type) . $data;
                     break;
-                case NET_SSH2_MSG_CHANNEL_REQUEST:
-                    extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                    $value = $this->_string_shift($response, $length);
-                    switch ($value) {
-                        case 'exit-signal':
-                            $this->_string_shift($response, 1);
-                            extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                            $this->errors[] = 'SSH_MSG_CHANNEL_REQUEST (exit-signal): ' . $this->_string_shift($response, $length);
-                            $this->_string_shift($response, 1);
-                            extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                            if ($length) {
-                                $this->errors[count($this->errors)].= "\r\n" . $this->_string_shift($response, $length);
-                            }
-
-                            $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_EOF, $this->server_channels[$client_channel]));
-                            $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$channel]));
-
-                            $this->channel_status[$channel] = NET_SSH2_MSG_CHANNEL_EOF;
+                case MessageType::CHANNEL_CLOSE:
+                    $this->curTimeout = 5;
 
-                            break;
-                        case 'exit-status':
-                            extract(unpack('Cfalse/Nexit_status', $this->_string_shift($response, 5)));
-                            $this->exit_status = $exit_status;
-
-                            // "The client MAY ignore these messages."
-                            // -- http://tools.ietf.org/html/rfc4254#section-6.10
+                    $this->close_channel_bitmap($channel);
 
-                            break;
-                        default:
-                            // "Some systems may not implement signals, in which case they SHOULD ignore this message."
-                            //  -- http://tools.ietf.org/html/rfc4254#section-6.9
-                            break;
+                    if ($this->channel_status[$channel] != MessageType::CHANNEL_CLOSE) {
+                        $this->send_binary_packet(pack('CN', MessageType::CHANNEL_CLOSE, $this->server_channels[$channel]));
                     }
-                    break;
-                case NET_SSH2_MSG_CHANNEL_CLOSE:
-                    $this->curTimeout = 0;
 
-                    if ($this->bitmap & self::MASK_SHELL) {
-                        $this->bitmap&= ~self::MASK_SHELL;
-                    }
-                    if ($this->channel_status[$channel] != NET_SSH2_MSG_CHANNEL_EOF) {
-                        $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$channel]));
-                    }
+                    unset($this->channel_status[$channel]);
+                    $this->channelCount--;
 
-                    $this->channel_status[$channel] = NET_SSH2_MSG_CHANNEL_CLOSE;
-                    return true;
-                case NET_SSH2_MSG_CHANNEL_EOF:
+                    if ($client_channel == $channel) {
+                        return true;
+                    }
+                    // fall-through
+                case MessageType::CHANNEL_EOF:
                     break;
                 default:
-                    $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                    throw new \RuntimeException('Error reading channel data');
+                    $this->disconnect_helper(DisconnectReason::BY_APPLICATION);
+                    throw new RuntimeException("Error reading channel data ($type)");
             }
         }
     }
@@ -3383,89 +4001,224 @@ function _get_channel_packet($client_channel, $skip_extended = false)
      *
      * See '6. Binary Packet Protocol' of rfc4253 for more info.
      *
-     * @param string $data
-     * @param string $logged
      * @see self::_get_binary_packet()
-     * @return bool
-     * @access private
      */
-    function _send_binary_packet($data, $logged = null)
+    protected function send_binary_packet(string $data, ?string $logged = null): void
     {
         if (!is_resource($this->fsock) || feof($this->fsock)) {
-            $this->bitmap = 0;
-            throw new \RuntimeException('Connection closed prematurely');
+            $this->disconnect_helper(DisconnectReason::CONNECTION_LOST);
+            throw new ConnectionClosedException('Connection closed prematurely');
         }
 
-        //if ($this->compress) {
-        //    // the -4 removes the checksum:
-        //    // http://php.net/function.gzcompress#57710
-        //    $data = substr(gzcompress($data), 0, -4);
-        //}
+        if (!isset($logged)) {
+            $logged = $data;
+        }
+
+        switch ($this->compress) {
+            case self::NET_SSH2_COMPRESSION_ZLIB_AT_OPENSSH:
+                if (!$this->isAuthenticated()) {
+                    break;
+                }
+                // fall-through
+            case self::NET_SSH2_COMPRESSION_ZLIB:
+                if (!$this->regenerate_compression_context) {
+                    $header = '';
+                } else {
+                    $this->regenerate_compression_context = false;
+                    $this->compress_context = deflate_init(ZLIB_ENCODING_RAW, ['window' => 15]);
+                    $header = "\x78\x9C";
+                }
+                if ($this->compress_context) {
+                    $data = $header . deflate_add($this->compress_context, $data, ZLIB_PARTIAL_FLUSH);
+                }
+        }
 
         // 4 (packet length) + 1 (padding length) + 4 (minimal padding amount) == 9
         $packet_length = strlen($data) + 9;
+        if ($this->encrypt && $this->encrypt->usesNonce()) {
+            $packet_length -= 4;
+        }
         // round up to the nearest $this->encrypt_block_size
-        $packet_length+= (($this->encrypt_block_size - 1) * $packet_length) % $this->encrypt_block_size;
+        $packet_length += (($this->encrypt_block_size - 1) * $packet_length) % $this->encrypt_block_size;
         // subtracting strlen($data) is obvious - subtracting 5 is necessary because of packet_length and padding_length
         $padding_length = $packet_length - strlen($data) - 5;
+        switch (true) {
+            case $this->encrypt && $this->encrypt->usesNonce():
+            case $this->hmac_create instanceof Hash && $this->hmac_create_etm:
+                $padding_length += 4;
+                $packet_length += 4;
+        }
+
         $padding = Random::string($padding_length);
 
         // we subtract 4 from packet_length because the packet_length field isn't supposed to include itself
         $packet = pack('NCa*', $packet_length - 4, $padding_length, $data . $padding);
 
-        $hmac = $this->hmac_create !== false ? $this->hmac_create->hash(pack('Na*', $this->send_seq_no, $packet)) : '';
-        $this->send_seq_no++;
+        $hmac = '';
+        if ($this->hmac_create instanceof Hash && !$this->hmac_create_etm) {
+            if (($this->hmac_create->getHash() & "\xFF\xFF\xFF\xFF") == 'umac') {
+                $this->hmac_create->setNonce("\0\0\0\0" . pack('N', $this->send_seq_no));
+                $hmac = $this->hmac_create->hash($packet);
+            } else {
+                $hmac = $this->hmac_create->hash(pack('Na*', $this->send_seq_no, $packet));
+            }
+        }
+
+        if ($this->encrypt) {
+            switch ($this->encryptName) {
+                case 'aes128-gcm@openssh.com':
+                case 'aes256-gcm@openssh.com':
+                    $this->encrypt->setNonce(
+                        $this->encryptFixedPart .
+                        $this->encryptInvocationCounter
+                    );
+                    Strings::increment_str($this->encryptInvocationCounter);
+                    $this->encrypt->setAAD($temp = ($packet & "\xFF\xFF\xFF\xFF"));
+                    $packet = $temp . $this->encrypt->encrypt(substr($packet, 4));
+                    break;
+                case 'chacha20-poly1305@openssh.com':
+                    // This should be impossible, but we are checking anyway to narrow the type for Psalm.
+                    if (!($this->encrypt instanceof ChaCha20)) {
+                        throw new LogicException('$this->encrypt is not a ' . ChaCha20::class);
+                    }
+
+                    $nonce = pack('N2', 0, $this->send_seq_no);
+
+                    $this->encrypt->setNonce($nonce);
+                    $this->lengthEncrypt->setNonce($nonce);
+
+                    $length = $this->lengthEncrypt->encrypt($packet & "\xFF\xFF\xFF\xFF");
+
+                    $this->encrypt->setCounter(0);
+                    // this is the same approach that's implemented in Salsa20::createPoly1305Key()
+                    // but we don't want to use the same AEAD construction that RFC8439 describes
+                    // for ChaCha20-Poly1305 so we won't rely on it (see Salsa20::poly1305())
+                    $this->encrypt->setPoly1305Key(
+                        $this->encrypt->encrypt(str_repeat("\0", 32))
+                    );
+                    $this->encrypt->setAAD($length);
+                    $this->encrypt->setCounter(1);
+                    $packet = $length . $this->encrypt->encrypt(substr($packet, 4));
+                    break;
+                default:
+                    $packet = $this->hmac_create instanceof Hash && $this->hmac_create_etm ?
+                        ($packet & "\xFF\xFF\xFF\xFF") . $this->encrypt->encrypt(substr($packet, 4)) :
+                        $this->encrypt->encrypt($packet);
+            }
+        }
 
-        if ($this->encrypt !== false) {
-            $packet = $this->encrypt->encrypt($packet);
+        if ($this->hmac_create instanceof Hash && $this->hmac_create_etm) {
+            if (($this->hmac_create->getHash() & "\xFF\xFF\xFF\xFF") == 'umac') {
+                $this->hmac_create->setNonce("\0\0\0\0" . pack('N', $this->send_seq_no));
+                $hmac = $this->hmac_create->hash($packet);
+            } else {
+                $hmac = $this->hmac_create->hash(pack('Na*', $this->send_seq_no, $packet));
+            }
         }
 
-        $packet.= $hmac;
+        $this->send_seq_no++;
+
+        $packet .= $this->encrypt && $this->encrypt->usesNonce() ? $this->encrypt->getTag() : $hmac;
+
+        if (!$this->keyExchangeInProgress) {
+            $this->bytesTransferredSinceLastKEX += strlen($packet);
+        }
 
         $start = microtime(true);
-        $result = strlen($packet) == fputs($this->fsock, $packet);
+        $sent = @fwrite($this->fsock, $packet);
         $stop = microtime(true);
 
         if (defined('NET_SSH2_LOGGING')) {
             $current = microtime(true);
-            $message_number = isset($this->message_numbers[ord($data[0])]) ? $this->message_numbers[ord($data[0])] : 'UNKNOWN (' . ord($data[0]) . ')';
-            $message_number = '-> ' . $message_number .
-                              ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)';
-            $this->_append_log($message_number, isset($logged) ? $logged : $data);
-            $this->last_packet = $current;
+            $message_number = sprintf(
+                '-> %s (since last: %s, network: %ss)',
+                ($constantName = MessageType::findConstantNameByValue($value = ord($logged[0]), false))
+                    ? "SSH_MSG_$constantName"
+                    : "UNKNOWN ($value)",
+                round($current - $this->last_packet, 4),
+                round($stop - $start, 4)
+            );
+            $this->append_log($message_number, $logged);
         }
+        $this->last_packet = microtime(true);
 
-        return $result;
+        if (strlen($packet) != $sent) {
+            $this->disconnect_helper(DisconnectReason::BY_APPLICATION);
+            $message = $sent === false ?
+                'Unable to write ' . strlen($packet) . ' bytes' :
+                "Only $sent of " . strlen($packet) . " bytes were sent";
+            throw new RuntimeException($message);
+        }
+
+        if ($this->bytesTransferredSinceLastKEX > $this->doKeyReexchangeAfterXBytes) {
+            $this->key_exchange();
+        }
+    }
+
+    /**
+     * Sends a keep-alive message, if keep-alive is enabled and interval is met
+     */
+    private function send_keep_alive(): void
+    {
+        if ($this->bitmap & self::MASK_CONNECTED) {
+            $elapsed = microtime(true) - $this->last_packet;
+            if ($this->keepAlive > 0 && $elapsed >= $this->keepAlive) {
+                $this->send_binary_packet(pack('CN', MessageType::IGNORE, 0));
+            }
+        }
     }
 
     /**
      * Logs data packets
      *
      * Makes sure that only the last 1MB worth of packets will be logged
+     */
+    private function append_log(string $message_number, string $message): void
+    {
+        $this->append_log_helper(
+            NET_SSH2_LOGGING,
+            $message_number,
+            $message,
+            $this->message_number_log,
+            $this->message_log,
+            $this->log_size,
+            $this->realtime_log_file,
+            $this->realtime_log_wrap,
+            $this->realtime_log_size
+        );
+    }
+
+    /**
+     * Logs data packet helper
      *
-     * @param string $data
-     * @access private
+     * @param resource &$realtime_log_file
      */
-    function _append_log($message_number, $message)
+    protected function append_log_helper(int $constant, string $message_number, string $message, array &$message_number_log, array &$message_log, int &$log_size, &$realtime_log_file, bool &$realtime_log_wrap, int &$realtime_log_size): void
     {
         // remove the byte identifying the message type from all but the first two messages (ie. the identification strings)
         if (strlen($message_number) > 2) {
-            $this->_string_shift($message);
+            Strings::shift($message);
         }
 
-        switch (NET_SSH2_LOGGING) {
+        switch ($constant) {
             // useful for benchmarks
             case self::LOG_SIMPLE:
-                $this->message_number_log[] = $message_number;
+                $message_number_log[] = $message_number;
+                break;
+            case self::LOG_SIMPLE_REALTIME:
+                echo $message_number;
+                echo PHP_SAPI == 'cli' ? "\r\n" : '<br>';
+                @flush();
+                @ob_flush();
                 break;
             // the most useful log for SSH2
             case self::LOG_COMPLEX:
-                $this->message_number_log[] = $message_number;
-                $this->log_size+= strlen($message);
-                $this->message_log[] = $message;
-                while ($this->log_size > self::LOG_MAX_SIZE) {
-                    $this->log_size-= strlen(array_shift($this->message_log));
-                    array_shift($this->message_number_log);
+                $message_number_log[] = $message_number;
+                $log_size += strlen($message);
+                $message_log[] = $message;
+                while ($log_size > self::LOG_MAX_SIZE) {
+                    $log_size -= strlen(array_shift($message_log));
+                    array_shift($message_number_log);
                 }
                 break;
             // dump the output out realtime; packets may be interspersed with non packets,
@@ -3480,37 +4233,41 @@ function _append_log($message_number, $message)
                         $start = '<pre>';
                         $stop = '</pre>';
                 }
-                echo $start . $this->_format_log(array($message), array($message_number)) . $stop;
+                echo $start . $this->format_log([$message], [$message_number]) . $stop;
                 @flush();
                 @ob_flush();
                 break;
-            // basically the same thing as self::LOG_REALTIME with the caveat that self::LOG_REALTIME_FILE
+            // basically the same thing as self::LOG_REALTIME with the caveat that NET_SSH2_LOG_REALTIME_FILENAME
             // needs to be defined and that the resultant log file will be capped out at self::LOG_MAX_SIZE.
             // the earliest part of the log file is denoted by the first <<< START >>> and is not going to necessarily
             // at the beginning of the file
             case self::LOG_REALTIME_FILE:
-                if (!isset($this->realtime_log_file)) {
+                if (!isset($realtime_log_file)) {
                     // PHP doesn't seem to like using constants in fopen()
-                    $filename = self::LOG_REALTIME_FILENAME;
+                    $filename = NET_SSH2_LOG_REALTIME_FILENAME;
                     $fp = fopen($filename, 'w');
-                    $this->realtime_log_file = $fp;
+                    $realtime_log_file = $fp;
                 }
-                if (!is_resource($this->realtime_log_file)) {
+                if (!is_resource($realtime_log_file)) {
                     break;
                 }
-                $entry = $this->_format_log(array($message), array($message_number));
-                if ($this->realtime_log_wrap) {
+                $entry = $this->format_log([$message], [$message_number]);
+                if ($realtime_log_wrap) {
                     $temp = "<<< START >>>\r\n";
-                    $entry.= $temp;
-                    fseek($this->realtime_log_file, ftell($this->realtime_log_file) - strlen($temp));
+                    $entry .= $temp;
+                    fseek($realtime_log_file, ftell($realtime_log_file) - strlen($temp));
                 }
-                $this->realtime_log_size+= strlen($entry);
-                if ($this->realtime_log_size > self::LOG_MAX_SIZE) {
-                    fseek($this->realtime_log_file, 0);
-                    $this->realtime_log_size = strlen($entry);
-                    $this->realtime_log_wrap = true;
+                $realtime_log_size += strlen($entry);
+                if ($realtime_log_size > self::LOG_MAX_SIZE) {
+                    fseek($realtime_log_file, 0);
+                    $realtime_log_size = strlen($entry);
+                    $realtime_log_wrap = true;
                 }
-                fputs($this->realtime_log_file, $entry);
+                fwrite($realtime_log_file, $entry);
+                break;
+            case self::LOG_REALTIME_SIMPLE:
+                echo $message_number;
+                echo PHP_SAPI == 'cli' ? "\r\n" : '<br>';
         }
     }
 
@@ -3518,20 +4275,27 @@ function _append_log($message_number, $message)
      * Sends channel data
      *
      * Spans multiple SSH_MSG_CHANNEL_DATAs if appropriate
-     *
-     * @param int $client_channel
-     * @param string $data
-     * @return bool
-     * @access private
      */
-    function _send_channel_packet($client_channel, $data)
+    protected function send_channel_packet(int $client_channel, string $data): void
     {
+        if (
+            isset($this->channel_buffers_write[$client_channel])
+            && str_starts_with($data, $this->channel_buffers_write[$client_channel])
+        ) {
+            // if buffer holds identical initial data content, resume send from the unmatched data portion
+            $data = substr($data, strlen($this->channel_buffers_write[$client_channel]));
+        } else {
+            $this->channel_buffers_write[$client_channel] = '';
+        }
         while (strlen($data)) {
             if (!$this->window_size_client_to_server[$client_channel]) {
-                $this->bitmap^= self::MASK_WINDOW_ADJUST;
                 // using an invalid channel will let the buffers be built up for the valid channels
-                $this->_get_channel_packet(-1);
-                $this->bitmap^= self::MASK_WINDOW_ADJUST;
+                $this->get_channel_packet(-$client_channel);
+                if ($this->isTimeout()) {
+                    throw new TimeoutException('Timed out waiting for server');
+                } elseif (!$this->window_size_client_to_server[$client_channel]) {
+                    throw new \RuntimeException('Data window was not adjusted');
+                }
             }
 
             /* The maximum amount of data allowed is determined by the maximum
@@ -3543,118 +4307,88 @@ function _send_channel_packet($client_channel, $data)
                 $this->window_size_client_to_server[$client_channel]
             );
 
-            $temp = $this->_string_shift($data, $max_size);
-            $packet = pack(
-                'CN2a*',
-                NET_SSH2_MSG_CHANNEL_DATA,
+            $temp = Strings::shift($data, $max_size);
+            $packet = Strings::packSSH2(
+                'CNs',
+                MessageType::CHANNEL_DATA,
                 $this->server_channels[$client_channel],
-                strlen($temp),
                 $temp
             );
-            $this->window_size_client_to_server[$client_channel]-= strlen($temp);
-            if (!$this->_send_binary_packet($packet)) {
-                return false;
-            }
+            $this->window_size_client_to_server[$client_channel] -= strlen($temp);
+            $this->send_binary_packet($packet);
+            $this->channel_buffers_write[$client_channel] .= $temp;
         }
-
-        return true;
+        unset($this->channel_buffers_write[$client_channel]);
     }
 
     /**
      * Closes and flushes a channel
      *
-     * \phpseclib\Net\SSH2 doesn't properly close most channels.  For exec() channels are normally closed by the server
+     * \phpseclib3\Net\SSH2 doesn't properly close most channels.  For exec() channels are normally closed by the server
      * and for SFTP channels are presumably closed when the client disconnects.  This functions is intended
      * for SCP more than anything.
-     *
-     * @param int $client_channel
-     * @param bool $want_reply
-     * @return bool
-     * @access private
-     */
-    function _close_channel($client_channel, $want_reply = false)
-    {
-        // see http://tools.ietf.org/html/rfc4254#section-5.3
-
-        $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_EOF, $this->server_channels[$client_channel]));
-
-        if (!$want_reply) {
-            $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$client_channel]));
-        }
-
-        $this->channel_status[$client_channel] = NET_SSH2_MSG_CHANNEL_CLOSE;
-
-        $this->curTimeout = 0;
-
-        while (!is_bool($this->_get_channel_packet($client_channel))) {
-        }
-
-        if ($want_reply) {
-            $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$client_channel]));
-        }
-
-        if ($this->bitmap & self::MASK_SHELL) {
-            $this->bitmap&= ~self::MASK_SHELL;
-        }
-    }
-
-    /**
-     * Disconnect
-     *
-     * @param int $reason
-     * @return bool
-     * @access private
      */
-    function _disconnect($reason)
+    private function close_channel(int $client_channel): void
     {
-        if ($this->bitmap & self::MASK_CONNECTED) {
-            $data = pack('CNNa*Na*', NET_SSH2_MSG_DISCONNECT, $reason, 0, '', 0, '');
-            $this->_send_binary_packet($data);
-            $this->bitmap = 0;
-            fclose($this->fsock);
-            return false;
+        // see http://tools.ietf.org/html/rfc4254#section-5.3
+
+        if ($this->channel_status[$client_channel] != MessageType::CHANNEL_EOF) {
+            $this->send_binary_packet(pack('CN', MessageType::CHANNEL_EOF, $this->server_channels[$client_channel]));
+        }
+        $this->send_binary_packet(pack('CN', MessageType::CHANNEL_CLOSE, $this->server_channels[$client_channel]));
+
+        $this->channel_status[$client_channel] = MessageType::CHANNEL_CLOSE;
+
+        $this->channelCount--;
+
+        $this->curTimeout = 5;
+        while (!is_bool($this->get_channel_packet($client_channel))) {
         }
+
+        unset($this->channel_status[$client_channel]);
+
+        $this->close_channel_bitmap($client_channel);
     }
 
     /**
-     * String Shift
-     *
-     * Inspired by array_shift
-     *
-     * @param string $string
-     * @param int $index
-     * @return string
-     * @access private
+     * Maintains execution state bitmap in response to channel closure
      */
-    function _string_shift(&$string, $index = 1)
+    private function close_channel_bitmap(int $client_channel): void
     {
-        $substr = substr($string, 0, $index);
-        $string = substr($string, $index);
-        return $substr;
+        switch ($client_channel) {
+            case self::CHANNEL_SHELL:
+                // Shell status has been maintained in the bitmap for backwards
+                //  compatibility sake, but can be removed going forward
+                if ($this->bitmap & self::MASK_SHELL) {
+                    $this->bitmap &= ~self::MASK_SHELL;
+                }
+                break;
+        }
     }
 
     /**
-     * Define Array
-     *
-     * Takes any number of arrays whose indices are integers and whose values are strings and defines a bunch of
-     * named constants from it, using the value as the name of the constant and the index as the value of the constant.
-     * If any of the constants that would be defined already exists, none of the constants will be defined.
+     * Disconnect
      *
-     * @param array $array
-     * @access private
+     * @return false
      */
-    function _define_array()
+    protected function disconnect_helper(int $reason): bool
     {
-        $args = func_get_args();
-        foreach ($args as $arg) {
-            foreach ($arg as $key => $value) {
-                if (!defined($value)) {
-                    define($value, $key);
-                } else {
-                    break 2;
-                }
+        if ($this->bitmap & self::MASK_DISCONNECT) {
+            // Disregard subsequent disconnect requests
+            return false;
+        }
+        $this->bitmap |= self::MASK_DISCONNECT;
+        if ($this->isConnected()) {
+            $data = Strings::packSSH2('CNss', MessageType::DISCONNECT, $reason, '', '');
+            try {
+                $this->send_binary_packet($data);
+            } catch (\Exception $e) {
             }
         }
+
+        $this->reset_connection();
+
+        return false;
     }
 
     /**
@@ -3662,10 +4396,9 @@ function _define_array()
      *
      * Returns a string if NET_SSH2_LOGGING == self::LOG_COMPLEX, an array if NET_SSH2_LOGGING == self::LOG_SIMPLE and false if !defined('NET_SSH2_LOGGING')
      *
-     * @access public
      * @return array|false|string
      */
-    function getLog()
+    public function getLog()
     {
         if (!defined('NET_SSH2_LOGGING')) {
             return false;
@@ -3674,10 +4407,9 @@ function getLog()
         switch (NET_SSH2_LOGGING) {
             case self::LOG_SIMPLE:
                 return $this->message_number_log;
-                break;
             case self::LOG_COMPLEX:
-                return $this->_format_log($this->message_log, $this->message_number_log);
-                break;
+                $log = $this->format_log($this->message_log, $this->message_number_log);
+                return PHP_SAPI == 'cli' ? $log : '<pre>' . $log . '</pre>';
             default:
                 return false;
         }
@@ -3685,65 +4417,47 @@ function getLog()
 
     /**
      * Formats a log for printing
-     *
-     * @param array $message_log
-     * @param array $message_number_log
-     * @access private
-     * @return string
      */
-    function _format_log($message_log, $message_number_log)
+    protected function format_log(array $message_log, array $message_number_log): string
     {
         $output = '';
         for ($i = 0; $i < count($message_log); $i++) {
-            $output.= $message_number_log[$i] . "\r\n";
+            $output .= $message_number_log[$i];
             $current_log = $message_log[$i];
             $j = 0;
+            if (strlen($current_log)) {
+                $output .= "\r\n";
+            }
             do {
                 if (strlen($current_log)) {
-                    $output.= str_pad(dechex($j), 7, '0', STR_PAD_LEFT) . '0  ';
+                    $output .= str_pad(dechex($j), 7, '0', STR_PAD_LEFT) . '0  ';
                 }
-                $fragment = $this->_string_shift($current_log, $this->log_short_width);
-                $hex = substr(preg_replace_callback('#.#s', array($this, '_format_log_helper'), $fragment), strlen($this->log_boundary));
+                $fragment = Strings::shift($current_log, $this->log_short_width);
+                $hex = substr(preg_replace_callback('#.#s', fn ($matches) => $this->log_boundary . str_pad(dechex(ord($matches[0])), 2, '0', STR_PAD_LEFT), $fragment), strlen($this->log_boundary));
                 // replace non ASCII printable characters with dots
                 // http://en.wikipedia.org/wiki/ASCII#ASCII_printable_characters
                 // also replace < with a . since < messes up the output on web browsers
                 $raw = preg_replace('#[^\x20-\x7E]|<#', '.', $fragment);
-                $output.= str_pad($hex, $this->log_long_width - $this->log_short_width, ' ') . $raw . "\r\n";
+                $output .= str_pad($hex, $this->log_long_width - $this->log_short_width, ' ') . $raw . "\r\n";
                 $j++;
             } while (strlen($current_log));
-            $output.= "\r\n";
+            $output .= "\r\n";
         }
 
         return $output;
     }
 
     /**
-     * Helper function for _format_log
-     *
-     * For use with preg_replace_callback()
-     *
-     * @param array $matches
-     * @access private
-     * @return string
-     */
-    function _format_log_helper($matches)
-    {
-        return $this->log_boundary . str_pad(dechex(ord($matches[0])), 2, '0', STR_PAD_LEFT);
-    }
-
-    /**
-     * Helper function for agent->_on_channel_open()
+     * Helper function for agent->on_channel_open()
      *
      * Used when channels are created to inform agent
      * of said channel opening. Must be called after
      * channel open confirmation received
-     *
-     * @access private
      */
-    function _on_channel_open()
+    private function on_channel_open(): void
     {
         if (isset($this->agent)) {
-            $this->agent->_on_channel_open($this);
+            $this->agent->registerChannelOpen($this);
         }
     }
 
@@ -3751,12 +4465,9 @@ function _on_channel_open()
      * Returns the first value of the intersection of two arrays or false if
      * the intersection is empty. The order is defined by the first parameter.
      *
-     * @param array $array1
-     * @param array $array2
      * @return mixed False if intersection is empty, else intersected value.
-     * @access private
      */
-    function _array_intersect_first($array1, $array2)
+    private static function array_intersect_first(array $array1, array $array2)
     {
         foreach ($array1 as $value) {
             if (in_array($value, $array2)) {
@@ -3767,23 +4478,23 @@ function _array_intersect_first($array1, $array2)
     }
 
     /**
-     * Returns all errors
+     * Returns all errors / debug messages on the SSH layer
      *
-     * @return string
-     * @access public
+     * If you are looking for messages from the SFTP layer, please see SFTP::getSFTPErrors()
+     *
+     * @return string[]
      */
-    function getErrors()
+    public function getErrors(): array
     {
         return $this->errors;
     }
 
     /**
-     * Returns the last error
+     * Returns the last error received on the SSH layer
      *
-     * @return string
-     * @access public
+     * If you are looking for messages from the SFTP layer, please see SFTP::getLastSFTPError()
      */
-    function getLastError()
+    public function getLastError(): string
     {
         $count = count($this->errors);
 
@@ -3795,144 +4506,406 @@ function getLastError()
     /**
      * Return the server identification.
      *
-     * @return string
-     * @access public
+     * @return string|false
      */
-    function getServerIdentification()
+    public function getServerIdentification()
     {
-        $this->_connect();
+        $this->connect();
 
         return $this->server_identifier;
     }
 
     /**
-     * Return a list of the key exchange algorithms the server supports.
-     *
-     * @return array
-     * @access public
+     * Returns a list of algorithms the server supports
      */
-    function getKexAlgorithms()
+    public function getServerAlgorithms(): array
     {
-        $this->_connect();
-
-        return $this->kex_algorithms;
+        $this->connect();
+
+        return [
+            'kex' => $this->kex_algorithms,
+            'hostkey' => $this->server_host_key_algorithms,
+            'client_to_server' => [
+                'crypt' => $this->encryption_algorithms_client_to_server,
+                'mac' => $this->mac_algorithms_client_to_server,
+                'comp' => $this->compression_algorithms_client_to_server,
+                'lang' => $this->languages_client_to_server,
+            ],
+            'server_to_client' => [
+                'crypt' => $this->encryption_algorithms_server_to_client,
+                'mac' => $this->mac_algorithms_server_to_client,
+                'comp' => $this->compression_algorithms_server_to_client,
+                'lang' => $this->languages_server_to_client,
+            ],
+        ];
     }
 
     /**
-     * Return a list of the host key (public key) algorithms the server supports.
-     *
-     * @return array
-     * @access public
+     * Returns a list of KEX algorithms that phpseclib supports
      */
-    function getServerHostKeyAlgorithms()
+    public static function getSupportedKEXAlgorithms(): array
     {
-        $this->_connect();
+        $kex_algorithms = [
+            // Elliptic Curve Diffie-Hellman Key Agreement (ECDH) using
+            // Curve25519. See doc/curve25519-sha256@libssh.org.txt in the
+            // libssh repository for more information.
+            'curve25519-sha256',
+            'curve25519-sha256@libssh.org',
+
+            'ecdh-sha2-nistp256', // RFC 5656
+            'ecdh-sha2-nistp384', // RFC 5656
+            'ecdh-sha2-nistp521', // RFC 5656
 
-        return $this->server_host_key_algorithms;
+            'diffie-hellman-group-exchange-sha256',// RFC 4419
+            'diffie-hellman-group-exchange-sha1',  // RFC 4419
+
+            // Diffie-Hellman Key Agreement (DH) using integer modulo prime
+            // groups.
+            'diffie-hellman-group14-sha256',
+            'diffie-hellman-group14-sha1', // REQUIRED
+            'diffie-hellman-group15-sha512',
+            'diffie-hellman-group16-sha512',
+            'diffie-hellman-group17-sha512',
+            'diffie-hellman-group18-sha512',
+
+            'diffie-hellman-group1-sha1', // REQUIRED
+        ];
+
+        return $kex_algorithms;
     }
 
     /**
-     * Return a list of the (symmetric key) encryption algorithms the server supports, when receiving stuff from the client.
-     *
-     * @return array
-     * @access public
+     * Returns a list of host key algorithms that phpseclib supports
      */
-    function getEncryptionAlgorithmsClient2Server()
+    public static function getSupportedHostKeyAlgorithms(): array
     {
-        $this->_connect();
-
-        return $this->encryption_algorithms_client_to_server;
+        return [
+            'ssh-ed25519', // https://tools.ietf.org/html/draft-ietf-curdle-ssh-ed25519-02
+            'ecdsa-sha2-nistp256', // RFC 5656
+            'ecdsa-sha2-nistp384', // RFC 5656
+            'ecdsa-sha2-nistp521', // RFC 5656
+            'rsa-sha2-256', // RFC 8332
+            'rsa-sha2-512', // RFC 8332
+            'ssh-rsa', // RECOMMENDED  sign   Raw RSA Key
+            'ssh-dss',  // REQUIRED     sign   Raw DSS Key
+        ];
     }
 
     /**
-     * Return a list of the (symmetric key) encryption algorithms the server supports, when sending stuff to the client.
-     *
-     * @return array
-     * @access public
+     * Returns a list of symmetric key algorithms that phpseclib supports
      */
-    function getEncryptionAlgorithmsServer2Client()
+    public static function getSupportedEncryptionAlgorithms(): array
     {
-        $this->_connect();
+        $algos = [
+            // from <https://tools.ietf.org/html/rfc5647>:
+            'aes128-gcm@openssh.com',
+            'aes256-gcm@openssh.com',
+
+            // from <http://tools.ietf.org/html/rfc4345#section-4>:
+            'arcfour256',
+            'arcfour128',
+
+            //'arcfour',      // OPTIONAL          the ARCFOUR stream cipher with a 128-bit key
+
+            // CTR modes from <http://tools.ietf.org/html/rfc4344#section-4>:
+            'aes128-ctr',     // RECOMMENDED       AES (Rijndael) in SDCTR mode, with 128-bit key
+            'aes192-ctr',     // RECOMMENDED       AES with 192-bit key
+            'aes256-ctr',     // RECOMMENDED       AES with 256-bit key
+
+            // from <https://github.com/openssh/openssh-portable/blob/001aa55/PROTOCOL.chacha20poly1305>:
+            // one of the big benefits of chacha20-poly1305 is speed. the problem is...
+            // libsodium doesn't generate the poly1305 keys in the way ssh does and openssl's PHP bindings don't even
+            // seem to support poly1305 currently. so even if libsodium or openssl are being used for the chacha20
+            // part, pure-PHP has to be used for the poly1305 part and that's gonna cause a big slow down.
+            // speed-wise it winds up being faster to use AES (when openssl is available) and some HMAC
+            // (which is always gonna be super fast to compute thanks to the hash extension, which
+            // "is bundled and compiled into PHP by default")
+            'chacha20-poly1305@openssh.com',
+
+            'twofish128-ctr', // OPTIONAL          Twofish in SDCTR mode, with 128-bit key
+            'twofish192-ctr', // OPTIONAL          Twofish with 192-bit key
+            'twofish256-ctr', // OPTIONAL          Twofish with 256-bit key
+
+            'aes128-cbc',     // RECOMMENDED       AES with a 128-bit key
+            'aes192-cbc',     // OPTIONAL          AES with a 192-bit key
+            'aes256-cbc',     // OPTIONAL          AES in CBC mode, with a 256-bit key
+
+            'twofish128-cbc', // OPTIONAL          Twofish with a 128-bit key
+            'twofish192-cbc', // OPTIONAL          Twofish with a 192-bit key
+            'twofish256-cbc',
+            'twofish-cbc',    // OPTIONAL          alias for "twofish256-cbc"
+                              //                   (this is being retained for historical reasons)
+
+            'blowfish-ctr',   // OPTIONAL          Blowfish in SDCTR mode
+
+            'blowfish-cbc',   // OPTIONAL          Blowfish in CBC mode
+
+            '3des-ctr',       // RECOMMENDED       Three-key 3DES in SDCTR mode
+
+            '3des-cbc',       // REQUIRED          three-key 3DES in CBC mode
+
+             //'none'           // OPTIONAL          no encryption; NOT RECOMMENDED
+        ];
+
+        if (self::$crypto_engine) {
+            $engines = [self::$crypto_engine];
+        } else {
+            $engines = [
+                'libsodium',
+                'OpenSSL (GCM)',
+                'OpenSSL',
+                'Eval',
+                'PHP',
+            ];
+        }
+
+        $ciphers = [];
+
+        foreach ($engines as $engine) {
+            foreach ($algos as $algo) {
+                $obj = self::encryption_algorithm_to_crypt_instance($algo);
+                if ($obj instanceof Rijndael) {
+                    $obj->setKeyLength((int) preg_replace('#[^\d]#', '', $algo));
+                }
+                switch ($algo) {
+                    // Eval engines do not exist for ChaCha20 or RC4 because they would not benefit from one.
+                    // to benefit from an Eval engine they'd need to loop a variable amount of times, they'd
+                    // need to do table lookups (eg. sbox subsitutions). ChaCha20 doesn't do either because
+                    // it's a so-called ARX cipher, meaning that the only operations it does are add (A), rotate (R)
+                    // and XOR (X). RC4 does do table lookups but being a stream cipher it works differently than
+                    // block ciphers. with RC4 you XOR the plaintext against a keystream and the keystream changes
+                    // as you encrypt stuff. the only table lookups are made against this keystream and thus table
+                    // lookups are kinda unavoidable. with AES and DES, however, the table lookups that are done
+                    // are done against substitution boxes (sboxes), which are invariant.
+
+                    // OpenSSL can't be used as an engine, either, because OpenSSL doesn't support continuous buffers
+                    // as SSH2 uses and altho you can emulate a continuous buffer with block ciphers you can't do so
+                    // with stream ciphers. As for ChaCha20...  for the ChaCha20 part OpenSSL could prob be used but
+                    // the big slow down isn't with ChaCha20 - it's with Poly1305. SSH constructs the key for that
+                    // differently than how OpenSSL does it (OpenSSL does it as the RFC describes, SSH doesn't).
+
+                    // libsodium can't be used because it doesn't support RC4 and it doesn't construct the Poly1305
+                    // keys in the same way that SSH does
+
+                    // mcrypt could prob be used for RC4 but mcrypt hasn't been included in PHP core for yearss
+                    case 'chacha20-poly1305@openssh.com':
+                    case 'arcfour128':
+                    case 'arcfour256':
+                        if ($engine != 'PHP') {
+                            continue 2;
+                        }
+                        break;
+                    case 'aes128-gcm@openssh.com':
+                    case 'aes256-gcm@openssh.com':
+                        if ($engine == 'OpenSSL') {
+                            continue 2;
+                        }
+                        $obj->setNonce('dummydummydu');
+                }
+                if ($obj->isValidEngine($engine)) {
+                    $algos = array_diff($algos, [$algo]);
+                    $ciphers[] = $algo;
+                }
+            }
+        }
 
-        return $this->encryption_algorithms_server_to_client;
+        return $ciphers;
     }
 
     /**
-     * Return a list of the MAC algorithms the server supports, when receiving stuff from the client.
-     *
-     * @return array
-     * @access public
+     * Returns a list of MAC algorithms that phpseclib supports
      */
-    function getMACAlgorithmsClient2Server()
+    public static function getSupportedMACAlgorithms(): array
     {
-        $this->_connect();
+        return [
+            'hmac-sha2-256-etm@openssh.com',
+            'hmac-sha2-512-etm@openssh.com',
+            'hmac-sha1-etm@openssh.com',
+
+            // from <http://www.ietf.org/rfc/rfc6668.txt>:
+            'hmac-sha2-256',// RECOMMENDED     HMAC-SHA256 (digest length = key length = 32)
+            'hmac-sha2-512',// OPTIONAL        HMAC-SHA512 (digest length = key length = 64)
+
+            'hmac-sha1-96', // RECOMMENDED     first 96 bits of HMAC-SHA1 (digest length = 12, key length = 20)
+            'hmac-sha1',    // REQUIRED        HMAC-SHA1 (digest length = key length = 20)
+            'hmac-md5-96',  // OPTIONAL        first 96 bits of HMAC-MD5 (digest length = 12, key length = 16)
+            'hmac-md5',     // OPTIONAL        HMAC-MD5 (digest length = key length = 16)
+
+            'umac-64-etm@openssh.com',
+            'umac-128-etm@openssh.com',
 
-        return $this->mac_algorithms_client_to_server;
+            // from <https://tools.ietf.org/html/draft-miller-secsh-umac-01>:
+            'umac-64@openssh.com',
+            'umac-128@openssh.com',
+
+            //'none'          // OPTIONAL        no MAC; NOT RECOMMENDED
+        ];
     }
 
     /**
-     * Return a list of the MAC algorithms the server supports, when sending stuff to the client.
-     *
-     * @return array
-     * @access public
+     * Returns a list of compression algorithms that phpseclib supports
      */
-    function getMACAlgorithmsServer2Client()
+    public static function getSupportedCompressionAlgorithms(): array
     {
-        $this->_connect();
-
-        return $this->mac_algorithms_server_to_client;
+        $algos = ['none']; // REQUIRED        no compression
+        if (function_exists('deflate_init')) {
+            $algos[] = 'zlib@openssh.com'; // https://datatracker.ietf.org/doc/html/draft-miller-secsh-compression-delayed
+            $algos[] = 'zlib';
+        }
+        return $algos;
     }
 
     /**
-     * Return a list of the compression algorithms the server supports, when receiving stuff from the client.
+     * Return list of negotiated algorithms
      *
-     * @return array
-     * @access public
+     * Uses the same format as https://www.php.net/ssh2-methods-negotiated
      */
-    function getCompressionAlgorithmsClient2Server()
+    public function getAlgorithmsNegotiated(): array
     {
-        $this->_connect();
-
-        return $this->compression_algorithms_client_to_server;
+        $this->connect();
+
+        $compression_map = [
+            self::NET_SSH2_COMPRESSION_NONE => 'none',
+            self::NET_SSH2_COMPRESSION_ZLIB => 'zlib',
+            self::NET_SSH2_COMPRESSION_ZLIB_AT_OPENSSH => 'zlib@openssh.com',
+        ];
+
+        return [
+            'kex' => $this->kex_algorithm,
+            'hostkey' => $this->signature_format,
+            'client_to_server' => [
+                'crypt' => $this->encryptName,
+                'mac' => $this->hmac_create_name,
+                'comp' => $compression_map[$this->compress],
+            ],
+            'server_to_client' => [
+                'crypt' => $this->decryptName,
+                'mac' => $this->hmac_check_name,
+                'comp' => $compression_map[$this->decompress],
+            ],
+        ];
     }
 
     /**
-     * Return a list of the compression algorithms the server supports, when sending stuff to the client.
-     *
-     * @return array
-     * @access public
+     * Force multiple channels (even if phpseclib has decided to disable them)
      */
-    function getCompressionAlgorithmsServer2Client()
+    public function forceMultipleChannels(): void
     {
-        $this->_connect();
-
-        return $this->compression_algorithms_server_to_client;
+        $this->errorOnMultipleChannels = false;
     }
 
     /**
-     * Return a list of the languages the server supports, when sending stuff to the client.
-     *
-     * @return array
-     * @access public
+     * Allows you to set the terminal
      */
-    function getLanguagesServer2Client()
+    public function setTerminal(string $term): void
     {
-        $this->_connect();
-
-        return $this->languages_server_to_client;
+        $this->term = $term;
     }
 
     /**
-     * Return a list of the languages the server supports, when receiving stuff from the client.
-     *
-     * @return array
-     * @access public
+     * Accepts an associative array with up to four parameters as described at
+     * <https://www.php.net/manual/en/function.ssh2-connect.php>
      */
-    function getLanguagesClient2Server()
+    public function setPreferredAlgorithms(array $methods): void
     {
-        $this->_connect();
+        $keys = ['client_to_server', 'server_to_client'];
+
+        if (isset($methods['kex']) && is_string($methods['kex'])) {
+            $methods['kex'] = explode(',', $methods['kex']);
+        }
+
+        if (isset($methods['hostkey']) && is_string($methods['hostkey'])) {
+            $methods['hostkey'] = explode(',', $methods['hostkey']);
+        }
+
+        foreach ($keys as $key) {
+            if (isset($methods[$key])) {
+                $a = &$methods[$key];
+                if (isset($a['crypt']) && is_string($a['crypt'])) {
+                    $a['crypt'] = explode(',', $a['crypt']);
+                }
+                if (isset($a['comp']) && is_string($a['comp'])) {
+                    $a['comp'] = explode(',', $a['comp']);
+                }
+                if (isset($a['mac']) && is_string($a['mac'])) {
+                    $a['mac'] = explode(',', $a['mac']);
+                }
+            }
+        }
+
+        $preferred = $methods;
+
+        if (isset($preferred['kex'])) {
+            $preferred['kex'] = array_intersect(
+                $preferred['kex'],
+                static::getSupportedKEXAlgorithms()
+            );
+        }
+
+        if (isset($preferred['hostkey'])) {
+            $preferred['hostkey'] = array_intersect(
+                $preferred['hostkey'],
+                static::getSupportedHostKeyAlgorithms()
+            );
+        }
+
+        foreach ($keys as $key) {
+            if (isset($preferred[$key])) {
+                $a = &$preferred[$key];
+                if (isset($a['crypt'])) {
+                    $a['crypt'] = array_intersect(
+                        $a['crypt'],
+                        static::getSupportedEncryptionAlgorithms()
+                    );
+                }
+                if (isset($a['comp'])) {
+                    $a['comp'] = array_intersect(
+                        $a['comp'],
+                        static::getSupportedCompressionAlgorithms()
+                    );
+                }
+                if (isset($a['mac'])) {
+                    $a['mac'] = array_intersect(
+                        $a['mac'],
+                        static::getSupportedMACAlgorithms()
+                    );
+                }
+            }
+        }
+
+        $keys = [
+            'kex',
+            'hostkey',
+            'client_to_server/crypt',
+            'client_to_server/comp',
+            'client_to_server/mac',
+            'server_to_client/crypt',
+            'server_to_client/comp',
+            'server_to_client/mac',
+        ];
+        foreach ($keys as $key) {
+            $p = $preferred;
+            $m = $methods;
+
+            $subkeys = explode('/', $key);
+            foreach ($subkeys as $subkey) {
+                if (!isset($p[$subkey])) {
+                    continue 2;
+                }
+                $p = $p[$subkey];
+                $m = $m[$subkey];
+            }
+
+            if (count($p) != count($m)) {
+                $diff = array_diff($m, $p);
+                $msg = count($diff) == 1 ?
+                    ' is not a supported algorithm' :
+                    ' are not supported algorithms';
+                throw new UnsupportedAlgorithmException(implode(', ', $diff) . $msg);
+            }
+        }
 
-        return $this->languages_client_to_server;
+        $this->preferred = $preferred;
     }
 
     /**
@@ -3940,11 +4913,8 @@ function getLanguagesClient2Server()
      *
      * Quoting from the RFC, "in some jurisdictions, sending a warning message before
      * authentication may be relevant for getting legal protection."
-     *
-     * @return string
-     * @access public
      */
-    function getBannerMessage()
+    public function getBannerMessage(): string
     {
         return $this->banner_message;
     }
@@ -3955,153 +4925,95 @@ function getBannerMessage()
      * Caching this the first time you connect to a server and checking the result on subsequent connections
      * is recommended.  Returns false if the server signature is not signed correctly with the public host key.
      *
-     * @return mixed
-     * @throws \RuntimeException on badly formatted keys
-     * @throws \phpseclib\Exception\NoSupportedAlgorithmsException when the key isn't in a supported format
-     * @access public
+     * @return string|false
+     * @throws RuntimeException on badly formatted keys
+     * @throws NoSupportedAlgorithmsException when the key isn't in a supported format
      */
-    function getServerPublicHostKey()
+    public function getServerPublicHostKey()
     {
         if (!($this->bitmap & self::MASK_CONSTRUCTOR)) {
-            if (!$this->_connect()) {
-                return false;
-            }
+            $this->connect();
         }
 
         $signature = $this->signature;
-        $server_public_host_key = $this->server_public_host_key;
-
-        extract(unpack('Nlength', $this->_string_shift($server_public_host_key, 4)));
-        $this->_string_shift($server_public_host_key, $length);
+        $server_public_host_key = base64_encode($this->server_public_host_key);
 
         if ($this->signature_validated) {
             return $this->bitmap ?
-                $this->signature_format . ' ' . base64_encode($this->server_public_host_key) :
+                $this->signature_format . ' ' . $server_public_host_key :
                 false;
         }
 
         $this->signature_validated = true;
 
         switch ($this->signature_format) {
-            case 'ssh-dss':
-                $zero = new BigInteger();
-
-                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-                $p = new BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
-
-                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-                $q = new BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
-
-                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-                $g = new BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
-
-                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-                $y = new BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
-
-                /* The value for 'dss_signature_blob' is encoded as a string containing
-                   r, followed by s (which are 160-bit integers, without lengths or
-                   padding, unsigned, and in network byte order). */
-                $temp = unpack('Nlength', $this->_string_shift($signature, 4));
-                if ($temp['length'] != 40) {
-                    $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-                    throw new \RuntimeException('Invalid signature');
-                }
-
-                $r = new BigInteger($this->_string_shift($signature, 20), 256);
-                $s = new BigInteger($this->_string_shift($signature, 20), 256);
-
-                switch (true) {
-                    case $r->equals($zero):
-                    case $r->compare($q) >= 0:
-                    case $s->equals($zero):
-                    case $s->compare($q) >= 0:
-                        $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-                        throw new \RuntimeException('Invalid signature');
-                }
-
-                $w = $s->modInverse($q);
-
-                $u1 = $w->multiply(new BigInteger(sha1($this->exchange_hash), 16));
-                list(, $u1) = $u1->divide($q);
-
-                $u2 = $w->multiply($r);
-                list(, $u2) = $u2->divide($q);
-
-                $g = $g->modPow($u1, $p);
-                $y = $y->modPow($u2, $p);
-
-                $v = $g->multiply($y);
-                list(, $v) = $v->divide($p);
-                list(, $v) = $v->divide($q);
-
-                if (!$v->equals($r)) {
-                    //user_error('Bad server signature');
-                    return $this->_disconnect(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE);
+            case 'ssh-ed25519':
+            case 'ecdsa-sha2-nistp256':
+            case 'ecdsa-sha2-nistp384':
+            case 'ecdsa-sha2-nistp521':
+                $key = EC::loadFormat('OpenSSH', $server_public_host_key)
+                    ->withSignatureFormat('SSH2');
+                switch ($this->signature_format) {
+                    case 'ssh-ed25519':
+                        $hash = 'sha512';
+                        break;
+                    case 'ecdsa-sha2-nistp256':
+                        $hash = 'sha256';
+                        break;
+                    case 'ecdsa-sha2-nistp384':
+                        $hash = 'sha384';
+                        break;
+                    case 'ecdsa-sha2-nistp521':
+                        $hash = 'sha512';
                 }
-
+                $key = $key->withHash($hash);
+                break;
+            case 'ssh-dss':
+                $key = DSA::loadFormat('OpenSSH', $server_public_host_key)
+                    ->withSignatureFormat('SSH2')
+                    ->withHash('sha1');
                 break;
             case 'ssh-rsa':
-                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-                $e = new BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
-
-                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-                $rawN = $this->_string_shift($server_public_host_key, $temp['length']);
-                $n = new BigInteger($rawN, -256);
-                $nLength = strlen(ltrim($rawN, "\0"));
-
-                /*
-                $temp = unpack('Nlength', $this->_string_shift($signature, 4));
-                $signature = $this->_string_shift($signature, $temp['length']);
-
-                $rsa = new RSA();
-                $rsa->setSignatureMode(RSA::SIGNATURE_PKCS1);
-                $rsa->load(array('e' => $e, 'n' => $n), 'raw');
-                if (!$rsa->verify($this->exchange_hash, $signature)) {
-                    //user_error('Bad server signature');
-                    return $this->_disconnect(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE);
-                }
-                */
-
-                $temp = unpack('Nlength', $this->_string_shift($signature, 4));
-                $s = new BigInteger($this->_string_shift($signature, $temp['length']), 256);
-
-                // validate an RSA signature per "8.2 RSASSA-PKCS1-v1_5", "5.2.2 RSAVP1", and "9.1 EMSA-PSS" in the
-                // following URL:
-                // ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-1/pkcs-1v2-1.pdf
-
-                // also, see SSHRSA.c (rsa2_verifysig) in PuTTy's source.
-
-                if ($s->compare(new BigInteger()) < 0 || $s->compare($n->subtract(new BigInteger(1))) > 0) {
-                    $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-                    throw new \RuntimeException('Invalid signature');
-                }
-
-                $s = $s->modPow($e, $n);
-                $s = $s->toBytes();
-
-                $h = pack('N4H*', 0x00302130, 0x0906052B, 0x0E03021A, 0x05000414, sha1($this->exchange_hash));
-                $h = chr(0x01) . str_repeat(chr(0xFF), $nLength - 2 - strlen($h)) . $h;
-
-                if ($s != $h) {
-                    //user_error('Bad server signature');
-                    return $this->_disconnect(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE);
+            case 'rsa-sha2-256':
+            case 'rsa-sha2-512':
+                // could be ssh-rsa, rsa-sha2-256, rsa-sha2-512
+                // we don't check here because we already checked in key_exchange
+                // some signatures have the type embedded within the message and some don't
+                [, $signature] = Strings::unpackSSH2('ss', $signature);
+
+                $key = RSA::loadFormat('OpenSSH', $server_public_host_key)
+                    ->withPadding(RSA::SIGNATURE_PKCS1);
+                switch ($this->signature_format) {
+                    case 'rsa-sha2-512':
+                        $hash = 'sha512';
+                        break;
+                    case 'rsa-sha2-256':
+                        $hash = 'sha256';
+                        break;
+                    //case 'ssh-rsa':
+                    default:
+                        $hash = 'sha1';
                 }
+                $key = $key->withHash($hash);
                 break;
             default:
-                $this->_disconnect(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE);
+                $this->disconnect_helper(DisconnectReason::HOST_KEY_NOT_VERIFIABLE);
                 throw new NoSupportedAlgorithmsException('Unsupported signature format');
         }
 
-        return $this->signature_format . ' ' . base64_encode($this->server_public_host_key);
+        if (!$key->verify($this->exchange_hash, $signature)) {
+            return $this->disconnect_helper(DisconnectReason::HOST_KEY_NOT_VERIFIABLE);
+        };
+
+        return $this->signature_format . ' ' . $server_public_host_key;
     }
 
     /**
      * Returns the exit status of an SSH command or false.
      *
      * @return false|int
-     * @access public
      */
-    function getExitStatus()
+    public function getExitStatus()
     {
         if (is_null($this->exit_status)) {
             return false;
@@ -4111,101 +5023,145 @@ function getExitStatus()
 
     /**
      * Returns the number of columns for the terminal window size.
-     *
-     * @return int
-     * @access public
      */
-    function getWindowColumns()
+    public function getWindowColumns(): int
     {
         return $this->windowColumns;
     }
 
     /**
      * Returns the number of rows for the terminal window size.
-     *
-     * @return int
-     * @access public
      */
-    function getWindowRows()
+    public function getWindowRows(): int
     {
         return $this->windowRows;
     }
 
     /**
      * Sets the number of columns for the terminal window size.
-     *
-     * @param int $value
-     * @access public
      */
-    function setWindowColumns($value)
+    public function setWindowColumns(int $value): void
     {
         $this->windowColumns = $value;
     }
 
     /**
      * Sets the number of rows for the terminal window size.
-     *
-     * @param int $value
-     * @access public
      */
-    function setWindowRows($value)
+    public function setWindowRows(int $value): void
     {
         $this->windowRows = $value;
     }
 
     /**
      * Sets the number of columns and rows for the terminal window size.
-     *
-     * @param int $columns
-     * @param int $rows
-     * @access public
      */
-    function setWindowSize($columns = 80, $rows = 24)
+    public function setWindowSize(int $columns = 80, int $rows = 24): void
     {
         $this->windowColumns = $columns;
         $this->windowRows = $rows;
     }
 
     /**
+     * To String Magic Method
+     *
      * @return string
      */
-    function __toString()
+    #[\ReturnTypeWillChange]
+    public function __toString()
     {
         return $this->getResourceId();
     }
 
     /**
+     * Get Resource ID
+     *
      * We use {} because that symbols should not be in URL according to
      * {@link http://tools.ietf.org/html/rfc3986#section-2 RFC}.
      * It will safe us from any conflicts, because otherwise regexp will
      * match all alphanumeric domains.
-     *
-     * @return string
      */
-    function getResourceId()
+    public function getResourceId(): string
     {
         return '{' . spl_object_hash($this) . '}';
     }
 
+    public static function getConnectionByResourceId(string $id): SSH2|null
+    {
+        if (array_key_exists($id, self::$connections)) {
+            /**
+             * @psalm-ignore-var
+             * @var SSH2|null $ssh2
+             */
+            $ssh2 =  self::$connections[$id]->get();
+            return $ssh2;
+        }
+        return null;
+    }
+
     /**
-     * Return existing connection
-     *
-     * @param string $id
+     * Return all excising connections
      *
-     * @return bool|SSH2 will return false if no such connection
+     * @return array<string, SSH2>
      */
-    static function getConnectionByResourceId($id)
+    public static function getConnections(): array
     {
-        return isset(self::$connections[$id]) ? self::$connections[$id] : false;
+        if (!class_exists('WeakReference')) {
+            /** @var array<string, SSH2> */
+            return self::$connections;
+        }
+        $temp = [];
+        foreach (self::$connections as $key => $ref) {
+            $temp[$key] = $ref->get();
+        }
+        return $temp;
     }
 
     /**
-     * Return all excising connections
+     * Update packet types in log history
+     */
+    private function updateLogHistory(string $old, string $new): void
+    {
+        if (defined('NET_SSH2_LOGGING') && NET_SSH2_LOGGING == self::LOG_COMPLEX) {
+            $this->message_number_log[count($this->message_number_log) - 1] = str_replace(
+                $old,
+                $new,
+                $this->message_number_log[count($this->message_number_log) - 1]
+            );
+        }
+    }
+
+    /**
+     * Return the list of authentication methods that may productively continue authentication.
      *
-     * @return SSH2[]
+     * @see https://tools.ietf.org/html/rfc4252#section-5.1
+     */
+    public function getAuthMethodsToContinue(): ?array
+    {
+        return $this->auth_methods_to_continue;
+    }
+
+    /**
+     * Enables "smart" multi-factor authentication (MFA)
+     */
+    public function enableSmartMFA(): void
+    {
+        $this->smartMFA = true;
+    }
+
+    /**
+     * Disables "smart" multi-factor authentication (MFA)
+     */
+    public function disableSmartMFA(): void
+    {
+        $this->smartMFA = false;
+    }
+
+    /**
+     * How many bytes until the next key re-exchange?
      */
-    static function getConnections()
+    public function bytesUntilKeyReexchange(int $bytes)
     {
-        return self::$connections;
+        $this->doKeyReexchangeAfterXBytes = $bytes;
     }
 }
diff --git a/phpseclib/Net/SSH2/ChannelConnectionFailureReason.php b/phpseclib/Net/SSH2/ChannelConnectionFailureReason.php
new file mode 100644
index 000000000..9fae80152
--- /dev/null
+++ b/phpseclib/Net/SSH2/ChannelConnectionFailureReason.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Net\SSH2;
+
+/**
+ * @internal
+ */
+abstract class ChannelConnectionFailureReason
+{
+    public const ADMINISTRATIVELY_PROHIBITED = 1;
+    public const CONNECT_FAILED = 2;
+    public const UNKNOWN_CHANNEL_TYPE = 3;
+    public const RESOURCE_SHORTAGE = 4;
+}
diff --git a/phpseclib/Net/SSH2/DisconnectReason.php b/phpseclib/Net/SSH2/DisconnectReason.php
new file mode 100644
index 000000000..b9fa76e93
--- /dev/null
+++ b/phpseclib/Net/SSH2/DisconnectReason.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Net\SSH2;
+
+use phpseclib3\Common\ConstantUtilityTrait;
+
+/**
+ * @internal
+ */
+abstract class DisconnectReason
+{
+    use ConstantUtilityTrait;
+
+    public const HOST_NOT_ALLOWED_TO_CONNECT = 1;
+    public const PROTOCOL_ERROR = 2;
+    public const KEY_EXCHANGE_FAILED = 3;
+    public const RESERVED = 4;
+    public const MAC_ERROR = 5;
+    public const COMPRESSION_ERROR = 6;
+    public const SERVICE_NOT_AVAILABLE = 7;
+    public const PROTOCOL_VERSION_NOT_SUPPORTED = 8;
+    public const HOST_KEY_NOT_VERIFIABLE = 9;
+    public const CONNECTION_LOST = 10;
+    public const BY_APPLICATION = 11;
+    public const TOO_MANY_CONNECTIONS = 12;
+    public const AUTH_CANCELLED_BY_USER = 13;
+    public const NO_MORE_AUTH_METHODS_AVAILABLE = 14;
+    public const ILLEGAL_USER_NAME = 15;
+}
diff --git a/phpseclib/Net/SSH2/MessageType.php b/phpseclib/Net/SSH2/MessageType.php
new file mode 100644
index 000000000..2a7385327
--- /dev/null
+++ b/phpseclib/Net/SSH2/MessageType.php
@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Net\SSH2;
+
+use phpseclib3\Common\ConstantUtilityTrait;
+
+/**
+ * @internal
+ */
+abstract class MessageType
+{
+    use ConstantUtilityTrait;
+
+    public const DISCONNECT = 1;
+    public const IGNORE = 2;
+    public const UNIMPLEMENTED = 3;
+    public const DEBUG = 4;
+    public const SERVICE_REQUEST = 5;
+    public const SERVICE_ACCEPT = 6;
+    public const EXT_INFO = 7;
+    public const NEWCOMPRESS = 8;
+
+    public const KEXINIT = 20;
+    public const NEWKEYS = 21;
+
+    // KEXDH_INIT and KEXDH_REPLY are not defined RFC4250 but are referenced in RFC4253
+    public const KEXDH_INIT = 30;
+    public const KEXDH_REPLY = 31;
+
+    public const USERAUTH_REQUEST = 50;
+    public const USERAUTH_FAILURE = 51;
+    public const USERAUTH_SUCCESS = 52;
+    public const USERAUTH_BANNER = 53;
+
+    public const USERAUTH_INFO_REQUEST = 60;
+    public const USERAUTH_INFO_RESPONSE = 61;
+
+    public const GLOBAL_REQUEST = 80;
+    public const REQUEST_SUCCESS = 81;
+    public const REQUEST_FAILURE = 82;
+
+    public const CHANNEL_OPEN = 90;
+    public const CHANNEL_OPEN_CONFIRMATION = 91;
+    public const CHANNEL_OPEN_FAILURE = 92;
+    public const CHANNEL_WINDOW_ADJUST = 93;
+    public const CHANNEL_DATA = 94;
+    public const CHANNEL_EXTENDED_DATA = 95;
+    public const CHANNEL_EOF = 96;
+    public const CHANNEL_CLOSE = 97;
+    public const CHANNEL_REQUEST = 98;
+    public const CHANNEL_SUCCESS = 99;
+    public const CHANNEL_FAILURE = 100;
+}
diff --git a/phpseclib/Net/SSH2/MessageTypeExtra.php b/phpseclib/Net/SSH2/MessageTypeExtra.php
new file mode 100644
index 000000000..206ed427e
--- /dev/null
+++ b/phpseclib/Net/SSH2/MessageTypeExtra.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Net\SSH2;
+
+/**
+ * @internal
+ */
+abstract class MessageTypeExtra
+{
+    // RFC 4419 - diffie-hellman-group-exchange-sha{1,256}
+    public const KEXDH_GEX_REQUEST_OLD = 30;
+    public const KEXDH_GEX_GROUP = 31;
+    public const KEXDH_GEX_INIT = 32;
+    public const KEXDH_GEX_REPLY = 33;
+    public const KEXDH_GEX_REQUEST = 34;
+
+    // RFC 5656 - Elliptic Curves (for curve25519-sha256@libssh.org)
+    public const KEX_ECDH_INIT = 30;
+    public const KEX_ECDH_REPLY = 31;
+
+    public const USERAUTH_PASSWD_CHANGEREQ = 60;
+
+    public const USERAUTH_PK_OK = 60;
+}
diff --git a/phpseclib/Net/SSH2/TerminalMode.php b/phpseclib/Net/SSH2/TerminalMode.php
new file mode 100644
index 000000000..c22659fb6
--- /dev/null
+++ b/phpseclib/Net/SSH2/TerminalMode.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Net\SSH2;
+
+/**
+ * @internal
+ */
+abstract class TerminalMode
+{
+    public const TTY_OP_END = 0;
+}
diff --git a/phpseclib/System/SSH/Agent.php b/phpseclib/System/SSH/Agent.php
index 17b52ad82..b76649727 100644
--- a/phpseclib/System/SSH/Agent.php
+++ b/phpseclib/System/SSH/Agent.php
@@ -3,6 +3,8 @@
 /**
  * Pure-PHP ssh-agent client.
  *
+ * {@internal See http://api.libssh.org/rfc/PROTOCOL.agent}
+ *
  * PHP version 5
  *
  * Here are some examples of how to use this library:
@@ -10,9 +12,9 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $agent = new \phpseclib\System\SSH\Agent();
+ *    $agent = new \phpseclib3\System\SSH\Agent();
  *
- *    $ssh = new \phpseclib\Net\SSH2('www.domain.tld');
+ *    $ssh = new \phpseclib3\Net\SSH2('www.domain.tld');
  *    if (!$ssh->login('username', $agent)) {
  *        exit('Login Failed');
  *    }
@@ -22,120 +24,128 @@
  * ?>
  * </code>
  *
- * @category  System
- * @package   SSH\Agent
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2014 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
- * @internal  See http://api.libssh.org/rfc/PROTOCOL.agent
  */
 
-namespace phpseclib\System\SSH;
+declare(strict_types=1);
+
+namespace phpseclib3\System\SSH;
 
-use phpseclib\Crypt\RSA;
-use phpseclib\System\SSH\Agent\Identity;
-use phpseclib\Exception\BadConfigurationException;
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Common\PublicKey;
+use phpseclib3\Crypt\PublicKeyLoader;
+use phpseclib3\Exception\BadConfigurationException;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Net\SSH2;
+use phpseclib3\System\SSH\Agent\Identity;
 
 /**
  * Pure-PHP ssh-agent client identity factory
  *
- * requestIdentities() method pumps out \phpseclib\System\SSH\Agent\Identity objects
+ * requestIdentities() method pumps out \phpseclib3\System\SSH\Agent\Identity objects
  *
- * @package SSH\Agent
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  internal
  */
 class Agent
 {
-    /**#@+
-     * Message numbers
-     *
-     * @access private
-     */
+    use Common\Traits\ReadBytes;
+
+    // Message numbers
+
     // to request SSH1 keys you have to use SSH_AGENTC_REQUEST_RSA_IDENTITIES (1)
-    const SSH_AGENTC_REQUEST_IDENTITIES = 11;
+    public const SSH_AGENTC_REQUEST_IDENTITIES = 11;
     // this is the SSH2 response; the SSH1 response is SSH_AGENT_RSA_IDENTITIES_ANSWER (2).
-    const SSH_AGENT_IDENTITIES_ANSWER = 12;
+    public const SSH_AGENT_IDENTITIES_ANSWER = 12;
     // the SSH1 request is SSH_AGENTC_RSA_CHALLENGE (3)
-    const SSH_AGENTC_SIGN_REQUEST = 13;
+    public const SSH_AGENTC_SIGN_REQUEST = 13;
     // the SSH1 response is SSH_AGENT_RSA_RESPONSE (4)
-    const SSH_AGENT_SIGN_RESPONSE = 14;
-    /**#@-*/
+    public const SSH_AGENT_SIGN_RESPONSE = 14;
+
+    // Agent forwarding status
 
-    /**@+
-     * Agent forwarding status
-     *
-     * @access private
-     */
     // no forwarding requested and not active
-    const FORWARD_NONE = 0;
+    public const FORWARD_NONE = 0;
     // request agent forwarding when opportune
-    const FORWARD_REQUEST = 1;
+    public const FORWARD_REQUEST = 1;
     // forwarding has been request and is active
-    const FORWARD_ACTIVE = 2;
-    /**#@-*/
+    public const FORWARD_ACTIVE = 2;
 
     /**
      * Unused
      */
-    const SSH_AGENT_FAILURE = 5;
+    public const SSH_AGENT_FAILURE = 5;
 
     /**
      * Socket Resource
      *
      * @var resource
-     * @access private
      */
-    var $fsock;
+    private $fsock;
 
     /**
      * Agent forwarding status
      *
-     * @access private
+     * @var int
      */
-    var $forward_status = self::FORWARD_NONE;
+    private $forward_status = self::FORWARD_NONE;
 
     /**
      * Buffer for accumulating forwarded authentication
      * agent data arriving on SSH data channel destined
      * for agent unix socket
      *
-     * @access private
+     * @var string
      */
-    var $socket_buffer = '';
+    private $socket_buffer = '';
 
     /**
      * Tracking the number of bytes we are expecting
      * to arrive for the agent socket on the SSH data
      * channel
+     *
+     * @var int
      */
-    var $expected_bytes = 0;
+    private $expected_bytes = 0;
 
     /**
      * Default Constructor
      *
-     * @return \phpseclib\System\SSH\Agent
-     * @throws \phpseclib\Exception\BadConfigurationException if SSH_AUTH_SOCK cannot be found
-     * @throws \RuntimeException on connection errors
-     * @access public
+     * @return Agent
+     * @throws BadConfigurationException if SSH_AUTH_SOCK cannot be found
+     * @throws RuntimeException on connection errors
      */
-    function __construct()
+    public function __construct(?string $address = null)
     {
-        switch (true) {
-            case isset($_SERVER['SSH_AUTH_SOCK']):
-                $address = $_SERVER['SSH_AUTH_SOCK'];
-                break;
-            case isset($_ENV['SSH_AUTH_SOCK']):
-                $address = $_ENV['SSH_AUTH_SOCK'];
-                break;
-            default:
-                throw new \BadConfigurationException('SSH_AUTH_SOCK not found');
+        if (!$address) {
+            switch (true) {
+                case isset($_SERVER['SSH_AUTH_SOCK']):
+                    $address = $_SERVER['SSH_AUTH_SOCK'];
+                    break;
+                case isset($_ENV['SSH_AUTH_SOCK']):
+                    $address = $_ENV['SSH_AUTH_SOCK'];
+                    break;
+                default:
+                    throw new BadConfigurationException('SSH_AUTH_SOCK not found');
+            }
         }
 
-        $this->fsock = fsockopen('unix://' . $address, 0, $errno, $errstr);
-        if (!$this->fsock) {
-            throw new \RuntimeException("Unable to connect to ssh-agent (Error $errno: $errstr)");
+        if (in_array('unix', stream_get_transports())) {
+            $this->fsock = fsockopen('unix://' . $address, 0, $errno, $errstr);
+            if (!$this->fsock) {
+                throw new RuntimeException("Unable to connect to ssh-agent (Error $errno: $errstr)");
+            }
+        } else {
+            if (substr($address, 0, 9) != '\\\\.\\pipe\\' || str_contains(substr($address, 9), '\\')) {
+                throw new RuntimeException('Address is not formatted as a named pipe should be');
+            }
+
+            $this->fsock = fopen($address, 'r+b');
+            if (!$this->fsock) {
+                throw new RuntimeException('Unable to open address');
+            }
         }
     }
 
@@ -143,52 +153,49 @@ function __construct()
      * Request Identities
      *
      * See "2.5.2 Requesting a list of protocol 2 keys"
-     * Returns an array containing zero or more \phpseclib\System\SSH\Agent\Identity objects
+     * Returns an array containing zero or more \phpseclib3\System\SSH\Agent\Identity objects
      *
-     * @return array
-     * @throws \RuntimeException on receipt of unexpected packets
-     * @access public
+     * @throws RuntimeException on receipt of unexpected packets
      */
-    function requestIdentities()
+    public function requestIdentities(): array
     {
         if (!$this->fsock) {
-            return array();
+            return [];
         }
 
         $packet = pack('NC', 1, self::SSH_AGENTC_REQUEST_IDENTITIES);
-        if (strlen($packet) != fputs($this->fsock, $packet)) {
-            throw new \RuntimeException('Connection closed while requesting identities');
+        if (strlen($packet) != fwrite($this->fsock, $packet)) {
+            throw new RuntimeException('Connection closed while requesting identities');
         }
 
-        $length = current(unpack('N', fread($this->fsock, 4)));
-        $type = ord(fread($this->fsock, 1));
+        $length = current(unpack('N', $this->readBytes(4)));
+        $packet = $this->readBytes($length);
+
+        [$type, $keyCount] = Strings::unpackSSH2('CN', $packet);
         if ($type != self::SSH_AGENT_IDENTITIES_ANSWER) {
-            throw new \RuntimeException('Unable to request identities');
+            throw new RuntimeException('Unable to request identities');
         }
 
-        $identities = array();
-        $keyCount = current(unpack('N', fread($this->fsock, 4)));
+        $identities = [];
         for ($i = 0; $i < $keyCount; $i++) {
-            $length = current(unpack('N', fread($this->fsock, 4)));
-            $key_blob = fread($this->fsock, $length);
-            $length = current(unpack('N', fread($this->fsock, 4)));
-            $key_comment = fread($this->fsock, $length);
-            $length = current(unpack('N', substr($key_blob, 0, 4)));
-            $key_type = substr($key_blob, 4, $length);
+            [$key_blob, $comment] = Strings::unpackSSH2('ss', $packet);
+            $temp = $key_blob;
+            [$key_type] = Strings::unpackSSH2('s', $temp);
             switch ($key_type) {
                 case 'ssh-rsa':
-                    $key = new RSA();
-                    $key->load('ssh-rsa ' . base64_encode($key_blob) . ' ' . $key_comment);
-                    break;
                 case 'ssh-dss':
-                    // not currently supported
-                    break;
+                case 'ssh-ed25519':
+                case 'ecdsa-sha2-nistp256':
+                case 'ecdsa-sha2-nistp384':
+                case 'ecdsa-sha2-nistp521':
+                    $key = PublicKeyLoader::load($key_type . ' ' . base64_encode($key_blob));
             }
             // resources are passed by reference by default
             if (isset($key)) {
-                $identity = new Identity($this->fsock);
-                $identity->setPublicKey($key);
-                $identity->setPublicKeyBlob($key_blob);
+                $identity = (new Identity($this->fsock))
+                    ->withPublicKey($key)
+                    ->withPublicKeyBlob($key_blob)
+                    ->withComment($comment);
                 $identities[] = $identity;
                 unset($key);
             }
@@ -197,15 +204,29 @@ function requestIdentities()
         return $identities;
     }
 
+    /**
+     * Returns the SSH Agent identity matching a given public key or null if no identity is found
+     *
+     * @return ?Identity
+     */
+    public function findIdentityByPublicKey(PublicKey $key)
+    {
+        $identities = $this->requestIdentities();
+        $key = (string) $key;
+        foreach ($identities as $identity) {
+            if (((string) $identity->getPublicKey()) == $key) {
+                return $identity;
+            }
+        }
+
+        return null;
+    }
+
     /**
      * Signal that agent forwarding should
      * be requested when a channel is opened
-     *
-     * @param Net_SSH2 $ssh
-     * @return bool
-     * @access public
      */
-    function startSSHForwarding($ssh)
+    public function startSSHForwarding(): void
     {
         if ($this->forward_status == self::FORWARD_NONE) {
             $this->forward_status = self::FORWARD_REQUEST;
@@ -214,39 +235,13 @@ function startSSHForwarding($ssh)
 
     /**
      * Request agent forwarding of remote server
-     *
-     * @param Net_SSH2 $ssh
-     * @return bool
-     * @access private
      */
-    function _request_forwarding($ssh)
+    private function request_forwarding(SSH2 $ssh): bool
     {
-        $request_channel = $ssh->_get_open_channel();
-        if ($request_channel === false) {
-            return false;
-        }
-
-        $packet = pack(
-            'CNNa*C',
-            NET_SSH2_MSG_CHANNEL_REQUEST,
-            $ssh->server_channels[$request_channel],
-            strlen('auth-agent-req@openssh.com'),
-            'auth-agent-req@openssh.com',
-            1
-        );
-
-        $ssh->channel_status[$request_channel] = NET_SSH2_MSG_CHANNEL_REQUEST;
-
-        if (!$ssh->_send_binary_packet($packet)) {
+        if (!$ssh->requestAgentForwarding()) {
             return false;
         }
 
-        $response = $ssh->_get_channel_packet($request_channel);
-        if ($response === false) {
-            return false;
-        }
-
-        $ssh->channel_status[$request_channel] = NET_SSH2_MSG_CHANNEL_OPEN;
         $this->forward_status = self::FORWARD_ACTIVE;
 
         return true;
@@ -258,29 +253,24 @@ function _request_forwarding($ssh)
      * This method is called upon successful channel
      * open to give the SSH Agent an opportunity
      * to take further action. i.e. request agent forwarding
-     *
-     * @param Net_SSH2 $ssh
-     * @access private
      */
-    function _on_channel_open($ssh)
+    public function registerChannelOpen(SSH2 $ssh): void
     {
         if ($this->forward_status == self::FORWARD_REQUEST) {
-            $this->_request_forwarding($ssh);
+            $this->request_forwarding($ssh);
         }
     }
 
     /**
      * Forward data to SSH Agent and return data reply
      *
-     * @param string $data
-     * @return data from SSH Agent
-     * @throws \RuntimeException on connection errors
-     * @access private
+     * @return string Data from SSH Agent
+     * @throws RuntimeException on connection errors
      */
-    function _forward_data($data)
+    public function forwardData(string $data)
     {
         if ($this->expected_bytes > 0) {
-            $this->socket_buffer.= $data;
+            $this->socket_buffer .= $data;
             $this->expected_bytes -= strlen($data);
         } else {
             $agent_data_bytes = current(unpack('N', $data));
@@ -293,15 +283,15 @@ function _forward_data($data)
         }
 
         if (strlen($this->socket_buffer) != fwrite($this->fsock, $this->socket_buffer)) {
-            throw new \RuntimeException('Connection closed attempting to forward data to SSH agent');
+            throw new RuntimeException('Connection closed attempting to forward data to SSH agent');
         }
 
         $this->socket_buffer = '';
         $this->expected_bytes = 0;
 
-        $agent_reply_bytes = current(unpack('N', fread($this->fsock, 4)));
+        $agent_reply_bytes = current(unpack('N', $this->readBytes(4)));
 
-        $agent_reply_data = fread($this->fsock, $agent_reply_bytes);
+        $agent_reply_data = $this->readBytes($agent_reply_bytes);
         $agent_reply_data = current(unpack('a*', $agent_reply_data));
 
         return pack('Na*', $agent_reply_bytes, $agent_reply_data);
diff --git a/phpseclib/System/SSH/Agent/Identity.php b/phpseclib/System/SSH/Agent/Identity.php
index 09b2e4c42..137bfbb77 100644
--- a/phpseclib/System/SSH/Agent/Identity.php
+++ b/phpseclib/System/SSH/Agent/Identity.php
@@ -1,73 +1,112 @@
 <?php
+
 /**
  * Pure-PHP ssh-agent client.
  *
+ * {@internal See http://api.libssh.org/rfc/PROTOCOL.agent}
+ *
  * PHP version 5
  *
- * @category  System
- * @package   SSH\Agent
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2009 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
- * @internal  See http://api.libssh.org/rfc/PROTOCOL.agent
  */
 
-namespace phpseclib\System\SSH\Agent;
+declare(strict_types=1);
+
+namespace phpseclib3\System\SSH\Agent;
 
-use phpseclib\System\SSH\Agent;
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Common\PrivateKey;
+use phpseclib3\Crypt\Common\PublicKey;
+use phpseclib3\Crypt\DSA;
+use phpseclib3\Crypt\EC;
+use phpseclib3\Crypt\RSA;
+use phpseclib3\Exception\RuntimeException;
+use phpseclib3\Exception\UnsupportedAlgorithmException;
+use phpseclib3\System\SSH\Agent;
+use phpseclib3\System\SSH\Common\Traits\ReadBytes;
 
 /**
  * Pure-PHP ssh-agent client identity object
  *
- * Instantiation should only be performed by \phpseclib\System\SSH\Agent class.
- * This could be thought of as implementing an interface that phpseclib\Crypt\RSA
+ * Instantiation should only be performed by \phpseclib3\System\SSH\Agent class.
+ * This could be thought of as implementing an interface that phpseclib3\Crypt\RSA
  * implements. ie. maybe a Net_SSH_Auth_PublicKey interface or something.
- * The methods in this interface would be getPublicKey, setSignatureMode
- * and sign since those are the methods phpseclib looks for to perform
- * public key authentication.
+ * The methods in this interface would be getPublicKey and sign since those are the
+ * methods phpseclib looks for to perform public key authentication.
  *
- * @package SSH\Agent
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  internal
+ * @internal
  */
-class Identity
+class Identity implements PrivateKey
 {
+    use ReadBytes;
+
+    // Signature Flags
+    // See https://tools.ietf.org/html/draft-miller-ssh-agent-00#section-5.3
+    public const SSH_AGENT_RSA2_256 = 2;
+    public const SSH_AGENT_RSA2_512 = 4;
+
     /**
      * Key Object
      *
-     * @var \phpseclib\Crypt\RSA
-     * @access private
+     * @var PublicKey
      * @see self::getPublicKey()
      */
-    var $key;
+    private $key;
 
     /**
      * Key Blob
      *
      * @var string
-     * @access private
      * @see self::sign()
      */
-    var $key_blob;
+    private $key_blob;
 
     /**
      * Socket Resource
      *
      * @var resource
-     * @access private
      * @see self::sign()
      */
-    var $fsock;
+    private $fsock;
+
+    /**
+     * Signature flags
+     *
+     * @var int
+     * @see self::sign()
+     * @see self::setHash()
+     */
+    private $flags = 0;
+
+    /**
+     * Comment
+     *
+     * @var null|string
+     */
+    private $comment;
+
+    /**
+     * Curve Aliases
+     *
+     * @var array
+     */
+    private static $curveAliases = [
+        'secp256r1' => 'nistp256',
+        'secp384r1' => 'nistp384',
+        'secp521r1' => 'nistp521',
+        'Ed25519' => 'Ed25519',
+    ];
 
     /**
      * Default Constructor.
      *
      * @param resource $fsock
-     * @return \phpseclib\System\SSH\Agent\Identity
-     * @access private
      */
-    function __construct($fsock)
+    public function __construct($fsock)
     {
         $this->fsock = $fsock;
     }
@@ -75,56 +114,140 @@ function __construct($fsock)
     /**
      * Set Public Key
      *
-     * Called by \phpseclib\System\SSH\Agent::requestIdentities()
-     *
-     * @param \phpseclib\Crypt\RSA $key
-     * @access private
+     * Called by \phpseclib3\System\SSH\Agent::requestIdentities()
      */
-    function setPublicKey($key)
+    public function withPublicKey(PublicKey $key): Identity
     {
-        $this->key = $key;
-        $this->key->setPublicKey();
+        if ($key instanceof EC) {
+            if (is_array($key->getCurve()) || !isset(self::$curveAliases[$key->getCurve()])) {
+                throw new UnsupportedAlgorithmException('The only supported curves are nistp256, nistp384, nistp512 and Ed25519');
+            }
+        }
+
+        $new = clone $this;
+        $new->key = $key;
+        return $new;
     }
 
     /**
      * Set Public Key
      *
-     * Called by \phpseclib\System\SSH\Agent::requestIdentities(). The key blob could be extracted from $this->key
+     * Called by \phpseclib3\System\SSH\Agent::requestIdentities(). The key blob could be extracted from $this->key
      * but this saves a small amount of computation.
-     *
-     * @param string $key_blob
-     * @access private
      */
-    function setPublicKeyBlob($key_blob)
+    public function withPublicKeyBlob(string $key_blob): Identity
     {
-        $this->key_blob = $key_blob;
+        $new = clone $this;
+        $new->key_blob = $key_blob;
+        return $new;
     }
 
     /**
      * Get Public Key
      *
      * Wrapper for $this->key->getPublicKey()
+     */
+    public function getPublicKey(): PublicKey
+    {
+        return $this->key;
+    }
+
+    /**
+     * Sets the hash
+     */
+    public function withHash(string $hash): Identity
+    {
+        $new = clone $this;
+
+        $hash = strtolower($hash);
+
+        if ($this->key instanceof RSA) {
+            $new->flags = 0;
+            switch ($hash) {
+                case 'sha1':
+                    break;
+                case 'sha256':
+                    $new->flags = self::SSH_AGENT_RSA2_256;
+                    break;
+                case 'sha512':
+                    $new->flags = self::SSH_AGENT_RSA2_512;
+                    break;
+                default:
+                    throw new UnsupportedAlgorithmException('The only supported hashes for RSA are sha1, sha256 and sha512');
+            }
+        }
+        if ($this->key instanceof EC) {
+            switch ($this->key->getCurve()) {
+                case 'secp256r1':
+                    $expectedHash = 'sha256';
+                    break;
+                case 'secp384r1':
+                    $expectedHash = 'sha384';
+                    break;
+                //case 'secp521r1':
+                //case 'Ed25519':
+                default:
+                    $expectedHash = 'sha512';
+            }
+            if ($hash != $expectedHash) {
+                throw new UnsupportedAlgorithmException('The only supported hash for ' . self::$curveAliases[$this->key->getCurve()] . ' is ' . $expectedHash);
+            }
+        }
+        if ($this->key instanceof DSA) {
+            if ($hash != 'sha1') {
+                throw new UnsupportedAlgorithmException('The only supported hash for DSA is sha1');
+            }
+        }
+        return $new;
+    }
+
+    /**
+     * Sets the padding
      *
-     * @param int $format optional
-     * @return mixed
-     * @access public
+     * Only PKCS1 padding is supported
      */
-    function getPublicKey($format = null)
+    public function withPadding(int $padding): Identity
     {
-        return !isset($format) ? $this->key->getPublicKey() : $this->key->getPublicKey($format);
+        if (!$this->key instanceof RSA) {
+            throw new UnsupportedAlgorithmException('Only RSA keys support padding');
+        }
+        if ($padding != RSA::SIGNATURE_PKCS1 && $padding != RSA::SIGNATURE_RELAXED_PKCS1) {
+            throw new UnsupportedAlgorithmException('ssh-agent can only create PKCS1 signatures');
+        }
+        return $this;
     }
 
     /**
-     * Set Signature Mode
+     * Determines the signature padding mode
      *
-     * Doesn't do anything as ssh-agent doesn't let you pick and choose the signature mode. ie.
-     * ssh-agent's only supported mode is \phpseclib\Crypt\RSA::SIGNATURE_PKCS1
+     * Valid values are: ASN1, SSH2, Raw
+     */
+    public function withSignatureFormat(string $format): Identity
+    {
+        if ($this->key instanceof RSA) {
+            throw new UnsupportedAlgorithmException('Only DSA and EC keys support signature format setting');
+        }
+        if ($format != 'SSH2') {
+            throw new UnsupportedAlgorithmException('Only SSH2-formatted signatures are currently supported');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the curve
      *
-     * @param int $mode
-     * @access public
+     * Returns a string if it's a named curve, an array if not
+     *
+     * @return string|array
      */
-    function setSignatureMode($mode)
+    public function getCurve()
     {
+        if (!$this->key instanceof EC) {
+            throw new UnsupportedAlgorithmException('Only EC keys have curves');
+        }
+
+        return $this->key->getCurve();
     }
 
     /**
@@ -133,28 +256,78 @@ function setSignatureMode($mode)
      * See "2.6.2 Protocol 2 private key signature request"
      *
      * @param string $message
-     * @return string
-     * @throws \RuntimeException on connection errors
-     * @access public
+     * @throws RuntimeException on connection errors
+     * @throws UnsupportedAlgorithmException if the algorithm is unsupported
      */
-    function sign($message)
+    public function sign($message): string
     {
         // the last parameter (currently 0) is for flags and ssh-agent only defines one flag (for ssh-dss): SSH_AGENT_OLD_SIGNATURE
-        $packet = pack('CNa*Na*N', Agent::SSH_AGENTC_SIGN_REQUEST, strlen($this->key_blob), $this->key_blob, strlen($message), $message, 0);
-        $packet = pack('Na*', strlen($packet), $packet);
-        if (strlen($packet) != fputs($this->fsock, $packet)) {
-            throw new \RuntimeException('Connection closed during signing');
+        $packet = Strings::packSSH2(
+            'CssN',
+            Agent::SSH_AGENTC_SIGN_REQUEST,
+            $this->key_blob,
+            $message,
+            $this->flags
+        );
+        $packet = Strings::packSSH2('s', $packet);
+        if (strlen($packet) != fwrite($this->fsock, $packet)) {
+            throw new RuntimeException('Connection closed during signing');
         }
 
-        $length = current(unpack('N', fread($this->fsock, 4)));
-        $type = ord(fread($this->fsock, 1));
+        $length = current(unpack('N', $this->readBytes(4)));
+        $packet = $this->readBytes($length);
+
+        [$type, $signature_blob] = Strings::unpackSSH2('Cs', $packet);
         if ($type != Agent::SSH_AGENT_SIGN_RESPONSE) {
-            throw new \RuntimeException('Unable to retreive signature');
+            throw new RuntimeException('Unable to retrieve signature');
         }
 
-        $signature_blob = fread($this->fsock, $length - 1);
-        // the only other signature format defined - ssh-dss - is the same length as ssh-rsa
-        // the + 12 is for the other various SSH added length fields
-        return substr($signature_blob, strlen('ssh-rsa') + 12);
+        if (!$this->key instanceof RSA) {
+            return $signature_blob;
+        }
+
+        [$type, $signature_blob] = Strings::unpackSSH2('ss', $signature_blob);
+
+        return $signature_blob;
+    }
+
+    /**
+     * Returns the private key
+     *
+     * @param array $options optional
+     */
+    public function toString(string $type, array $options = []): string
+    {
+        throw new RuntimeException('ssh-agent does not provide a mechanism to get the private key');
+    }
+
+    /**
+     * Sets the password
+     *
+     * @return never
+     */
+    public function withPassword(?string $password = null): PrivateKey
+    {
+        throw new RuntimeException('ssh-agent does not provide a mechanism to get the private key');
+    }
+
+    /**
+     * Sets the comment
+     */
+    public function withComment($comment = null)
+    {
+        $new = clone $this;
+        $new->comment = $comment;
+        return $new;
+    }
+
+    /**
+     * Returns the comment
+     *
+     * @return null|string
+     */
+    public function getComment()
+    {
+        return $this->comment;
     }
 }
diff --git a/phpseclib/System/SSH/Common/Traits/ReadBytes.php b/phpseclib/System/SSH/Common/Traits/ReadBytes.php
new file mode 100644
index 000000000..1eb1bff38
--- /dev/null
+++ b/phpseclib/System/SSH/Common/Traits/ReadBytes.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * ReadBytes trait
+ *
+ * PHP version 5
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\System\SSH\Common\Traits;
+
+use phpseclib3\Exception\RuntimeException;
+
+/**
+ * ReadBytes trait
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+trait ReadBytes
+{
+    /**
+     * Read data
+     *
+     * @throws RuntimeException on connection errors
+     */
+    public function readBytes(int $length): string
+    {
+        $temp = fread($this->fsock, $length);
+        if ($temp === false) {
+            throw new RuntimeException('\fread() failed.');
+        }
+        if (strlen($temp) !== $length) {
+            throw new RuntimeException("Expected $length bytes; got " . strlen($temp));
+        }
+        return $temp;
+    }
+}
diff --git a/phpseclib/bootstrap.php b/phpseclib/bootstrap.php
new file mode 100644
index 000000000..7aededc9e
--- /dev/null
+++ b/phpseclib/bootstrap.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Bootstrapping File for phpseclib
+ *
+ * composer isn't a requirement for phpseclib 2.0 but this file isn't really required
+ * either. it's a bonus for those using composer but if you're not phpseclib will
+ * still work
+ *
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ */
+
+if (extension_loaded('mbstring')) {
+    // 2 - MB_OVERLOAD_STRING
+    // mbstring.func_overload is deprecated in php 7.2 and removed in php 8.0.
+    if (version_compare(PHP_VERSION, '8.0.0') < 0 && ini_get('mbstring.func_overload') & 2) {
+        throw new UnexpectedValueException(
+            'Overloading of string functions using mbstring.func_overload ' .
+            'is not supported by phpseclib.'
+        );
+    }
+}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
deleted file mode 100644
index 09f8b8ffb..000000000
--- a/phpunit.xml.dist
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit bootstrap="tests/bootstrap.php"
-         colors="true"
->
-    <testsuites>
-        <testsuite name="phpseclib Unit Test Suite">
-            <directory>./tests/Unit/</directory>
-        </testsuite>
-        <testsuite name="phpseclib Functional Test Suite">
-            <directory>./tests/Functional/</directory>
-        </testsuite>
-    </testsuites>
-
-    <!-- Code Coverage -->
-    <filter>
-        <whitelist>
-            <directory>./phpseclib/</directory>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/tests/Functional/Net/SCPSSH2UserStoryTest.php b/tests/Functional/Net/SCPSSH2UserStoryTest.php
deleted file mode 100644
index 41e86e958..000000000
--- a/tests/Functional/Net/SCPSSH2UserStoryTest.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * @author    Andreas Fischer <bantu@phpbb.com>
- * @copyright 2014 Andreas Fischer
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- */
-
-use phpseclib\Net\SCP;
-use phpseclib\Net\SSH2;
-
-class Functional_Net_SCPSSH2UserStoryTest extends PhpseclibFunctionalTestCase
-{
-    static protected $remoteFile;
-    static protected $exampleData;
-    static protected $exampleDataLength;
-
-    public static function setUpBeforeClass()
-    {
-        parent::setUpBeforeClass();
-        self::$remoteFile = uniqid('phpseclib-scp-ssh2-') . '.txt';
-        self::$exampleData = str_repeat('abscp12345', 1000);
-        self::$exampleDataLength = 10000;
-    }
-
-    public function testConstructSSH2()
-    {
-        $ssh = new SSH2($this->getEnv('SSH_HOSTNAME'));
-        $this->assertTrue(
-            $ssh->login(
-                $this->getEnv('SSH_USERNAME'),
-                $this->getEnv('SSH_PASSWORD')
-            )
-        );
-        return $ssh;
-    }
-
-    /**
-     * @depends testConstructSSH2
-     * @param \phpseclib\Net\SSH2 $ssh
-     */
-    public function testConstructor($ssh)
-    {
-        $scp = new SCP($ssh);
-        $this->assertTrue(
-            is_object($scp),
-            'Could not construct \phpseclib\Net\SCP object.'
-        );
-        return $scp;
-    }
-
-    /**
-     * @depends testConstructor
-     * @param \phpseclib\Net\SCP $scp
-     */
-    public function testPutGetString($scp)
-    {
-        $this->assertTrue(
-            $scp->put(self::$remoteFile, self::$exampleData),
-            'Failed asserting that data could successfully be put() into file.'
-        );
-        $content = $scp->get(self::$remoteFile);
-        // TODO: Address https://github.com/phpseclib/phpseclib/issues/146
-        $this->assertContains(
-            strlen($content),
-            array(self::$exampleDataLength, self::$exampleDataLength + 1),
-            'Failed asserting that string length matches expected length.'
-        );
-        $this->assertContains(
-            $content,
-            array(self::$exampleData, self::$exampleData . "\0"),
-            'Failed asserting that string content matches expected content.'
-        );
-        return $scp;
-    }
-
-    /**
-     * @depends testPutGetString
-     * @param \phpseclib\Net\SCP $scp
-     */
-    public function testGetFile($scp)
-    {
-        $localFilename = $this->createTempFile();
-        $this->assertTrue(
-            $scp->get(self::$remoteFile, $localFilename),
-            'Failed asserting that get() into file was successful.'
-        );
-        // TODO: Address https://github.com/phpseclib/phpseclib/issues/146
-        $this->assertContains(
-            filesize($localFilename),
-            array(self::$exampleDataLength, self::$exampleDataLength + 1),
-            'Failed asserting that filesize matches expected data size.'
-        );
-        $this->assertContains(
-            file_get_contents($localFilename),
-            array(self::$exampleData, self::$exampleData . "\0"),
-            'Failed asserting that file content matches expected content.'
-        );
-    }
-}
diff --git a/tests/Functional/Net/SFTPLargeFileTest.php b/tests/Functional/Net/SFTPLargeFileTest.php
index cc170e8a1..062222565 100644
--- a/tests/Functional/Net/SFTPLargeFileTest.php
+++ b/tests/Functional/Net/SFTPLargeFileTest.php
@@ -6,16 +6,20 @@
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\Crypt\Base;
-use phpseclib\Net\SFTP;
+declare(strict_types=1);
 
-class Functional_Net_SFTPLargeFileTest extends Functional_Net_SFTPTestCase
+namespace phpseclib3\Tests\Functional\Net;
+
+use phpseclib3\Net\SFTP;
+
+class SFTPLargeFileTest extends SFTPTestCase
 {
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
-        if (!extension_loaded('mcrypt') && !extension_loaded('openssl')) {
-            self::markTestSkipped('This test depends on mcrypt or openssl for performance.');
+        if (!extension_loaded('openssl')) {
+            self::markTestSkipped('This test depends on openssl for performance.');
         }
+        self::ensureConstant('CRYPT_HASH_MODE', 3);
         parent::setUpBeforeClass();
     }
 
@@ -24,7 +28,7 @@ public static function setUpBeforeClass()
      * @group github455
      * @group github457
      */
-    public function testPutSizeLocalFile()
+    public function testPutSizeLocalFile(): void
     {
         $tmp_filename = $this->createTempFile(128, 1024 * 1024);
         $filename = 'file-large-from-local.txt';
@@ -36,7 +40,7 @@ public function testPutSizeLocalFile()
 
         $this->assertSame(
             128 * 1024 * 1024,
-            $this->sftp->size($filename),
+            $this->sftp->filesize($filename),
             'Failed asserting that uploaded local file has the expected length.'
         );
     }
diff --git a/tests/Functional/Net/SFTPStreamTest.php b/tests/Functional/Net/SFTPStreamTest.php
index 83602359e..f84a0fab3 100644
--- a/tests/Functional/Net/SFTPStreamTest.php
+++ b/tests/Functional/Net/SFTPStreamTest.php
@@ -6,56 +6,75 @@
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\Net\SFTP\Stream;
+declare(strict_types=1);
 
-class Functional_Net_SFTPStreamTest extends Functional_Net_SFTPTestCase
+namespace phpseclib3\Tests\Functional\Net;
+
+use phpseclib3\Net\SFTP\Stream;
+use phpseclib3\Net\SSH2;
+
+class SFTPStreamTest extends SFTPTestCase
 {
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         Stream::register();
         parent::setUpBeforeClass();
     }
 
-    public function testFopenFcloseCreatesFile()
+    public function testFopenFcloseCreatesFile(): void
     {
-        $context = stream_context_create(array(
-            'sftp' => array('session' => $this->sftp),
-        ));
+        $context = stream_context_create([
+            'sftp' => ['session' => $this->sftp],
+        ]);
         $fp = fopen($this->buildUrl('fooo.txt'), 'wb', false, $context);
-        $this->assertTrue(is_resource($fp));
+        $this->assertIsResource($fp);
         fclose($fp);
-        $this->assertSame(0, $this->sftp->size('fooo.txt'));
+        $this->assertSame(0, $this->sftp->filesize('fooo.txt'));
     }
 
     /**
      * @group github778
      */
-    public function testFilenameWithHash()
+    public function testFilenameWithHash(): void
     {
-        $context = stream_context_create(array(
-            'sftp' => array('session' => $this->sftp),
-        ));
+        $context = stream_context_create([
+            'sftp' => ['session' => $this->sftp],
+        ]);
         $fp = fopen($this->buildUrl('te#st.txt'), 'wb', false, $context);
-        fputs($fp, 'zzzz');
+        fwrite($fp, 'zzzz');
         fclose($fp);
 
-        $this->assertTrue(in_array('te#st.txt', $this->sftp->nlist()));
+        $this->assertContains('te#st.txt', $this->sftp->nlist());
     }
 
     /**
      * Tests connection reuse functionality same as ssh2 extension:
      * {@link http://php.net/manual/en/wrappers.ssh2.php#refsect1-wrappers.ssh2-examples}
      */
-    public function testConnectionReuse()
+    public function testConnectionReuse(): void
     {
-        $originalConnectionsCount = count(\phpseclib\Net\SSH2::getConnections());
+        $originalConnectionsCount = count(SSH2::getConnections());
         $session = $this->sftp;
         $dirs = scandir("sftp://$session/");
-        $this->assertCount($originalConnectionsCount, \phpseclib\Net\SSH2::getConnections());
-        $this->assertEquals(array('.', '..'), array_slice($dirs, 0, 2));
+        $this->assertCount($originalConnectionsCount, SSH2::getConnections());
+        $this->assertEquals(['.', '..'], array_slice($dirs, 0, 2));
+    }
+
+    /**
+     * @group github1552
+     */
+    public function testStreamSelect(): void
+    {
+        $context = stream_context_create([
+            'sftp' => ['session' => $this->sftp],
+        ]);
+        $fp = fopen($this->buildUrl('fooo.txt'), 'wb', false, $context);
+        $read = [$fp];
+        $write = $except = null;
+        stream_select($read, $write, $except, 0);
     }
 
-    protected function buildUrl($suffix)
+    protected function buildUrl($suffix): string
     {
         return sprintf(
             'sftp://via-context/%s/%s',
diff --git a/tests/Functional/Net/SFTPTestCase.php b/tests/Functional/Net/SFTPTestCase.php
index aec75e719..4db990631 100644
--- a/tests/Functional/Net/SFTPTestCase.php
+++ b/tests/Functional/Net/SFTPTestCase.php
@@ -6,12 +6,17 @@
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\Net\SFTP;
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Functional\Net;
+
+use phpseclib3\Net\SFTP;
+use phpseclib3\Tests\PhpseclibFunctionalTestCase;
 
 /**
  * This class provides each test method with a new and empty $this->scratchDir.
  */
-abstract class Functional_Net_SFTPTestCase extends PhpseclibFunctionalTestCase
+abstract class SFTPTestCase extends PhpseclibFunctionalTestCase
 {
     /**
      * @var SFTP
@@ -19,7 +24,7 @@ abstract class Functional_Net_SFTPTestCase extends PhpseclibFunctionalTestCase
     protected $sftp;
     protected $scratchDir;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->scratchDir = uniqid('phpseclib-sftp-scratch-');
@@ -33,7 +38,7 @@ public function setUp()
         $this->assertTrue($this->sftp->chdir($this->scratchDir));
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         if ($this->sftp) {
             $this->sftp->chdir($this->getEnv('SSH_HOME'));
diff --git a/tests/Functional/Net/SFTPUserStoryTest.php b/tests/Functional/Net/SFTPUserStoryTest.php
index 963ead419..fcc2e439e 100644
--- a/tests/Functional/Net/SFTPUserStoryTest.php
+++ b/tests/Functional/Net/SFTPUserStoryTest.php
@@ -6,16 +6,25 @@
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\Net\SFTP;
+declare(strict_types=1);
 
-class Functional_Net_SFTPUserStoryTest extends PhpseclibFunctionalTestCase
+namespace phpseclib3\Tests\Functional\Net;
+
+use phpseclib3\Net\SFTP;
+use phpseclib3\Net\SFTP\FileType;
+use phpseclib3\Tests\PhpseclibFunctionalTestCase;
+
+class SFTPUserStoryTest extends PhpseclibFunctionalTestCase
 {
-    static protected $scratchDir;
-    static protected $exampleData;
-    static protected $exampleDataLength;
-    static protected $buffer;
+    /**
+     * @var string
+     */
+    protected static $scratchDir;
+    protected static $exampleData;
+    protected static $exampleDataLength;
+    protected static $buffer;
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         parent::setUpBeforeClass();
 
@@ -25,12 +34,12 @@ public static function setUpBeforeClass()
         self::$exampleDataLength = 10000;
     }
 
-    public function testConstructor()
+    public function testConstructor(): SFTP
     {
         $sftp = new SFTP($this->getEnv('SSH_HOSTNAME'));
 
-        $this->assertTrue(
-            is_object($sftp),
+        $this->assertIsObject(
+            $sftp,
             'Could not construct NET_SFTP object.'
         );
 
@@ -40,7 +49,7 @@ public function testConstructor()
     /**
      * @depends testConstructor
      */
-    public function testPasswordLogin($sftp)
+    public function testPasswordLogin(SFTP $sftp)
     {
         $username = $this->getEnv('SSH_USERNAME');
         $password = $this->getEnv('SSH_PASSWORD');
@@ -55,7 +64,7 @@ public function testPasswordLogin($sftp)
     /**
      * @depends testPasswordLogin
      */
-    public function testPwdHome($sftp)
+    public function testPwdHome(SFTP $sftp)
     {
         $this->assertEquals(
             $this->getEnv('SSH_HOME'),
@@ -69,7 +78,7 @@ public function testPwdHome($sftp)
     /**
      * @depends testPwdHome
      */
-    public function testMkDirScratch($sftp)
+    public function testMkDirScratch(SFTP $sftp)
     {
         $dirname = self::$scratchDir;
 
@@ -91,7 +100,7 @@ public function testMkDirScratch($sftp)
     /**
      * @depends testMkDirScratch
      */
-    public function testChDirScratch($sftp)
+    public function testChDirScratch(SFTP $sftp)
     {
         $this->assertTrue(
             $sftp->chdir(self::$scratchDir),
@@ -124,10 +133,10 @@ public function testChDirScratch($sftp)
     /**
      * @depends testChDirScratch
      */
-    public function testStatOnDir($sftp)
+    public function testStatOnDir(SFTP $sftp)
     {
         $this->assertNotSame(
-            array(),
+            [],
             $sftp->stat('.'),
             'Failed asserting that the cwd has a non-empty stat.'
         );
@@ -135,10 +144,20 @@ public function testStatOnDir($sftp)
         return $sftp;
     }
 
+    public static function demoCallback($length)
+    {
+        $r = substr(self::$buffer, 0, $length);
+        self::$buffer = substr(self::$buffer, $length);
+        if (strlen($r)) {
+            return $r;
+        }
+        return null;
+    }
+
     /**
      * @depends testStatOnDir
      */
-    public function testPutSizeGetFile($sftp)
+    public function testPutSizeGetFile(SFTP $sftp)
     {
         $this->assertTrue(
             $sftp->put('file1.txt', self::$exampleData),
@@ -147,7 +166,7 @@ public function testPutSizeGetFile($sftp)
 
         $this->assertSame(
             self::$exampleDataLength,
-            $sftp->size('file1.txt'),
+            $sftp->filesize('file1.txt'),
             'Failed asserting that put example data has the expected length'
         );
 
@@ -157,33 +176,40 @@ public function testPutSizeGetFile($sftp)
             'Failed asserting that get() returns expected example data.'
         );
 
-        return $sftp;
-    }
+        $this->assertTrue(
+            $sftp->put('file1.txt', 'xxx', SFTP::RESUME),
+            'Failed asserting that an upload could be successfully resumed'
+        );
 
-    static function callback($length)
-    {
-        $r = substr(self::$buffer, 0, $length);
-        self::$buffer = substr(self::$buffer, $length);
-        if (strlen($r)) {
-            return $r;
-        }
-        return null;
+        $this->assertSame(
+            self::$exampleDataLength + 3,
+            $sftp->filesize('file1.txt'),
+            'Failed asserting that put example data has the expected length'
+        );
+
+        $this->assertSame(
+            self::$exampleData . 'xxx',
+            $sftp->get('file1.txt'),
+            'Failed asserting that get() returns expected example data.'
+        );
+
+        return $sftp;
     }
 
     /**
      * @depends testStatOnDir
      */
-    public function testPutSizeGetFileCallback($sftp)
+    public function testPutSizeGetFileCallback(SFTP $sftp)
     {
         self::$buffer = self::$exampleData;
         $this->assertTrue(
-            $sftp->put('file1.txt', array(__CLASS__, 'callback'), $sftp::SOURCE_CALLBACK),
+            $sftp->put('file1.txt', [__CLASS__, 'demoCallback'], $sftp::SOURCE_CALLBACK),
             'Failed asserting that example data could be successfully put().'
         );
 
         $this->assertSame(
             self::$exampleDataLength,
-            $sftp->size('file1.txt'),
+            $sftp->filesize('file1.txt'),
             'Failed asserting that put example data has the expected length'
         );
 
@@ -199,7 +225,7 @@ public function testPutSizeGetFileCallback($sftp)
     /**
      * @depends testPutSizeGetFile
      */
-    public function testTouch($sftp)
+    public function testTouch(SFTP $sftp)
     {
         $this->assertTrue(
             $sftp->touch('file2.txt'),
@@ -217,7 +243,7 @@ public function testTouch($sftp)
     /**
      * @depends testTouch
      */
-    public function testTruncate($sftp)
+    public function testTruncate(SFTP $sftp)
     {
         $this->assertTrue(
             $sftp->touch('file3.txt'),
@@ -231,7 +257,7 @@ public function testTruncate($sftp)
 
         $this->assertSame(
             1024 * 1024,
-            $sftp->size('file3.txt'),
+            $sftp->filesize('file3.txt'),
             'Failed asserting that truncate()\'d file has the expected length'
         );
 
@@ -242,10 +268,10 @@ public function testTruncate($sftp)
      * @depends testTruncate
      * @group github850
      */
-    public function testChModOnFile($sftp)
+    public function testChModOnFile(SFTP $sftp)
     {
         $this->assertNotFalse(
-            $sftp->chmod(0755, 'file1.txt'),
+            $sftp->chmod(0o755, 'file1.txt'),
             'Failed asserting that chmod() was successful.'
         );
 
@@ -255,7 +281,7 @@ public function testChModOnFile($sftp)
     /**
      * @depends testChModOnFile
      */
-    public function testChDirOnFile($sftp)
+    public function testChDirOnFile(SFTP $sftp)
     {
         $this->assertFalse(
             $sftp->chdir('file1.txt'),
@@ -268,7 +294,7 @@ public function testChDirOnFile($sftp)
     /**
      * @depends testChDirOnFile
      */
-    public function testFileExistsIsFileIsDirFile($sftp)
+    public function testFileExistsIsFileIsDirFile(SFTP $sftp)
     {
         $this->assertTrue(
             $sftp->file_exists('file1.txt'),
@@ -291,7 +317,7 @@ public function testFileExistsIsFileIsDirFile($sftp)
     /**
      * @depends testFileExistsIsFileIsDirFile
      */
-    public function testFileExistsIsFileIsDirFileNonexistent($sftp)
+    public function testFileExistsIsFileIsDirFileNonexistent(SFTP $sftp)
     {
         $this->assertFalse(
             $sftp->file_exists('file4.txt'),
@@ -314,7 +340,7 @@ public function testFileExistsIsFileIsDirFileNonexistent($sftp)
     /**
      * @depends testFileExistsIsFileIsDirFileNonexistent
      */
-    public function testSortOrder($sftp)
+    public function testSortOrder(SFTP $sftp)
     {
         $this->assertTrue(
             $sftp->mkdir('temp'),
@@ -325,7 +351,7 @@ public function testSortOrder($sftp)
         $sftp->setListOrder('filename', SORT_DESC);
 
         $list = $sftp->nlist();
-        $expected = array('.', '..', 'temp', 'file3.txt', 'file2.txt', 'file1.txt');
+        $expected = ['.', '..', 'temp', 'file3.txt', 'file2.txt', 'file1.txt'];
 
         $this->assertSame(
             $list,
@@ -336,7 +362,7 @@ public function testSortOrder($sftp)
         $sftp->setListOrder('filename', SORT_ASC);
 
         $list = $sftp->nlist();
-        $expected = array('.', '..', 'temp', 'file1.txt', 'file2.txt', 'file3.txt');
+        $expected = ['.', '..', 'temp', 'file1.txt', 'file2.txt', 'file3.txt'];
 
         $this->assertSame(
             $list,
@@ -351,7 +377,7 @@ public function testSortOrder($sftp)
         $last_size = 0x7FFFFFFF;
         foreach ($files as $file) {
             if ($sftp->is_file($file)) {
-                $cur_size = $sftp->size($file);
+                $cur_size = $sftp->filesize($file);
                 $this->assertLessThanOrEqual(
                     $last_size,
                     $cur_size,
@@ -367,7 +393,7 @@ public function testSortOrder($sftp)
     /**
      * @depends testSortOrder
      */
-    public function testResourceXfer($sftp)
+    public function testResourceXfer(SFTP $sftp)
     {
         $fp = fopen('res.txt', 'w+');
         $sftp->get('file1.txt', $fp);
@@ -387,7 +413,7 @@ public function testResourceXfer($sftp)
     /**
      * @depends testResourceXfer
      */
-    public function testSymlink($sftp)
+    public function testSymlink(SFTP $sftp)
     {
         $this->assertTrue(
             $sftp->symlink('file3.txt', 'symlink'),
@@ -400,7 +426,7 @@ public function testSymlink($sftp)
     /**
      * @depends testSymlink
      */
-    public function testStatLstatCache($sftp)
+    public function testStatLstatCache(SFTP $sftp)
     {
         $stat = $sftp->stat('symlink');
         $lstat = $sftp->lstat('symlink');
@@ -416,7 +442,7 @@ public function testStatLstatCache($sftp)
     /**
      * @depends testStatLstatCache
      */
-    public function testLinkFile($sftp)
+    public function testLinkFile(SFTP $sftp)
     {
         $this->assertTrue(
             $sftp->is_link('symlink'),
@@ -437,10 +463,9 @@ public function testLinkFile($sftp)
     /**
      * @depends testLinkFile
      */
-    public function testReadlink($sftp)
+    public function testReadlink(SFTP $sftp)
     {
-        $this->assertInternalType(
-            'string',
+        $this->assertIsString(
             $sftp->readlink('symlink'),
             'Failed asserting that a symlink\'s target could be read'
         );
@@ -452,17 +477,15 @@ public function testReadlink($sftp)
      * @depends testReadlink
      * @group github716
      */
-    public function testStatOnCWD($sftp)
+    public function testStatOnCWD(SFTP $sftp)
     {
         $stat = $sftp->stat('.');
-        $this->assertInternalType(
-            'array',
+        $this->assertIsArray(
             $stat,
             'Failed asserting that stat on . returns an array'
         );
         $lstat = $sftp->lstat('.');
-        $this->assertInternalType(
-            'array',
+        $this->assertIsArray(
             $lstat,
             'Failed asserting that lstat on . returns an array'
         );
@@ -472,10 +495,11 @@ public function testStatOnCWD($sftp)
 
     /**
      * on older versions this would result in a fatal error
+     *
      * @depends testStatOnCWD
      * @group github402
      */
-    public function testStatcacheFix($sftp)
+    public function testStatcacheFix(SFTP $sftp)
     {
         // Name used for both directory and file.
         $name = 'stattestdir';
@@ -498,7 +522,7 @@ public function testStatcacheFix($sftp)
     /**
      * @depends testStatcacheFix
      */
-    public function testChDirUpHome($sftp)
+    public function testChDirUpHome(SFTP $sftp)
     {
         $this->assertTrue(
             $sftp->chdir('../'),
@@ -517,7 +541,7 @@ public function testChDirUpHome($sftp)
     /**
      * @depends testChDirUpHome
      */
-    public function testFileExistsIsFileIsDirDir($sftp)
+    public function testFileExistsIsFileIsDirDir(SFTP $sftp)
     {
         $this->assertTrue(
             $sftp->file_exists(self::$scratchDir),
@@ -540,13 +564,13 @@ public function testFileExistsIsFileIsDirDir($sftp)
     /**
      * @depends testFileExistsIsFileIsDirDir
      */
-    public function testTruncateLargeFile($sftp)
+    public function testTruncateLargeFile(SFTP $sftp)
     {
         $filesize = (4 * 1024 + 16) * 1024 * 1024;
         $filename = 'file-large-from-truncate-4112MiB.txt';
         $this->assertTrue($sftp->touch($filename));
         $this->assertTrue($sftp->truncate($filename, $filesize));
-        $this->assertSame($filesize, $sftp->size($filename));
+        $this->assertSame($filesize, $sftp->filesize($filename));
 
         return $sftp;
     }
@@ -554,7 +578,7 @@ public function testTruncateLargeFile($sftp)
     /**
      * @depends testTruncateLargeFile
      */
-    public function testRmDirScratch($sftp)
+    public function testRmDirScratch(SFTP $sftp)
     {
         $this->assertFalse(
             $sftp->rmdir(self::$scratchDir),
@@ -568,7 +592,7 @@ public function testRmDirScratch($sftp)
     /**
      * @depends testRmDirScratch
      */
-    public function testDeleteRecursiveScratch($sftp)
+    public function testDeleteRecursiveScratch(SFTP $sftp)
     {
         $this->assertTrue(
             $sftp->delete(self::$scratchDir),
@@ -582,7 +606,7 @@ public function testDeleteRecursiveScratch($sftp)
     /**
      * @depends testDeleteRecursiveScratch
      */
-    public function testRmDirScratchNonexistent($sftp)
+    public function testRmDirScratchNonexistent(SFTP $sftp)
     {
         $this->assertFalse(
             $sftp->rmdir(self::$scratchDir),
@@ -597,17 +621,16 @@ public function testRmDirScratchNonexistent($sftp)
      * @depends testRmDirScratchNonexistent
      * @group github706
      */
-    public function testDeleteEmptyDir($sftp)
+    public function testDeleteEmptyDir(SFTP $sftp)
     {
         $this->assertTrue(
             $sftp->mkdir(self::$scratchDir),
             'Failed asserting that scratch directory could ' .
             'be created.'
         );
-        $this->assertInternalType(
-            'array',
+        $this->assertIsArray(
             $sftp->stat(self::$scratchDir),
-            'Failed asserting that stat on an existant empty directory returns an array'
+            'Failed asserting that stat on an existent empty directory returns an array'
         );
         $this->assertTrue(
             $sftp->delete(self::$scratchDir),
@@ -619,6 +642,12 @@ public function testDeleteEmptyDir($sftp)
             'Failed asserting that stat on a deleted directory returns false'
         );
 
+        $this->assertFalse(
+            $sftp->delete(self::$scratchDir),
+            'Failed asserting that non-existent directory could not ' .
+            'be deleted using recursive delete().'
+        );
+
         return $sftp;
     }
 
@@ -626,7 +655,7 @@ public function testDeleteEmptyDir($sftp)
      * @depends testDeleteEmptyDir
      * @group github735
      */
-    public function testStatVsLstat($sftp)
+    public function testStatVsLstat(SFTP $sftp)
     {
         $this->assertTrue($sftp->mkdir(self::$scratchDir));
         $this->assertTrue($sftp->chdir(self::$scratchDir));
@@ -641,28 +670,28 @@ public function testStatVsLstat($sftp)
         $sftp->nlist();
 
         $stat = $sftp->stat('link.txt');
-        $this->assertSame($stat['type'], NET_SFTP_TYPE_REGULAR);
+        $this->assertSame($stat['type'], FileType::REGULAR);
         $stat = $sftp->lstat('link.txt');
-        $this->assertSame($stat['type'], NET_SFTP_TYPE_SYMLINK);
+        $this->assertSame($stat['type'], FileType::SYMLINK);
 
         $stat = $sftp->stat('linkdir');
-        $this->assertSame($stat['type'], NET_SFTP_TYPE_DIRECTORY);
+        $this->assertSame($stat['type'], FileType::DIRECTORY);
         $stat = $sftp->lstat('link.txt');
-        $this->assertSame($stat['type'], NET_SFTP_TYPE_SYMLINK);
+        $this->assertSame($stat['type'], FileType::SYMLINK);
 
         $sftp->disableStatCache();
 
         $sftp->nlist();
 
         $stat = $sftp->stat('link.txt');
-        $this->assertSame($stat['type'], NET_SFTP_TYPE_REGULAR);
+        $this->assertSame($stat['type'], FileType::REGULAR);
         $stat = $sftp->lstat('link.txt');
-        $this->assertSame($stat['type'], NET_SFTP_TYPE_SYMLINK);
+        $this->assertSame($stat['type'], FileType::SYMLINK);
 
         $stat = $sftp->stat('linkdir');
-        $this->assertSame($stat['type'], NET_SFTP_TYPE_DIRECTORY);
+        $this->assertSame($stat['type'], FileType::DIRECTORY);
         $stat = $sftp->lstat('link.txt');
-        $this->assertSame($stat['type'], NET_SFTP_TYPE_SYMLINK);
+        $this->assertSame($stat['type'], FileType::SYMLINK);
 
         $sftp->enableStatCache();
 
@@ -673,7 +702,7 @@ public function testStatVsLstat($sftp)
      * @depends testStatVsLstat
      * @group github830
      */
-    public function testUploadOffsets($sftp)
+    public function testUploadOffsets(SFTP $sftp)
     {
         $sftp->put('offset.txt', 'res.txt', SFTP::SOURCE_LOCAL_FILE, 0, 10);
         $this->assertSame(
@@ -688,5 +717,141 @@ public function testUploadOffsets($sftp)
             $sftp->get('offset.txt'),
             'Failed asserting that you could upload into the middle of a file.'
         );
+
+        return $sftp;
+    }
+
+    /**
+     * @depends testUploadOffsets
+     */
+    public function testReadableWritable(SFTP $sftp)
+    {
+        $sftp->chmod(0, 'offset.txt');
+        $this->assertFalse($sftp->is_writable('offset.txt'));
+        $this->assertFalse($sftp->is_writeable('offset.txt'));
+        $this->assertFalse($sftp->is_readable('offset.txt'));
+
+        $sftp->chmod(0o777, 'offset.txt');
+        $this->assertTrue($sftp->is_writable('offset.txt'));
+        $this->assertTrue($sftp->is_writeable('offset.txt'));
+        $this->assertTrue($sftp->is_readable('offset.txt'));
+
+        $this->assertFalse($sftp->is_writable('nonexistantfile.ext'));
+        $this->assertFalse($sftp->is_writeable('nonexistantfile.ext'));
+        $this->assertFalse($sftp->is_readable('nonexistantfile.ext'));
+
+        return $sftp;
+    }
+
+    /**
+     * @depends testReadableWritable
+     * @group github999
+     */
+    public function testExecNlist(SFTP $sftp)
+    {
+        $sftp->enablePTY();
+        $sftp->exec('ping google.com -c 5');
+        sleep(5);
+        $sftp->nlist();
+
+        $this->assertTrue(true);
+
+        return $sftp;
+    }
+
+    /**
+     * @depends testExecNlist
+     */
+    public function testRawlistDisabledStatCache(SFTP $sftp)
+    {
+        $this->assertTrue($sftp->mkdir(self::$scratchDir));
+        $this->assertTrue($sftp->chdir(self::$scratchDir));
+        $this->assertTrue($sftp->put('text.txt', 'zzzzz'));
+        $this->assertTrue($sftp->mkdir('subdir'));
+        $this->assertTrue($sftp->chdir('subdir'));
+        $this->assertTrue($sftp->put('leaf.txt', 'yyyyy'));
+        $this->assertTrue($sftp->chdir('../../'));
+
+        $list_cache_enabled = $sftp->rawlist('.', true);
+
+        $sftp->clearStatCache();
+
+        $sftp->disableStatCache();
+
+        $list_cache_disabled = $sftp->rawlist('.', true);
+
+        $this->assertEquals(
+            $list_cache_enabled,
+            $list_cache_disabled,
+            'The files should be the same regardless of stat cache'
+        );
+
+        return $sftp;
+    }
+
+    /**
+     * @depends testRawlistDisabledStatCache
+     */
+    public function testChownChgrp(SFTP $sftp)
+    {
+        $stat = $sftp->stat(self::$scratchDir);
+        $this->assertTrue($sftp->chown(self::$scratchDir, $stat['uid']));
+        $this->assertTrue($sftp->chgrp(self::$scratchDir, $stat['gid']));
+
+        $sftp->clearStatCache();
+        $stat2 = $sftp->stat(self::$scratchDir);
+        $this->assertSame($stat['uid'], $stat2['uid']);
+        $this->assertSame($stat['gid'], $stat2['gid']);
+
+        return $sftp;
+    }
+
+    /**
+     * @depends testChownChgrp
+     * @group github1934
+     */
+    public function testCallableGetWithLength(SFTP $sftp): SFTP
+    {
+        $sftp->put('test.txt', 'zzzzz');
+        $sftp->get('test.txt', function ($data): void {
+            $this->assertSame('z', $data);
+        }, 0, 1);
+        return $sftp;
+    }
+
+
+    /**
+     * @depends testPasswordLogin
+     */
+    public function testStatVfs(SFTP $sftp): void
+    {
+        $sftp->put('test.txt', 'aaaaa');
+        $stat = $sftp->statvfs('test.txt');
+
+        $this->assertArrayHasKey('bsize', $stat);
+        $this->assertArrayHasKey('frsize', $stat);
+        $this->assertArrayHasKey('blocks', $stat);
+        $this->assertArrayHasKey('bfree', $stat);
+        $this->assertArrayHasKey('bavail', $stat);
+        $this->assertArrayHasKey('files', $stat);
+        $this->assertArrayHasKey('ffree', $stat);
+        $this->assertArrayHasKey('favail', $stat);
+        $this->assertArrayHasKey('fsid', $stat);
+        $this->assertArrayHasKey('flag', $stat);
+        $this->assertArrayHasKey('namemax', $stat);
+
+        $this->assertSame(255, $stat['namemax']);
+    }
+
+    /**
+     * @depends testPasswordLogin
+     */
+    public function testPosixRename(SFTP $sftp): void
+    {
+        $sftp->put('test1.txt', 'aaaaa');
+        $sftp->put('test2.txt', 'bbbbb');
+
+        $sftp->posix_rename('test1.txt', 'test2.txt');
+        $this->assertSame('aaaaa', $sftp->get('test2.txt'));
     }
 }
diff --git a/tests/Functional/Net/SFTPWrongServerTest.php b/tests/Functional/Net/SFTPWrongServerTest.php
new file mode 100644
index 000000000..96ae7d74d
--- /dev/null
+++ b/tests/Functional/Net/SFTPWrongServerTest.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Functional\Net;
+
+use phpseclib3\Exception\UnableToConnectException;
+use phpseclib3\Net\SFTP;
+use PHPUnit\Framework\TestCase;
+
+class SFTPWrongServerTest extends TestCase
+{
+    public function testLoginToInvalidServer(): void
+    {
+        try {
+            (new SFTP('dummy-server'))->login('username', 'password');
+            static::fail('The connection to the non-existent server must not succeed.');
+        } catch (UnableToConnectException $e) {
+            // getaddrinfo message seems not to return stable text
+            static::assertSame(
+                'Cannot connect to dummy-server:22. Error 0. php_network_getaddresses: getaddrinfo',
+                substr($e->getMessage(), 0, 81)
+            );
+        }
+    }
+}
diff --git a/tests/Functional/Net/SSH2AgentTest.php b/tests/Functional/Net/SSH2AgentTest.php
index f9b03b46c..77a441456 100644
--- a/tests/Functional/Net/SSH2AgentTest.php
+++ b/tests/Functional/Net/SSH2AgentTest.php
@@ -6,12 +6,17 @@
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\Net\SSH2;
-use phpseclib\System\SSH\Agent;
+declare(strict_types=1);
 
-class Functional_Net_SSH2AgentTest extends PhpseclibFunctionalTestCase
+namespace phpseclib3\Tests\Functional\Net;
+
+use phpseclib3\Net\SSH2;
+use phpseclib3\System\SSH\Agent;
+use phpseclib3\Tests\PhpseclibFunctionalTestCase;
+
+class SSH2AgentTest extends PhpseclibFunctionalTestCase
 {
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         if (!isset($_SERVER['SSH_AUTH_SOCK'])) {
             self::markTestSkipped(
@@ -21,17 +26,17 @@ public static function setUpBeforeClass()
         parent::setUpBeforeClass();
     }
 
-    public function testAgentLogin()
+    public function testAgentLogin(): array
     {
         $ssh = new SSH2($this->getEnv('SSH_HOSTNAME'));
-        $agent = new Agent;
+        $agent = new Agent();
 
         $this->assertTrue(
             $ssh->login($this->getEnv('SSH_USERNAME'), $agent),
             'SSH2 login using Agent failed.'
         );
 
-        return array('ssh' => $ssh, 'ssh-agent' => $agent);
+        return ['ssh' => $ssh, 'ssh-agent' => $agent];
     }
 
     /**
diff --git a/tests/Functional/Net/SSH2Test.php b/tests/Functional/Net/SSH2Test.php
index 4c18abed7..75d16880b 100644
--- a/tests/Functional/Net/SSH2Test.php
+++ b/tests/Functional/Net/SSH2Test.php
@@ -6,16 +6,41 @@
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\Net\SSH2;
+declare(strict_types=1);
 
-class Functional_Net_SSH2Test extends PhpseclibFunctionalTestCase
+namespace phpseclib3\Tests\Functional\Net;
+
+use phpseclib3\Exception\NoSupportedAlgorithmsException;
+use phpseclib3\Net\SSH2;
+use phpseclib3\Tests\PhpseclibFunctionalTestCase;
+
+class SSH2Test extends PhpseclibFunctionalTestCase
 {
-    public function testConstructor()
+    public function getSSH2(): SSH2
+    {
+        return new SSH2($this->getEnv('SSH_HOSTNAME'), 22);
+    }
+
+    public function getSSH2Login(): SSH2
     {
-        $ssh = new SSH2($this->getEnv('SSH_HOSTNAME'));
+        $ssh = $this->getSSH2();
 
+        $username = $this->getEnv('SSH_USERNAME');
+        $password = $this->getEnv('SSH_PASSWORD');
         $this->assertTrue(
-            is_object($ssh),
+            $ssh->login($username, $password),
+            'SSH2 login using password failed.'
+        );
+
+        return $ssh;
+    }
+
+    public function testConstructor(): SSH2
+    {
+        $ssh = $this->getSSH2();
+
+        $this->assertIsObject(
+            $ssh,
             'Could not construct NET_SSH2 object.'
         );
 
@@ -27,7 +52,7 @@ public function testConstructor()
      * @group github408
      * @group github412
      */
-    public function testPreLogin($ssh)
+    public function testPreLogin(SSH2 $ssh): SSH2
     {
         $this->assertFalse(
             $ssh->isConnected(),
@@ -39,6 +64,17 @@ public function testPreLogin($ssh)
             'Failed asserting that SSH2 is not authenticated after construction.'
         );
 
+        $this->assertFalse(
+            $ssh->isShellOpen(),
+            'Failed asserting that SSH2 does not have open shell after construction.'
+        );
+
+        $this->assertEquals(
+            0,
+            $ssh->getInteractiveChannelId(),
+            'Failed asserting that channel identifier 0 is returned.'
+        );
+
         $this->assertNotEmpty(
             $ssh->getServerPublicHostKey(),
             'Failed asserting that a non-empty public host key was fetched.'
@@ -60,7 +96,7 @@ public function testPreLogin($ssh)
     /**
      * @depends testPreLogin
      */
-    public function testBadPassword($ssh)
+    public function testBadPassword(SSH2 $ssh): SSH2
     {
         $username = $this->getEnv('SSH_USERNAME');
         $password = $this->getEnv('SSH_PASSWORD');
@@ -79,13 +115,18 @@ public function testBadPassword($ssh)
             'Failed asserting that SSH2 is not authenticated after bad login attempt.'
         );
 
+        $this->assertFalse(
+            $ssh->isShellOpen(),
+            'Failed asserting that SSH2 does not have open shell after bad login attempt.'
+        );
+
         return $ssh;
     }
 
     /**
      * @depends testBadPassword
      */
-    public function testPasswordLogin($ssh)
+    public function testPasswordLogin(SSH2 $ssh): SSH2
     {
         $username = $this->getEnv('SSH_USERNAME');
         $password = $this->getEnv('SSH_PASSWORD');
@@ -99,31 +140,57 @@ public function testPasswordLogin($ssh)
             'Failed asserting that SSH2 is authenticated after good login attempt.'
         );
 
+        $this->assertFalse(
+            $ssh->isShellOpen(),
+            'Failed asserting that SSH2 does not have open shell after good login attempt.'
+        );
+
         return $ssh;
     }
 
     /**
      * @depends testPasswordLogin
      * @group github280
+     * @requires PHPUnit < 10
      */
-    public function testExecWithMethodCallback($ssh)
+    public function testExecWithMethodCallback(SSH2 $ssh): SSH2
     {
-        $callbackObject = $this->getMock('stdClass', array('callbackMethod'));
+        $callbackObject = $this->getMockBuilder('stdClass')
+            ->setMethods(['callbackMethod'])
+            ->getMock();
         $callbackObject
             ->expects($this->atLeastOnce())
             ->method('callbackMethod')
             ->will($this->returnValue(true));
-        $ssh->exec('pwd', array($callbackObject, 'callbackMethod'));
+        $ssh->exec('pwd', [$callbackObject, 'callbackMethod']);
+
+        $this->assertFalse(
+            $ssh->isPTYOpen(),
+            'Failed asserting that SSH2 does not have open exec channel after exec.'
+        );
+
+        $this->assertFalse(
+            $ssh->isShellOpen(),
+            'Failed asserting that SSH2 does not have open shell channel after exec.'
+        );
+
+        $this->assertEquals(
+            0,
+            $ssh->getInteractiveChannelId(),
+            'Failed asserting that channel identifier 0 is returned after exec.'
+        );
+
+        return $ssh;
     }
 
-    public function testGetServerPublicHostKey()
+    public function testGetServerPublicHostKey(): void
     {
-        $ssh = new SSH2($this->getEnv('SSH_HOSTNAME'));
+        $ssh = $this->getSSH2();
 
-        $this->assertInternalType('string', $ssh->getServerPublicHostKey());
+        $this->assertIsString($ssh->getServerPublicHostKey());
     }
 
-    public function testOpenSocketConnect()
+    public function testOpenSocketConnect(): void
     {
         $fsock = fsockopen($this->getEnv('SSH_HOSTNAME'), 22);
         $ssh = new SSH2($fsock);
@@ -135,4 +202,484 @@ public function testOpenSocketConnect()
             'SSH2 login using an open socket failed.'
         );
     }
+
+    /**
+     * @depends testExecWithMethodCallback
+     * @group github1009
+     */
+    public function testDisablePTY(SSH2 $ssh): SSH2
+    {
+        $ssh->enablePTY();
+
+        $this->assertTrue(
+            $ssh->isPTYEnabled(),
+            'Failed asserting that pty was enabled.'
+        );
+
+        $this->assertFalse(
+            $ssh->isPTYOpen(),
+            'Failed asserting that pty was not open after enable.'
+        );
+
+        $this->assertEquals(
+            0,
+            $ssh->getInteractiveChannelId(),
+            'Failed asserting that 0 channel identifier is returned prior to opening.'
+        );
+
+        $ssh->exec('ls -latr');
+
+        $this->assertTrue(
+            $ssh->isPTYOpen(),
+            'Failed asserting that pty was open.'
+        );
+
+        $this->assertFalse(
+            $ssh->isShellOpen(),
+            'Failed asserting that shell was not open after pty exec.'
+        );
+
+        $this->assertEquals(
+            SSH2::CHANNEL_EXEC,
+            $ssh->getInteractiveChannelId(),
+            'Failed asserting that exec channel identifier is returned after exec.'
+        );
+
+        $ssh->disablePTY();
+
+        $this->assertFalse(
+            $ssh->isPTYEnabled(),
+            'Failed asserting that pty was disabled.'
+        );
+
+        $this->assertFalse(
+            $ssh->isPTYOpen(),
+            'Failed asserting that pty was not open after disable.'
+        );
+
+        $this->assertEquals(
+            SSH2::CHANNEL_EXEC,
+            $ssh->getInteractiveChannelId(),
+            'Failed asserting that exec channel identifier is returned after pty exec close.'
+        );
+
+        $ssh->exec('pwd');
+
+        $this->assertFalse(
+            $ssh->isPTYOpen(),
+            'Failed asserting that pty was not open after exec.'
+        );
+
+        return $ssh;
+    }
+
+    /**
+     * @depends testDisablePTY
+     * @group github1167
+     */
+    public function testChannelDataAfterOpen(SSH2 $ssh): void
+    {
+        // Ubuntu's OpenSSH from 5.8 to 6.9 didn't work with multiple channels. see
+        // https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/1334916 for more info.
+        // https://lists.ubuntu.com/archives/oneiric-changes/2011-July/005772.html discusses
+        // when consolekit was incorporated.
+        // https://marc.info/?l=openssh-unix-dev&m=163409903417589&w=2 discusses some of the
+        // issues with how Ubuntu incorporated consolekit
+        $pattern = '#^SSH-2\.0-OpenSSH_([\d.]+)[^ ]* Ubuntu-.*$#';
+        $match = preg_match($pattern, $ssh->getServerIdentification(), $matches);
+        $match = $match && version_compare('5.8', $matches[1], '<=');
+        $match = $match && version_compare('6.9', $matches[1], '>=');
+        if ($match) {
+            self::markTestSkipped('Ubuntu\'s OpenSSH >= 5.8 <= 6.9 didn\'t work well with multiple channels');
+        }
+
+        $ssh->write("ping 127.0.0.1\n");
+
+        $this->assertTrue(
+            $ssh->isShellOpen(),
+            'Failed asserting that SSH2 has open shell after shell read/write.'
+        );
+
+        $this->assertFalse(
+            $ssh->isPTYOpen(),
+            'Failed asserting that pty was not open after shell read/write.'
+        );
+
+        $this->assertEquals(
+            SSH2::CHANNEL_SHELL,
+            $ssh->getInteractiveChannelId(),
+            'Failed asserting that shell channel identifier is returned after shell read/write.'
+        );
+
+        $ssh->enablePTY();
+
+        $this->assertTrue(
+            $ssh->exec('bash'),
+            'Failed asserting exec command succeeded.'
+        );
+
+        $this->assertTrue(
+            $ssh->isShellOpen(),
+            'Failed asserting that SSH2 has open shell after pty exec.'
+        );
+
+        $this->assertTrue(
+            $ssh->isPTYOpen(),
+            'Failed asserting that pty was not open after exec.'
+        );
+
+        $this->assertEquals(
+            SSH2::CHANNEL_EXEC,
+            $ssh->getInteractiveChannelId(),
+            'Failed asserting that exec channel identifier is returned after pty exec.'
+        );
+
+        $ssh->write("ls -latr\n");
+
+        $ssh->setTimeout(1);
+
+        $this->assertIsString($ssh->read());
+
+        $this->assertTrue(
+            $ssh->isTimeout(),
+            'Failed asserting that pty exec read timed out'
+        );
+
+        $this->assertTrue(
+            $ssh->isShellOpen(),
+            'Failed asserting that SSH2 shell remains open across pty exec read/write.'
+        );
+
+        $this->assertTrue(
+            $ssh->isPTYOpen(),
+            'Failed asserting that pty was open after read timeout.'
+        );
+    }
+
+    public function testOpenShell(): SSH2
+    {
+        $ssh = $this->getSSH2Login();
+
+        $this->assertTrue(
+            $ssh->openShell(),
+            'SSH2 shell initialization failed.'
+        );
+
+        $this->assertTrue(
+            $ssh->isShellOpen(),
+            'Failed asserting that SSH2 has open shell after init.'
+        );
+
+        $this->assertNotFalse(
+            $ssh->read(),
+            'Failed asserting that read succeeds.'
+        );
+
+        $ssh->write('hello');
+
+        $this->assertTrue(
+            $ssh->isShellOpen(),
+            'Failed asserting that SSH2 has open shell after read/write.'
+        );
+
+        $this->assertEquals(
+            SSH2::CHANNEL_SHELL,
+            $ssh->getInteractiveChannelId(),
+            'Failed asserting that shell channel identifier is returned after read/write.'
+        );
+
+        return $ssh;
+    }
+
+    /**
+     * @depends testOpenShell
+     */
+    public function testResetOpenShell(SSH2 $ssh): void
+    {
+        $ssh->reset();
+
+        $this->assertFalse(
+            $ssh->isShellOpen(),
+            'Failed asserting that SSH2 has open shell after reset.'
+        );
+
+        $this->assertEquals(
+            SSH2::CHANNEL_SHELL,
+            $ssh->getInteractiveChannelId(),
+            'Failed asserting that shell channel identifier is returned after reset.'
+        );
+    }
+
+    public function testMultipleExecPty(): void
+    {
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('Please close the channel (1) before trying to open it again');
+
+        $ssh = $this->getSSH2Login();
+
+        $ssh->enablePTY();
+
+        $ssh->exec('bash');
+
+        $ssh->exec('bash');
+    }
+
+    public function testMultipleInteractiveChannels(): void
+    {
+        $ssh = $this->getSSH2Login();
+
+        $this->assertTrue(
+            $ssh->openShell(),
+            'SSH2 shell initialization failed.'
+        );
+
+        $this->assertEquals(
+            SSH2::CHANNEL_SHELL,
+            $ssh->getInteractiveChannelId(),
+            'Failed asserting that shell channel identifier is returned after open shell.'
+        );
+
+        $ssh->setTimeout(1);
+
+        $this->assertIsString(
+            $ssh->read(),
+            'Failed asserting that read succeeds after shell init'
+        );
+
+        $directory = $ssh->exec('pwd');
+
+        $this->assertFalse(
+            $ssh->isTimeout(),
+            'failed'
+        );
+
+        $this->assertIsString(
+            $directory,
+            'Failed asserting that exec succeeds after shell read/write'
+        );
+
+        $ssh->write("pwd\n");
+
+        $this->assertStringContainsString(
+            trim($directory),
+            $ssh->read(),
+            'Failed asserting that current directory can be read from shell after exec'
+        );
+
+        $ssh->enablePTY();
+
+        $this->assertTrue(
+            $ssh->exec('bash'),
+            'Failed asserting that pty exec succeeds'
+        );
+
+        $this->assertTrue(
+            $ssh->isShellOpen(),
+            'Failed asserting that SSH2 has open shell after pty exec.'
+        );
+
+        $this->assertEquals(
+            SSH2::CHANNEL_EXEC,
+            $ssh->getInteractiveChannelId(),
+            'Failed asserting that exec channel identifier is returned after pty exec.'
+        );
+
+        $ssh->write("pwd\n", SSH2::CHANNEL_SHELL);
+
+        $this->assertStringContainsString(
+            trim($directory),
+            $ssh->read('', SSH2::READ_SIMPLE, SSH2::CHANNEL_SHELL),
+            'Failed asserting that current directory can be read from shell after pty exec'
+        );
+
+        $this->assertTrue(
+            $ssh->isPTYOpen(),
+            'Failed asserting that SSH2 has open pty exec after shell read/write.'
+        );
+
+        $ssh->write("pwd\n", SSH2::CHANNEL_EXEC);
+
+        $this->assertIsString(
+            $ssh->read('', SSH2::READ_SIMPLE, SSH2::CHANNEL_EXEC),
+            'Failed asserting that pty exec read succeeds'
+        );
+
+        $ssh->reset(SSH2::CHANNEL_EXEC);
+
+        $this->assertFalse(
+            $ssh->isPTYOpen(),
+            'Failed asserting that SSH2 has closed pty exec after reset.'
+        );
+
+        $ssh->disablePTY();
+
+        $this->assertTrue(
+            $ssh->isShellOpen(),
+            'Failed asserting that SSH2 has open shell after pty exec.'
+        );
+
+        $ssh->write("pwd\n", SSH2::CHANNEL_SHELL);
+
+        $this->assertStringContainsString(
+            trim($directory),
+            $ssh->read('', SSH2::READ_SIMPLE, SSH2::CHANNEL_SHELL),
+            'Failed asserting that current directory can be read from shell after pty exec'
+        );
+
+        $ssh->reset(SSH2::CHANNEL_SHELL);
+
+        $this->assertFalse(
+            $ssh->isShellOpen(),
+            'Failed asserting that SSH2 has closed shell after reset.'
+        );
+
+        $this->assertEquals(
+            SSH2::CHANNEL_EXEC,
+            $ssh->getInteractiveChannelId(),
+            'Failed asserting that exec channel identifier is maintained as last opened channel.'
+        );
+    }
+
+    public function testReadingOfClosedChannel(): void
+    {
+        $ssh = $this->getSSH2Login();
+        $this->assertSame(0, $ssh->getOpenChannelCount());
+        $ssh->enablePTY();
+        $ssh->exec('ping -c 3 127.0.0.1; exit');
+        $ssh->write("ping 127.0.0.2\n", SSH2::CHANNEL_SHELL);
+        $ssh->setTimeout(3);
+        $output = $ssh->read('', SSH2::READ_SIMPLE, SSH2::CHANNEL_SHELL);
+        $this->assertStringContainsString('PING 127.0.0.2', $output);
+        $output = $ssh->read('', SSH2::READ_SIMPLE, SSH2::CHANNEL_EXEC);
+        $this->assertStringContainsString('PING 127.0.0.1', $output);
+        $this->assertSame(1, $ssh->getOpenChannelCount());
+        $ssh->reset(SSH2::CHANNEL_SHELL);
+        $this->assertSame(0, $ssh->getOpenChannelCount());
+    }
+
+    public function testPing(): void
+    {
+        $ssh = $this->getSSH2();
+        // assert on unauthenticated ssh2
+        $this->assertNotEmpty($ssh->getServerIdentification());
+        $this->assertFalse($ssh->ping());
+        $this->assertTrue($ssh->isConnected());
+        $this->assertSame(0, $ssh->getOpenChannelCount());
+
+        $ssh = $this->getSSH2Login();
+        $this->assertTrue($ssh->ping());
+        $this->assertSame(0, $ssh->getOpenChannelCount());
+    }
+
+    public function testKeepAlive(): void
+    {
+        $ssh = $this->getSSH2();
+        $username = $this->getEnv('SSH_USERNAME');
+        $password = $this->getEnv('SSH_PASSWORD');
+
+        $ssh->setKeepAlive(1);
+        $ssh->setTimeout(1);
+
+        $this->assertNotEmpty($ssh->getServerIdentification());
+        $this->assertTrue(
+            $ssh->login($username, $password),
+            'SSH2 login using password failed.'
+        );
+
+        $ssh->write("pwd\n");
+        sleep(1); // permit keep alive to proc on next read
+        $this->assertNotEmpty($ssh->read('', SSH2::READ_NEXT));
+        $ssh->disconnect();
+    }
+
+    /**
+     * @return array
+     */
+    public static function getCryptoAlgorithms()
+    {
+        $map = [
+            'kex' => SSH2::getSupportedKEXAlgorithms(),
+            'hostkey' => SSH2::getSupportedHostKeyAlgorithms(),
+            'comp' => SSH2::getSupportedCompressionAlgorithms(),
+            'crypt' => SSH2::getSupportedEncryptionAlgorithms(),
+            'mac' => SSH2::getSupportedMACAlgorithms(),
+        ];
+        $tests = [];
+        foreach ($map as $type => $algorithms) {
+            foreach ($algorithms as $algorithm) {
+                $tests[] = [$type, $algorithm];
+            }
+        }
+        return $tests;
+    }
+
+    /**
+     * @group github2062
+     */
+    public function testSendEOF()
+    {
+        $ssh = $this->getSSH2Login();
+
+        $ssh->write("ls -latr; exit\n");
+        $ssh->read();
+        $ssh->sendEOF();
+        $ssh->exec('ls -latr');
+    }
+
+    /**
+     * @dataProvider getCryptoAlgorithms
+     * @param string $type
+     * @param string $algorithm
+     */
+    public function testCryptoAlgorithms($type, $algorithm): void
+    {
+        $ssh = $this->getSSH2();
+        try {
+            switch ($type) {
+                case 'kex':
+                case 'hostkey':
+                    $ssh->setPreferredAlgorithms([$type => [$algorithm]]);
+                    $this->assertEquals($algorithm, $ssh->getAlgorithmsNegotiated()[$type]);
+                    break;
+                case 'comp':
+                case 'crypt':
+                    $ssh->setPreferredAlgorithms([
+                        'client_to_server' => [$type => [$algorithm]],
+                        'server_to_client' => [$type => [$algorithm]],
+                    ]);
+                    $this->assertEquals($algorithm, $ssh->getAlgorithmsNegotiated()['client_to_server'][$type]);
+                    $this->assertEquals($algorithm, $ssh->getAlgorithmsNegotiated()['server_to_client'][$type]);
+                    break;
+                case 'mac':
+                    $macCryptAlgorithms = array_filter(
+                        SSH2::getSupportedEncryptionAlgorithms(),
+                        function ($algorithm) use ($ssh) {
+                            return !self::callFunc($ssh, 'encryption_algorithm_to_crypt_instance', [$algorithm])
+                                ->usesNonce();
+                        }
+                    );
+                    $ssh->setPreferredAlgorithms([
+                        'client_to_server' => ['crypt' => $macCryptAlgorithms, 'mac' => [$algorithm]],
+                        'server_to_client' => ['crypt' => $macCryptAlgorithms, 'mac' => [$algorithm]],
+                    ]);
+                    $this->assertEquals($algorithm, $ssh->getAlgorithmsNegotiated()['client_to_server']['mac']);
+                    $this->assertEquals($algorithm, $ssh->getAlgorithmsNegotiated()['server_to_client']['mac']);
+                    break;
+            }
+        } catch (NoSupportedAlgorithmsException $e) {
+            self::markTestSkipped("{$type} algorithm {$algorithm} is not supported by server");
+        }
+
+        $username = $this->getEnv('SSH_USERNAME');
+        $password = $this->getEnv('SSH_PASSWORD');
+        $this->assertTrue(
+            $ssh->login($username, $password),
+            "SSH2 login using {$type} {$algorithm} failed."
+        );
+
+        $ssh->setTimeout(1);
+        $ssh->write("pwd\n");
+        $this->assertNotEmpty($ssh->read('', SSH2::READ_NEXT));
+        $ssh->disconnect();
+    }
 }
diff --git a/tests/PhpseclibFunctionalTestCase.php b/tests/PhpseclibFunctionalTestCase.php
index ba646edb0..ceecfe974 100644
--- a/tests/PhpseclibFunctionalTestCase.php
+++ b/tests/PhpseclibFunctionalTestCase.php
@@ -1,45 +1,21 @@
 <?php
+
 /**
  * @author    Andreas Fischer <bantu@phpbb.com>
  * @copyright 2014 Andreas Fischer
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\Crypt\Hash;
-use phpseclib\Math\BigInteger;
+declare(strict_types=1);
+
+namespace phpseclib3\Tests;
 
 abstract class PhpseclibFunctionalTestCase extends PhpseclibTestCase
 {
-    public static function setUpBeforeClass()
-    {
-        if (extension_loaded('runkit')) {
-            if (extension_loaded('gmp')) {
-                self::ensureConstant(
-                    'MATH_BIGINTEGER_MODE',
-                    BigInteger::MODE_GMP
-                );
-            } elseif (extension_loaded('bcmath')) {
-                self::ensureConstant(
-                    'MATH_BIGINTEGER_MODE',
-                    BigInteger::MODE_BCMATH
-                );
-            } else {
-                self::markTestSkipped(
-                    'Should have gmp or bcmath extension for functional test.'
-                );
-            }
-            self::reRequireFile('Math/BigInteger.php');
-        }
-        parent::setUpBeforeClass();
-    }
-
     /**
-     * @param string $variable
-     * @param string|null $message
-     *
      * @return null
      */
-    protected function requireEnv($variable, $message = null)
+    protected function requireEnv(string $variable, ?string $message = null)
     {
         if ($this->_getEnv($variable) === false) {
             $msg = $message ? $message : sprintf(
@@ -51,11 +27,9 @@ protected function requireEnv($variable, $message = null)
     }
 
     /**
-     * @param string $variable
      *
-     * @return string
      */
-    protected function getEnv($variable)
+    protected function getEnv(string $variable): string
     {
         $this->requireEnv($variable);
         return $this->_getEnv($variable);
@@ -66,7 +40,7 @@ private function _getEnv($variable)
         return getenv($this->_prefixEnvVariable($variable));
     }
 
-    private function _prefixEnvVariable($variable)
+    private function _prefixEnvVariable($variable): string
     {
         return 'PHPSECLIB_' . $variable;
     }
diff --git a/tests/PhpseclibTestCase.php b/tests/PhpseclibTestCase.php
index 1a2a8e4ad..b6d9ae7ff 100644
--- a/tests/PhpseclibTestCase.php
+++ b/tests/PhpseclibTestCase.php
@@ -1,15 +1,22 @@
 <?php
+
 /**
  * @author    Andreas Fischer <bantu@phpbb.com>
  * @copyright 2013 Andreas Fischer
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-abstract class PhpseclibTestCase extends PHPUnit_Framework_TestCase
+declare(strict_types=1);
+
+namespace phpseclib3\Tests;
+
+use PHPUnit\Framework\TestCase;
+
+abstract class PhpseclibTestCase extends TestCase
 {
-    protected $tempFilesToUnlinkOnTearDown = array();
+    protected $tempFilesToUnlinkOnTearDown = [];
 
-    public function tearDown()
+    public function tearDown(): void
     {
         foreach ($this->tempFilesToUnlinkOnTearDown as $filename) {
             if (!file_exists($filename) || unlink($filename)) {
@@ -25,13 +32,8 @@ public function tearDown()
      * write $number_of_writes * $bytes_per_write times the character 'a' to the
      * temporary file. All files created using this method will be deleted from
      * the filesystem on tearDown(), i.e. after each test method was run.
-     *
-     * @param int $number_of_writes
-     * @param int $bytes_per_write
-     *
-     * @return string
      */
-    protected function createTempFile($number_of_writes = 0, $bytes_per_write = 0)
+    protected function createTempFile(int $number_of_writes = 0, int $bytes_per_write = 0): string
     {
         $filename = tempnam(sys_get_temp_dir(), 'phpseclib-test-');
         $this->assertTrue(file_exists($filename));
@@ -48,12 +50,9 @@ protected function createTempFile($number_of_writes = 0, $bytes_per_write = 0)
     }
 
     /**
-     * @param string $constant
-     * @param mixed $expected
-     *
      * @return null
      */
-    protected static function ensureConstant($constant, $expected)
+    protected static function ensureConstant(string $constant, $expected)
     {
         if (defined($constant)) {
             $value = constant($constant);
@@ -81,24 +80,49 @@ protected static function ensureConstant($constant, $expected)
         }
     }
 
-    /**
-     * @param string $filename Filename relative to library directory.
-     *
-     * @return null
-     */
-    protected static function reRequireFile($filename)
+    protected static function getVar($obj, $var)
     {
-        if (extension_loaded('runkit')) {
-            $result = runkit_import(
-                sprintf('%s/../phpseclib/%s', __DIR__, $filename),
-                RUNKIT_IMPORT_FUNCTIONS |
-                RUNKIT_IMPORT_CLASS_METHODS |
-                RUNKIT_IMPORT_OVERRIDE
-            );
+        $reflection = new \ReflectionClass($obj::class);
+        // private variables are not inherited, climb hierarchy until located
+        while (true) {
+            try {
+                $prop = $reflection->getProperty($var);
+                break;
+            } catch (\ReflectionException $e) {
+                $reflection = $reflection->getParentClass();
+                if (!$reflection) {
+                    throw $e;
+                }
+            }
+        }
+        $prop->setAccessible(true);
+        return $prop->getValue($obj);
+    }
 
-            if (!$result) {
-                self::markTestSkipped("Failed to reimport file $filename");
+    protected static function setVar($obj, $var, $value): void
+    {
+        $reflection = new \ReflectionClass($obj::class);
+        // private variables are not inherited, climb hierarchy until located
+        while (true) {
+            try {
+                $prop = $reflection->getProperty($var);
+                break;
+            } catch (\ReflectionException $e) {
+                $reflection = $reflection->getParentClass();
+                if (!$reflection) {
+                    throw $e;
+                }
             }
         }
+        $prop->setAccessible(true);
+        $prop->setValue($obj, $value);
+    }
+
+    public static function callFunc($obj, $func, $params = [])
+    {
+        $reflection = new \ReflectionClass($obj::class);
+        $method = $reflection->getMethod($func);
+        $method->setAccessible(true);
+        return $method->invokeArgs($obj, $params);
     }
 }
diff --git a/tests/PsalmBaselineTest.php b/tests/PsalmBaselineTest.php
new file mode 100644
index 000000000..c12045c42
--- /dev/null
+++ b/tests/PsalmBaselineTest.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Tests;
+
+use PHPUnit\Framework\TestCase;
+
+class PsalmBaselineTest extends TestCase
+{
+    public function testErrorTypesAreNotBaselined(): void
+    {
+        $errorTypes = [
+            'UnusedProperty',
+            'ParadoxicalCondition',
+            'MismatchingDocblockReturnType',
+        ];
+        $baselineErrorCounts = $this->getBaselineErrorCounts();
+        foreach ($errorTypes as $errorType) {
+            $this->assertArrayNotHasKey(strtoupper($errorType), $baselineErrorCounts);
+        }
+    }
+
+    /**
+     * @return array<string, int>
+     */
+    private function getBaselineErrorCounts(): array
+    {
+        $xmlParser = xml_parser_create('UTF-8');
+        $baseline = file_get_contents(__DIR__ . '/../build/psalm_baseline.xml');
+        xml_parse_into_struct($xmlParser, $baseline, $values);
+
+        $errorCounts = [];
+        /** @var array{level: int, type: string, tag: string, attributes: array{OCCURRENCES?: int}} $element */
+        foreach ($values as $element) {
+            if ($element['level'] === 3 && ($element['type'] === 'open' || $element['type'] === 'complete')) {
+                $errorCounts[$element['tag']] ??= 0;
+                $occurrences = $element['attributes']['OCCURRENCES'] ?? 1;
+                $errorCounts[$element['tag']] += $occurrences;
+            }
+        }
+        asort($errorCounts);
+        return $errorCounts;
+    }
+}
diff --git a/tests/Unit/Crypt/AES/InternalTest.php b/tests/Unit/Crypt/AES/EvalTest.php
similarity index 53%
rename from tests/Unit/Crypt/AES/InternalTest.php
rename to tests/Unit/Crypt/AES/EvalTest.php
index b0433e844..b48f24cb0 100644
--- a/tests/Unit/Crypt/AES/InternalTest.php
+++ b/tests/Unit/Crypt/AES/EvalTest.php
@@ -1,16 +1,19 @@
 <?php
+
 /**
  * @author    Andreas Fischer <bantu@phpbb.com>
  * @copyright 2013 Andreas Fischer
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\Crypt\Base;
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt\AES;
 
-class Unit_Crypt_AES_InternalTest extends Unit_Crypt_AES_TestCase
+class EvalTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
-        $this->engine = Base::ENGINE_INTERNAL;
+        $this->engine = 'Eval';
     }
 }
diff --git a/tests/Unit/Crypt/AES/OpenSSLTest.php b/tests/Unit/Crypt/AES/OpenSSLTest.php
index 211a0ea6d..ced59ccd7 100644
--- a/tests/Unit/Crypt/AES/OpenSSLTest.php
+++ b/tests/Unit/Crypt/AES/OpenSSLTest.php
@@ -1,16 +1,19 @@
 <?php
+
 /**
  * @author    Andreas Fischer <bantu@phpbb.com>
  * @copyright 2013 Andreas Fischer
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\Crypt\Base;
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt\AES;
 
-class Unit_Crypt_AES_OpenSSLTest extends Unit_Crypt_AES_TestCase
+class OpenSSLTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
-        $this->engine = Base::ENGINE_OPENSSL;
+        $this->engine = 'OpenSSL';
     }
 }
diff --git a/tests/Unit/Crypt/AES/McryptTest.php b/tests/Unit/Crypt/AES/PurePHPTest.php
similarity index 52%
rename from tests/Unit/Crypt/AES/McryptTest.php
rename to tests/Unit/Crypt/AES/PurePHPTest.php
index ecd203c60..d5b5be0b8 100644
--- a/tests/Unit/Crypt/AES/McryptTest.php
+++ b/tests/Unit/Crypt/AES/PurePHPTest.php
@@ -1,16 +1,19 @@
 <?php
+
 /**
  * @author    Andreas Fischer <bantu@phpbb.com>
  * @copyright 2013 Andreas Fischer
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\Crypt\Base;
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt\AES;
 
-class Unit_Crypt_AES_McryptTest extends Unit_Crypt_AES_TestCase
+class PurePHPTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
-        $this->engine = Base::ENGINE_MCRYPT;
+        $this->engine = 'PHP';
     }
 }
diff --git a/tests/Unit/Crypt/AES/TestCase.php b/tests/Unit/Crypt/AES/TestCase.php
index ba890c788..09a732b76 100644
--- a/tests/Unit/Crypt/AES/TestCase.php
+++ b/tests/Unit/Crypt/AES/TestCase.php
@@ -1,68 +1,67 @@
 <?php
+
 /**
  * @author    Andreas Fischer <bantu@phpbb.com>
  * @copyright 2013 Andreas Fischer
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\Crypt\AES;
-use phpseclib\Crypt\Base;
-use phpseclib\Crypt\Rijndael;
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt\AES;
+
+use phpseclib3\Crypt\AES;
+use phpseclib3\Crypt\Rijndael;
+use phpseclib3\Exception\InconsistentSetupException;
+use phpseclib3\Exception\InsufficientSetupException;
+use phpseclib3\Tests\PhpseclibTestCase;
 
-abstract class Unit_Crypt_AES_TestCase extends PhpseclibTestCase
+abstract class TestCase extends PhpseclibTestCase
 {
     protected $engine;
 
-    private function _checkEngine($aes)
+    private function _checkEngine($aes): void
     {
         if ($aes->getEngine() != $this->engine) {
-            $engine = 'internal';
-            switch ($this->engine) {
-                case Base::ENGINE_OPENSSL:
-                    $engine = 'OpenSSL';
-                    break;
-                case Base::ENGINE_MCRYPT:
-                    $engine = 'mcrypt';
-            }
-            self::markTestSkipped('Unable to initialize ' . $engine . ' engine');
+            self::markTestSkipped('Unable to initialize ' . $this->engine . ' engine');
         }
     }
 
     /**
      * Produces all combinations of test values.
-     *
-     * @return array
      */
-    public function continuousBufferCombos()
+    public static function continuousBufferCombos(): array
     {
-        $modes = array(
-            Base::MODE_CTR,
-            Base::MODE_OFB,
-            Base::MODE_CFB,
-        );
-        $plaintexts = array(
+        $modes = [
+            'ctr',
+            'ofb',
+            'cfb',
+            'cfb8',
+            'ofb8',
+        ];
+        $plaintexts = [
             '',
             '12345678901234567', // https://github.com/phpseclib/phpseclib/issues/39
             "\xDE\xAD\xBE\xAF",
             ':-):-):-):-):-):-)', // https://github.com/phpseclib/phpseclib/pull/43
-        );
-        $ivs = array(
-            '',
-            'test123',
-        );
-        $keys = array(
-            '',
-            ':-8', // https://github.com/phpseclib/phpseclib/pull/43
-            'FOOBARZ',
-        );
-
-        $result = array();
+        ];
+        $ivs = [
+            str_repeat("\0", 16),
+            str_pad('test123', 16, "\0"),
+        ];
+        $keys = [
+            str_repeat("\0", 16),
+            str_pad(':-8', 16, "\0"), // https://github.com/phpseclib/phpseclib/pull/43
+            str_pad('FOOBARZ', 16, "\0"),
+        ];
+
+        $result = [];
 
         foreach ($modes as $mode) {
             foreach ($plaintexts as $plaintext) {
                 foreach ($ivs as $iv) {
                     foreach ($keys as $key) {
-                        $result[] = array($mode, $plaintext, $iv, $key);
+                        $result[] = [$mode, $plaintext, $iv, $key];
                     }
                 }
             }
@@ -74,7 +73,7 @@ public function continuousBufferCombos()
     /**
      * @dataProvider continuousBufferCombos
      */
-    public function testEncryptDecryptWithContinuousBuffer($mode, $plaintext, $iv, $key)
+    public function testEncryptDecryptWithContinuousBuffer($mode, $plaintext, $iv, $key): void
     {
         $aes = new AES($mode);
         $aes->setPreferredEngine($this->engine);
@@ -95,15 +94,16 @@ public function testEncryptDecryptWithContinuousBuffer($mode, $plaintext, $iv, $
     /**
      * @group github451
      */
-    public function testKeyPaddingRijndael()
+    public function testKeyPaddingRijndael(): void
     {
         // this test case is from the following URL:
         // https://web.archive.org/web/20070209120224/http://fp.gladman.plus.com/cryptography_technology/rijndael/aesdvec.zip
 
-        $aes = new Rijndael();
+        $aes = new Rijndael('cbc');
         $aes->setPreferredEngine($this->engine);
         $aes->disablePadding();
         $aes->setKey(pack('H*', '2b7e151628aed2a6abf7158809cf4f3c762e7160')); // 160-bit key. Valid in Rijndael.
+        $aes->setIV(str_repeat("\0", 16));
         //$this->_checkEngine($aes); // should only work in internal mode
         $ciphertext = $aes->encrypt(pack('H*', '3243f6a8885a308d313198a2e0370734'));
         $this->assertEquals($ciphertext, pack('H*', '231d844639b31b412211cfe93712b880'));
@@ -112,14 +112,17 @@ public function testKeyPaddingRijndael()
     /**
      * @group github451
      */
-    public function testKeyPaddingAES()
+    public function testKeyPaddingAES(): void
     {
+        $this->expectException('LengthException');
+
         // same as the above - just with a different ciphertext
 
-        $aes = new AES();
+        $aes = new AES('cbc');
         $aes->setPreferredEngine($this->engine);
         $aes->disablePadding();
-        $aes->setKey(pack('H*', '2b7e151628aed2a6abf7158809cf4f3c762e7160')); // 160-bit key. AES should null pad to 192-bits
+        $aes->setKey(pack('H*', '2b7e151628aed2a6abf7158809cf4f3c762e7160')); // 160-bit key. supported by Rijndael - not AES
+        $aes->setIV(str_repeat("\0", 16));
         $this->_checkEngine($aes);
         $ciphertext = $aes->encrypt(pack('H*', '3243f6a8885a308d313198a2e0370734'));
         $this->assertEquals($ciphertext, pack('H*', 'c109292b173f841b88e0ee49f13db8c0'));
@@ -128,39 +131,41 @@ public function testKeyPaddingAES()
     /**
      * Produces all combinations of test values.
      *
-     * @return array
+     * @return list<array{string, string, array}>
      */
-    public function continuousBufferBatteryCombos()
+    public static function continuousBufferBatteryCombos(): array
     {
-        $modes = array(
-            Base::MODE_CTR,
-            Base::MODE_OFB,
-            Base::MODE_CFB,
-        );
-
-        $combos = array(
-            array(16),
-            array(17),
-            array(1, 16),
-            array(3, 6, 7), // (3 to test the openssl_encrypt call and the buffer creation, 6 to test the exclusive use of the buffer and 7 to test the buffer's exhaustion and recreation)
-            array(15, 4), // (15 to test openssl_encrypt call and buffer creation and 4 to test something that spans multpile bloc
-            array(3, 6, 10, 16), // this is why the strlen check in the buffer-only code was needed
-            array(16, 16), // two full size blocks
-            array(3, 6, 7, 16), // partial block + full size block
-            array(16, 3, 6, 7),
+        $modes = [
+            'ctr',
+            'ofb',
+            'cfb',
+            'cfb8',
+            'ofb8',
+        ];
+
+        $combos = [
+            [16],
+            [17],
+            [1, 16],
+            [3, 6, 7], // (3 to test the openssl_encrypt call and the buffer creation, 6 to test the exclusive use of the buffer and 7 to test the buffer's exhaustion and recreation)
+            [15, 4], // (15 to test openssl_encrypt call and buffer creation and 4 to test something that spans multpile bloc
+            [3, 6, 10, 16], // this is why the strlen check in the buffer-only code was needed
+            [16, 16], // two full size blocks
+            [3, 6, 7, 16], // partial block + full size block
+            [16, 3, 6, 7],
             // a few others just for fun
-            array(32,32),
-            array(31,31),
-            array(17,17),
-            array(99, 99)
-        );
+            [32,32],
+            [31,31],
+            [17,17],
+            [99, 99],
+        ];
 
-        $result = array();
+        $result = [];
 
         foreach ($modes as $mode) {
             foreach ($combos as $combo) {
-                foreach (array('encrypt', 'decrypt') as $op) {
-                    $result[] = array($op, $mode, $combo);
+                foreach (['encrypt', 'decrypt'] as $op) {
+                    $result[] = [$op, $mode, $combo];
                 }
             }
         }
@@ -168,10 +173,18 @@ public function continuousBufferBatteryCombos()
         return $result;
     }
 
+    /**
+     * @return array<array{string, string, array}>
+     */
+    public function continuousBufferBatteryCombosWithoutSingleCombos(): array
+    {
+        return array_filter(self::continuousBufferBatteryCombos(), fn (array $continuousBufferBatteryCombo) => count($continuousBufferBatteryCombo[2]) > 1);
+    }
+
     /**
      * @dataProvider continuousBufferBatteryCombos
      */
-    public function testContinuousBufferBattery($op, $mode, $test)
+    public function testContinuousBufferBattery($op, $mode, $test): void
     {
         $iv = str_repeat('x', 16);
         $key = str_repeat('a', 16);
@@ -187,7 +200,7 @@ public function testContinuousBufferBattery($op, $mode, $test)
         $result = '';
         foreach ($test as $len) {
             $temp = str_repeat('d', $len);
-            $str.= $temp;
+            $str .= $temp;
         }
 
         $c1 = $aes->$op($str);
@@ -198,14 +211,12 @@ public function testContinuousBufferBattery($op, $mode, $test)
         $aes->setKey($key);
         $aes->setIV($iv);
 
-        if (!$this->_checkEngine($aes)) {
-            return;
-        }
+        $this->_checkEngine($aes);
 
         foreach ($test as $len) {
             $temp = str_repeat('d', $len);
             $output = $aes->$op($temp);
-            $result.= $output;
+            $result .= $output;
         }
 
         $c2 = $result;
@@ -216,14 +227,10 @@ public function testContinuousBufferBattery($op, $mode, $test)
     /**
      * Pretty much the same as testContinuousBufferBattery with the caveat that continuous mode is not enabled.
      *
-     * @dataProvider continuousBufferBatteryCombos
+     * @dataProvider continuousBufferBatteryCombosWithoutSingleCombos
      */
-    public function testNonContinuousBufferBattery($op, $mode, $test)
+    public function testNonContinuousBufferBattery($op, $mode, $test): void
     {
-        if (count($test) == 1) {
-            return;
-        }
-
         $iv = str_repeat('x', 16);
         $key = str_repeat('a', 16);
 
@@ -238,7 +245,7 @@ public function testNonContinuousBufferBattery($op, $mode, $test)
         $result = '';
         foreach ($test as $len) {
             $temp = str_repeat('d', $len);
-            $str.= $temp;
+            $str .= $temp;
         }
 
         $c1 = $aes->$op($str);
@@ -253,7 +260,7 @@ public function testNonContinuousBufferBattery($op, $mode, $test)
         foreach ($test as $len) {
             $temp = str_repeat('d', $len);
             $output = $aes->$op($temp);
-            $result.= $output;
+            $result .= $output;
         }
 
         $c2 = $result;
@@ -262,9 +269,9 @@ public function testNonContinuousBufferBattery($op, $mode, $test)
     }
 
     // from http://csrc.nist.gov/groups/STM/cavp/documents/aes/AESAVS.pdf#page=16
-    public function testGFSBox128()
+    public function testGFSBox128(): void
     {
-        $aes = new AES();
+        $aes = new AES('cbc');
 
         $aes->setKey(pack('H*', '00000000000000000000000000000000'));
         $aes->setIV(pack('H*', '00000000000000000000000000000000'));
@@ -289,9 +296,9 @@ public function testGFSBox128()
         $this->assertSame($result, '08a4e2efec8a8e3312ca7460b9040bbf');
     }
 
-    public function testGFSBox192()
+    public function testGFSBox192(): void
     {
-        $aes = new AES();
+        $aes = new AES('cbc');
 
         $aes->setKey(pack('H*', '000000000000000000000000000000000000000000000000'));
         $aes->setIV(pack('H*', '00000000000000000000000000000000'));
@@ -314,9 +321,9 @@ public function testGFSBox192()
         $this->assertSame($result, '067cd9d3749207791841562507fa9626');
     }
 
-    public function testGFSBox256()
+    public function testGFSBox256(): void
     {
-        $aes = new AES();
+        $aes = new AES('cbc');
 
         $aes->setKey(pack('H*', '00000000000000000000000000000000' . '00000000000000000000000000000000'));
         $aes->setIV(pack('H*', '00000000000000000000000000000000'));
@@ -337,38 +344,86 @@ public function testGFSBox256()
         $this->assertSame($result, '1bc704f1bce135ceb810341b216d7abe');
     }
 
-    public function testGetKeyLengthDefault()
+    public function testGetKeyLengthDefault(): void
     {
-        $aes = new AES();
+        $aes = new AES('cbc');
         $this->assertSame($aes->getKeyLength(), 128);
     }
 
-    public function testGetKeyLengthWith192BitKey()
+    public function testGetKeyLengthWith192BitKey(): void
     {
-        $aes = new AES();
+        $aes = new AES('cbc');
         $aes->setKey(str_repeat('a', 24));
         $this->assertSame($aes->getKeyLength(), 192);
     }
 
-    public function testSetKeyLengthWithLargerKey()
+    public function testSetKeyLengthWithLargerKey(): void
     {
-        $aes = new AES();
+        $this->expectException(InconsistentSetupException::class);
+
+        $aes = new AES('cbc');
         $aes->setKeyLength(128);
         $aes->setKey(str_repeat('a', 24));
+        $aes->setIV(str_repeat("\0", 16));
         $this->assertSame($aes->getKeyLength(), 128);
         $ciphertext = bin2hex($aes->encrypt('a'));
         $this->assertSame($ciphertext, '82b7b068dfc60ed2a46893b69fecd6c2');
         $this->assertSame($aes->getKeyLength(), 128);
     }
 
-    public function testSetKeyLengthWithSmallerKey()
+    public function testSetKeyLengthWithSmallerKey(): void
     {
-        $aes = new AES();
+        $this->expectException(InconsistentSetupException::class);
+
+        $aes = new AES('cbc');
         $aes->setKeyLength(256);
         $aes->setKey(str_repeat('a', 16));
+        $aes->setIV(str_repeat("\0", 16));
         $this->assertSame($aes->getKeyLength(), 256);
         $ciphertext = bin2hex($aes->encrypt('a'));
         $this->assertSame($ciphertext, 'fd4250c0d234aa7e1aa592820aa8406b');
         $this->assertSame($aes->getKeyLength(), 256);
     }
+
+    /**
+     * @group github938
+     */
+    public function testContinuousBuffer(): void
+    {
+        $aes = new AES('cbc');
+        $aes->disablePadding();
+        $aes->enableContinuousBuffer();
+        $aes->setIV(pack('H*', '0457bdb4a6712986688349a29eb82535'));
+        $aes->setKey(pack('H*', '00d596e2c8189b2592fac358e7396ad2'));
+        $aes->decrypt(pack('H*', '9aa234ea7c750a8109a0f32d768b964e'));
+        $plaintext = $aes->decrypt(pack('H*', '0457bdb4a6712986688349a29eb82535'));
+        $expected = pack('H*', '6572617574689e1be8d2d8d43c594cf3');
+        $this->assertSame($plaintext, $expected);
+    }
+
+    public function testECBDecrypt(): void
+    {
+        $aes = new AES('ecb');
+        $aes->setPreferredEngine($this->engine);
+        $aes->setKey(str_repeat('x', 16));
+
+        $this->_checkEngine($aes);
+
+        $plaintext = str_repeat('a', 16);
+
+        $actual = $aes->decrypt($aes->encrypt($plaintext));
+
+        $this->assertEquals($plaintext, $actual);
+    }
+
+    public function testNoKey(): void
+    {
+        $this->expectException(InsufficientSetupException::class);
+
+        $aes = new AES('cbc');
+        $aes->setPreferredEngine($this->engine);
+        $aes->setIV(str_repeat('x', 16));
+
+        $aes->encrypt(str_repeat('a', 16));
+    }
 }
diff --git a/tests/Unit/Crypt/BlowfishTest.php b/tests/Unit/Crypt/BlowfishTest.php
index bf15feb8a..a552950d3 100644
--- a/tests/Unit/Crypt/BlowfishTest.php
+++ b/tests/Unit/Crypt/BlowfishTest.php
@@ -1,67 +1,73 @@
 <?php
+
 /**
  * @author    Andreas Fischer <bantu@phpbb.com>
  * @copyright MMXIII Andreas Fischer
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\Crypt\Base;
-use phpseclib\Crypt\Blowfish;
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt;
+
+use phpseclib3\Crypt\Blowfish;
+use phpseclib3\Crypt\Random;
+use phpseclib3\Tests\PhpseclibTestCase;
 
-class Unit_Crypt_BlowfishTest extends PhpseclibTestCase
+class BlowfishTest extends PhpseclibTestCase
 {
-    public function engineVectors()
+    public static function engineVectors(): array
     {
-        $engines = array(
-            Base::ENGINE_INTERNAL => 'internal',
-            Base::ENGINE_MCRYPT => 'mcrypt',
-            Base::ENGINE_OPENSSL => 'OpenSSL',
-        );
+        $engines = [
+            'PHP',
+            'Eval',
+            'OpenSSL',
+        ];
 
         // tests from https://www.schneier.com/code/vectors.txt
-        $tests = array(
+        $tests = [
             // key, plaintext, ciphertext
-            array(pack('H*', '0000000000000000'), pack('H*', '0000000000000000'), pack('H*', '4EF997456198DD78')),
-            array(pack('H*', 'FFFFFFFFFFFFFFFF'), pack('H*', 'FFFFFFFFFFFFFFFF'), pack('H*', '51866FD5B85ECB8A')),
-            array(pack('H*', '3000000000000000'), pack('H*', '1000000000000001'), pack('H*', '7D856F9A613063F2')),
-            array(pack('H*', '1111111111111111'), pack('H*', '1111111111111111'), pack('H*', '2466DD878B963C9D')),
-            array(pack('H*', '0123456789ABCDEF'), pack('H*', '1111111111111111'), pack('H*', '61F9C3802281B096')),
-            array(pack('H*', '1111111111111111'), pack('H*', '0123456789ABCDEF'), pack('H*', '7D0CC630AFDA1EC7')),
-            array(pack('H*', '0000000000000000'), pack('H*', '0000000000000000'), pack('H*', '4EF997456198DD78')),
-            array(pack('H*', 'FEDCBA9876543210'), pack('H*', '0123456789ABCDEF'), pack('H*', '0ACEAB0FC6A0A28D')),
-            array(pack('H*', '7CA110454A1A6E57'), pack('H*', '01A1D6D039776742'), pack('H*', '59C68245EB05282B')),
-            array(pack('H*', '0131D9619DC1376E'), pack('H*', '5CD54CA83DEF57DA'), pack('H*', 'B1B8CC0B250F09A0')),
-            array(pack('H*', '07A1133E4A0B2686'), pack('H*', '0248D43806F67172'), pack('H*', '1730E5778BEA1DA4')),
-            array(pack('H*', '3849674C2602319E'), pack('H*', '51454B582DDF440A'), pack('H*', 'A25E7856CF2651EB')),
-            array(pack('H*', '04B915BA43FEB5B6'), pack('H*', '42FD443059577FA2'), pack('H*', '353882B109CE8F1A')),
-            array(pack('H*', '0113B970FD34F2CE'), pack('H*', '059B5E0851CF143A'), pack('H*', '48F4D0884C379918')),
-            array(pack('H*', '0170F175468FB5E6'), pack('H*', '0756D8E0774761D2'), pack('H*', '432193B78951FC98')),
-            array(pack('H*', '43297FAD38E373FE'), pack('H*', '762514B829BF486A'), pack('H*', '13F04154D69D1AE5')),
-            array(pack('H*', '07A7137045DA2A16'), pack('H*', '3BDD119049372802'), pack('H*', '2EEDDA93FFD39C79')),
-            array(pack('H*', '04689104C2FD3B2F'), pack('H*', '26955F6835AF609A'), pack('H*', 'D887E0393C2DA6E3')),
-            array(pack('H*', '37D06BB516CB7546'), pack('H*', '164D5E404F275232'), pack('H*', '5F99D04F5B163969')),
-            array(pack('H*', '1F08260D1AC2465E'), pack('H*', '6B056E18759F5CCA'), pack('H*', '4A057A3B24D3977B')),
-            array(pack('H*', '584023641ABA6176'), pack('H*', '004BD6EF09176062'), pack('H*', '452031C1E4FADA8E')),
-            array(pack('H*', '025816164629B007'), pack('H*', '480D39006EE762F2'), pack('H*', '7555AE39F59B87BD')),
-            array(pack('H*', '49793EBC79B3258F'), pack('H*', '437540C8698F3CFA'), pack('H*', '53C55F9CB49FC019')),
-            array(pack('H*', '4FB05E1515AB73A7'), pack('H*', '072D43A077075292'), pack('H*', '7A8E7BFA937E89A3')),
-            array(pack('H*', '49E95D6D4CA229BF'), pack('H*', '02FE55778117F12A'), pack('H*', 'CF9C5D7A4986ADB5')),
-            array(pack('H*', '018310DC409B26D6'), pack('H*', '1D9D5C5018F728C2'), pack('H*', 'D1ABB290658BC778')),
-            array(pack('H*', '1C587F1C13924FEF'), pack('H*', '305532286D6F295A'), pack('H*', '55CB3774D13EF201')),
-            array(pack('H*', '0101010101010101'), pack('H*', '0123456789ABCDEF'), pack('H*', 'FA34EC4847B268B2')),
-            array(pack('H*', '1F1F1F1F0E0E0E0E'), pack('H*', '0123456789ABCDEF'), pack('H*', 'A790795108EA3CAE')),
-            array(pack('H*', 'E0FEE0FEF1FEF1FE'), pack('H*', '0123456789ABCDEF'), pack('H*', 'C39E072D9FAC631D')),
-            array(pack('H*', '0000000000000000'), pack('H*', 'FFFFFFFFFFFFFFFF'), pack('H*', '014933E0CDAFF6E4')),
-            array(pack('H*', 'FFFFFFFFFFFFFFFF'), pack('H*', '0000000000000000'), pack('H*', 'F21E9A77B71C49BC')),
-            array(pack('H*', '0123456789ABCDEF'), pack('H*', '0000000000000000'), pack('H*', '245946885754369A')),
-            array(pack('H*', 'FEDCBA9876543210'), pack('H*', 'FFFFFFFFFFFFFFFF'), pack('H*', '6B5C5A9C5D9E0A5A'))
-        );
-
-        $result = array();
-
-        foreach ($engines as $engine => $engineName) {
+            [pack('H*', '0000000000000000'), pack('H*', '0000000000000000'), pack('H*', '4EF997456198DD78')],
+            [pack('H*', 'FFFFFFFFFFFFFFFF'), pack('H*', 'FFFFFFFFFFFFFFFF'), pack('H*', '51866FD5B85ECB8A')],
+            [pack('H*', '3000000000000000'), pack('H*', '1000000000000001'), pack('H*', '7D856F9A613063F2')],
+            [pack('H*', '1111111111111111'), pack('H*', '1111111111111111'), pack('H*', '2466DD878B963C9D')],
+            [pack('H*', '0123456789ABCDEF'), pack('H*', '1111111111111111'), pack('H*', '61F9C3802281B096')],
+            [pack('H*', '1111111111111111'), pack('H*', '0123456789ABCDEF'), pack('H*', '7D0CC630AFDA1EC7')],
+            [pack('H*', '0000000000000000'), pack('H*', '0000000000000000'), pack('H*', '4EF997456198DD78')],
+            [pack('H*', 'FEDCBA9876543210'), pack('H*', '0123456789ABCDEF'), pack('H*', '0ACEAB0FC6A0A28D')],
+            [pack('H*', '7CA110454A1A6E57'), pack('H*', '01A1D6D039776742'), pack('H*', '59C68245EB05282B')],
+            [pack('H*', '0131D9619DC1376E'), pack('H*', '5CD54CA83DEF57DA'), pack('H*', 'B1B8CC0B250F09A0')],
+            [pack('H*', '07A1133E4A0B2686'), pack('H*', '0248D43806F67172'), pack('H*', '1730E5778BEA1DA4')],
+            [pack('H*', '3849674C2602319E'), pack('H*', '51454B582DDF440A'), pack('H*', 'A25E7856CF2651EB')],
+            [pack('H*', '04B915BA43FEB5B6'), pack('H*', '42FD443059577FA2'), pack('H*', '353882B109CE8F1A')],
+            [pack('H*', '0113B970FD34F2CE'), pack('H*', '059B5E0851CF143A'), pack('H*', '48F4D0884C379918')],
+            [pack('H*', '0170F175468FB5E6'), pack('H*', '0756D8E0774761D2'), pack('H*', '432193B78951FC98')],
+            [pack('H*', '43297FAD38E373FE'), pack('H*', '762514B829BF486A'), pack('H*', '13F04154D69D1AE5')],
+            [pack('H*', '07A7137045DA2A16'), pack('H*', '3BDD119049372802'), pack('H*', '2EEDDA93FFD39C79')],
+            [pack('H*', '04689104C2FD3B2F'), pack('H*', '26955F6835AF609A'), pack('H*', 'D887E0393C2DA6E3')],
+            [pack('H*', '37D06BB516CB7546'), pack('H*', '164D5E404F275232'), pack('H*', '5F99D04F5B163969')],
+            [pack('H*', '1F08260D1AC2465E'), pack('H*', '6B056E18759F5CCA'), pack('H*', '4A057A3B24D3977B')],
+            [pack('H*', '584023641ABA6176'), pack('H*', '004BD6EF09176062'), pack('H*', '452031C1E4FADA8E')],
+            [pack('H*', '025816164629B007'), pack('H*', '480D39006EE762F2'), pack('H*', '7555AE39F59B87BD')],
+            [pack('H*', '49793EBC79B3258F'), pack('H*', '437540C8698F3CFA'), pack('H*', '53C55F9CB49FC019')],
+            [pack('H*', '4FB05E1515AB73A7'), pack('H*', '072D43A077075292'), pack('H*', '7A8E7BFA937E89A3')],
+            [pack('H*', '49E95D6D4CA229BF'), pack('H*', '02FE55778117F12A'), pack('H*', 'CF9C5D7A4986ADB5')],
+            [pack('H*', '018310DC409B26D6'), pack('H*', '1D9D5C5018F728C2'), pack('H*', 'D1ABB290658BC778')],
+            [pack('H*', '1C587F1C13924FEF'), pack('H*', '305532286D6F295A'), pack('H*', '55CB3774D13EF201')],
+            [pack('H*', '0101010101010101'), pack('H*', '0123456789ABCDEF'), pack('H*', 'FA34EC4847B268B2')],
+            [pack('H*', '1F1F1F1F0E0E0E0E'), pack('H*', '0123456789ABCDEF'), pack('H*', 'A790795108EA3CAE')],
+            [pack('H*', 'E0FEE0FEF1FEF1FE'), pack('H*', '0123456789ABCDEF'), pack('H*', 'C39E072D9FAC631D')],
+            [pack('H*', '0000000000000000'), pack('H*', 'FFFFFFFFFFFFFFFF'), pack('H*', '014933E0CDAFF6E4')],
+            [pack('H*', 'FFFFFFFFFFFFFFFF'), pack('H*', '0000000000000000'), pack('H*', 'F21E9A77B71C49BC')],
+            [pack('H*', '0123456789ABCDEF'), pack('H*', '0000000000000000'), pack('H*', '245946885754369A')],
+            [pack('H*', 'FEDCBA9876543210'), pack('H*', 'FFFFFFFFFFFFFFFF'), pack('H*', '6B5C5A9C5D9E0A5A')],
+        ];
+
+        $result = [];
+
+        foreach ($engines as $engine) {
             foreach ($tests as $test) {
-                $result[] = array($engine, $engineName, $test[0], $test[1], $test[2]);
+                $result[] = [$engine, $test[0], $test[1], $test[2]];
             }
         }
 
@@ -71,17 +77,55 @@ public function engineVectors()
     /**
      * @dataProvider engineVectors
      */
-    public function testVectors($engine, $engineName, $key, $plaintext, $expected)
+    public function testVectors($engine, $key, $plaintext, $expected): void
     {
-        $bf = new Blowfish();
+        $bf = new Blowfish('cbc');
         $bf->setKey($key);
+        $bf->setIV(str_repeat("\0", $bf->getBlockLength() >> 3));
+
         if (!$bf->isValidEngine($engine)) {
-            self::markTestSkipped('Unable to initialize ' . $engineName . ' engine');
+            self::markTestSkipped("Unable to initialize $engine engine");
         }
         $bf->setPreferredEngine($engine);
         $bf->disablePadding();
         $result = $bf->encrypt($plaintext);
         $plaintext = bin2hex($plaintext);
-        $this->assertEquals($result, $expected, "Failed asserting that $plaintext yielded expected output in $engineName engine");
+        $this->assertEquals($result, $expected, "Failed asserting that $plaintext yielded expected output in $engine engine");
+    }
+
+    public function testKeySizes(): void
+    {
+        $objects = $engines = [];
+        $temp = new Blowfish('ctr');
+        $temp->setPreferredEngine('PHP');
+        $objects[] = $temp;
+        $engines[] = 'internal';
+
+        if ($temp->isValidEngine('OpenSSL')) {
+            $temp = new Blowfish('ctr');
+            $temp->setPreferredEngine('OpenSSL');
+            $objects[] = $temp;
+            $engines[] = 'OpenSSL';
+        }
+
+        if (count($objects) < 2) {
+            self::markTestSkipped('Unable to initialize two or more engines');
+        }
+
+        for ($i = 0; $i < count($objects); $i++) {
+            $objects[$i]->setIV(str_repeat('x', $objects[$i]->getBlockLength() >> 3));
+        }
+
+        $plaintext = str_repeat('.', 100);
+
+        for ($keyLen = 4; $keyLen <= 56; $keyLen++) {
+            $key = Random::string($keyLen);
+            $objects[0]->setKey($key);
+            $ref = $objects[0]->encrypt($plaintext);
+            for ($i = 1; $i < count($objects); $i++) {
+                $objects[$i]->setKey($key);
+                $this->assertEquals($ref, $objects[$i]->encrypt($plaintext), "Failed asserting that {$engines[$i]} yields the same output as the internal engine with a key size of $keyLen");
+            }
+        }
     }
 }
diff --git a/tests/Unit/Crypt/ChaCha20Test.php b/tests/Unit/Crypt/ChaCha20Test.php
new file mode 100644
index 000000000..357de9f57
--- /dev/null
+++ b/tests/Unit/Crypt/ChaCha20Test.php
@@ -0,0 +1,224 @@
+<?php
+
+/**
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2014 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt;
+
+use phpseclib3\Crypt\ChaCha20;
+use phpseclib3\Tests\PhpseclibTestCase;
+
+class ChaCha20Test extends PhpseclibTestCase
+{
+    // see https://tools.ietf.org/html/rfc8439#section-2.3.2
+    public function test232(): void
+    {
+        $key = implode('', range("\00", "\x1f"));
+
+        $nonce = '00:00:00:09:00:00:00:4a:00:00:00:00';
+        $nonce = str_replace(':', '', $nonce);
+        $nonce = pack('H*', $nonce);
+
+        $expected = '10 f1 e7 e4 d1 3b 59 15 50 0f dd 1f a3 20 71 c4' .
+                    'c7 d1 f4 c7 33 c0 68 03 04 22 aa 9a c3 d4 6c 4e' .
+                    'd2 82 64 46 07 9f aa 09 14 c2 d7 05 d9 8b 02 a2' .
+                    'b5 12 9c d1 de 16 4e b9 cb d0 83 e8 a2 50 3c 4e';
+        $expected = str_replace(' ', '', $expected);
+        $expected = pack('H*', $expected);
+
+        $engines = ['PHP', 'OpenSSL', 'libsodium'];
+        foreach ($engines as $engine) {
+            $c = new ChaCha20();
+            $c->setKey($key);
+            $c->setNonce($nonce);
+            $c->setCounter(1);
+            $c->setPreferredEngine($engine);
+            if ($c->getEngine() != $engine) {
+                continue;
+            }
+            $result = $c->encrypt(str_repeat("\0", 64));
+            $this->assertSame($expected, $result, "Failed asserting that ciphertext matches expected value with $engine engine");
+        }
+    }
+
+    // see https://tools.ietf.org/html/rfc8439#section-2.4.2
+    public function test242(): void
+    {
+        $key = implode('', range("\00", "\x1f"));
+
+        $nonce = '00:00:00:00:00:00:00:4a:00:00:00:00';
+        $nonce = str_replace(':', '', $nonce);
+        $nonce = pack('H*', $nonce);
+
+        $plaintext = 'Ladies and Gentlemen of the class of \'99: If I could offer you only one tip for the future,' .
+                     ' sunscreen would be it.';
+
+        $expected = '6e 2e 35 9a 25 68 f9 80 41 ba 07 28 dd 0d 69 81' .
+                    'e9 7e 7a ec 1d 43 60 c2 0a 27 af cc fd 9f ae 0b' .
+                    'f9 1b 65 c5 52 47 33 ab 8f 59 3d ab cd 62 b3 57' .
+                    '16 39 d6 24 e6 51 52 ab 8f 53 0c 35 9f 08 61 d8' .
+                    '07 ca 0d bf 50 0d 6a 61 56 a3 8e 08 8a 22 b6 5e' .
+                    '52 bc 51 4d 16 cc f8 06 81 8c e9 1a b7 79 37 36' .
+                    '5a f9 0b bf 74 a3 5b e6 b4 0b 8e ed f2 78 5e 42' .
+                    '87 4d';
+        $expected = str_replace(' ', '', $expected);
+        $expected = pack('H*', $expected);
+
+        $engines = ['PHP', 'OpenSSL', 'libsodium'];
+        foreach ($engines as $engine) {
+            $c = new ChaCha20();
+            $c->setKey($key);
+            $c->setNonce($nonce);
+            $c->setCounter(1);
+            $c->setPreferredEngine($engine);
+            if ($c->getEngine() != $engine) {
+                continue;
+            }
+            $result = $c->encrypt($plaintext);
+            $this->assertSame($expected, $result, "Failed asserting that ciphertext matches expected value with $engine engine");
+        }
+    }
+
+    // see https://tools.ietf.org/html/rfc8439#section-2.5.2
+    public function test252(): void
+    {
+        $key = '85:d6:be:78:57:55:6d:33:7f:44:52:fe:42:d5:06:a8:01:0' .
+               '3:80:8a:fb:0d:b2:fd:4a:bf:f6:af:41:49:f5:1b';
+        $key = str_replace(':', '', $key);
+        $key = pack('H*', $key);
+
+        $plaintext = 'Cryptographic Forum Research Group';
+
+        $expected = 'a8:06:1d:c1:30:51:36:c6:c2:2b:8b:af:0c:01:27:a9';
+        $expected = str_replace(':', '', $expected);
+        $expected = pack('H*', $expected);
+
+        $c = new ChaCha20();
+        $c->setPoly1305Key($key);
+        $r = new \ReflectionClass($c::class);
+        // this unit test is testing Poly1305 independent of ChaCha20, which phpseclib doesn't
+        // really support, hence this hackish approach
+        $m = $r->getMethod('poly1305');
+        $m->setAccessible(true);
+        $result = $m->invokeArgs($c, [$plaintext]);
+
+        $this->assertSame($expected, $result, 'Failed asserting that poly1305 matches expected value');
+    }
+
+    // see https://tools.ietf.org/html/rfc8439#section-2.6.2
+    public function test262(): void
+    {
+        $key = implode('', range("\x80", "\x9f"));
+
+        $nonce = '00 00 00 00 00 01 02 03 04 05 06 07';
+        $nonce = str_replace(' ', '', $nonce);
+        $nonce = pack('H*', $nonce);
+
+        $expected = '8a d5 a0 8b 90 5f 81 cc 81 50 40 27 4a b2 94 71' .
+                    'a8 33 b6 37 e3 fd 0d a5 08 db b8 e2 fd d1 a6 46';
+        $expected = str_replace(' ', '', $expected);
+        $expected = pack('H*', $expected);
+
+        $c = new ChaCha20();
+        $c->setKey($key);
+        $c->setNonce($nonce);
+
+        $r = new \ReflectionClass($c::class);
+        $m = $r->getMethod('createPoly1305Key');
+        $m->setAccessible(true);
+        $result = $m->invoke($c);
+
+        $p = $r->getProperty('poly1305Key');
+        $p->setAccessible(true);
+        $actual = $p->getValue($c);
+
+        $this->assertSame($expected, $actual, 'Failed asserting that the poly1305 key is what it ought to be');
+    }
+
+    // https://tools.ietf.org/html/rfc8439#section-2.8.2
+    public function test282(): void
+    {
+        $key = implode('', range("\x80", "\x9f"));
+
+        $nonce = "\x07\0\0\0" . "\x40\x41\x42\x43\x44\x45\x46\x47";
+
+        $plaintext = 'Ladies and Gentlemen of the class of \'99: If I could offer you only one tip for the future,' .
+                     ' sunscreen would be it.';
+
+        $aad = '50 51 52 53 c0 c1 c2 c3 c4 c5 c6 c7';
+        $aad = str_replace(' ', '', $aad);
+        $aad = pack('H*', $aad);
+
+        $expected = 'd3 1a 8d 34 64 8e 60 db 7b 86 af bc 53 ef 7e c2' .
+                    'a4 ad ed 51 29 6e 08 fe a9 e2 b5 a7 36 ee 62 d6' .
+                    '3d be a4 5e 8c a9 67 12 82 fa fb 69 da 92 72 8b' .
+                    '1a 71 de 0a 9e 06 0b 29 05 d6 a5 b6 7e cd 3b 36' .
+                    '92 dd bd 7f 2d 77 8b 8c 98 03 ae e3 28 09 1b 58' .
+                    'fa b3 24 e4 fa d6 75 94 55 85 80 8b 48 31 d7 bc' .
+                    '3f f4 de f0 8e 4b 7a 9d e5 76 d2 65 86 ce c6 4b' .
+                    '61 16';
+        $expected = str_replace(' ', '', $expected);
+        $expected = pack('H*', $expected);
+
+        $tag = '1a:e1:0b:59:4f:09:e2:6a:7e:90:2e:cb:d0:60:06:91';
+        $tag = str_replace(':', '', $tag);
+        $tag = pack('H*', $tag);
+
+        $engines = ['PHP', 'OpenSSL', 'libsodium'];
+        foreach ($engines as $engine) {
+            $c = new ChaCha20();
+            $c->enablePoly1305();
+            $c->setKey($key);
+            $c->setNonce($nonce);
+            $c->setAAD($aad);
+            $c->setPreferredEngine($engine);
+            if ($c->getEngine() != $engine) {
+                continue;
+            }
+            $result = $c->encrypt($plaintext);
+            $this->assertSame($expected, $result, "Failed asserting that ciphertext matches expected value with $engine engine");
+            $this->assertSame($tag, $c->getTag(), "Failed asserting that the tag matches the expected value with $engine engine");
+        }
+    }
+
+    public function testContinuousBuffer(): void
+    {
+        $key = str_repeat("\0", 16);
+        $nonce = str_repeat("\0", 8);
+
+        $partitions = [1, 63, 70];
+
+        $plaintext = str_repeat("\0", array_sum($partitions));
+
+        $engines = ['PHP', 'OpenSSL', 'libsodium'];
+        foreach ($engines as $engine) {
+            $c = new ChaCha20();
+            $c->setKey($key);
+            $c->setNonce($nonce);
+            $c->setPreferredEngine($engine);
+
+            $c2 = new ChaCha20();
+            $c2->setKey($key);
+            $c2->setNonce($nonce);
+            $c2->setPreferredEngine($engine);
+            $c2->enableContinuousBuffer();
+
+            if ($c2->getEngine() != $engine) {
+                continue;
+            }
+
+            $p1 = $c->encrypt($plaintext);
+            $p2 = '';
+            foreach ($partitions as $partition) {
+                $p2 .= $c2->encrypt(str_repeat("\0", $partition));
+            }
+
+            $this->assertSame($p1, $p2, "Failed asserting that ciphertext matches expected value with $engine engine");
+        }
+    }
+}
diff --git a/tests/Unit/Crypt/DESTest.php b/tests/Unit/Crypt/DESTest.php
deleted file mode 100644
index a1fbea6fb..000000000
--- a/tests/Unit/Crypt/DESTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * @author    Andreas Fischer <bantu@phpbb.com>
- * @copyright MMXIII Andreas Fischer
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- */
-
-use phpseclib\Crypt\Base;
-use phpseclib\Crypt\DES;
-
-// the AES tests establish the correctness of the modes of operation. this test is inteded to establish the consistency of
-// key and iv padding between the multiple engines
-class Unit_Crypt_DESTest extends PhpseclibTestCase
-{
-    public function testEncryptPadding()
-    {
-        $des = new DES(Base::MODE_CBC);
-        $des->setKey('d');
-        $des->setIV('d');
-
-        $des->setPreferredEngine(Base::ENGINE_INTERNAL);
-
-        $result = pack('H*', '3e7613642049af1e');
-
-        $internal = $des->encrypt('d');
-        $this->assertEquals($result, $internal, 'Failed asserting that the internal engine produced the correct result');
-
-        $des->setPreferredEngine(Base::ENGINE_MCRYPT);
-        if ($des->getEngine() == Base::ENGINE_MCRYPT) {
-            $mcrypt = $des->encrypt('d');
-            $this->assertEquals($result, $mcrypt, 'Failed asserting that the mcrypt engine produced the correct result');
-        } else {
-            self::markTestSkipped('Unable to initialize mcrypt engine');
-        }
-
-        $des->setPreferredEngine(Base::ENGINE_OPENSSL);
-        if ($des->getEngine() == Base::ENGINE_OPENSSL) {
-            $openssl = $des->encrypt('d');
-            $this->assertEquals($result, $openssl,  'Failed asserting that the OpenSSL engine produced the correct result');
-        } else {
-            self::markTestSkipped('Unable to initialize OpenSSL engine');
-        }
-    }
-
-    // phpseclib null pads ciphertext's if they're not long enough and you're in ecb / cbc mode. this silent failure mode is consistent
-    // with mcrypt's behavior. maybe throwing an exception would be better but whatever. this test is more intended to establish consistent
-    // behavior between the various engine's
-    public function testDecryptPadding()
-    {
-        $des = new DES(Base::MODE_CBC);
-        $des->disablePadding();
-        // when the key and iv are not specified they should be null padded
-        //$des->setKey();
-        //$des->setIV();
-
-        $des->setPreferredEngine(Base::ENGINE_INTERNAL);
-        $internal = $des->decrypt('d');
-
-        $result = pack('H*', '79b305d1ce555221');
-        $this->assertEquals($result, $internal, 'Failed asserting that the internal engine produced the correct result');
-
-        $des->setPreferredEngine(Base::ENGINE_MCRYPT);
-        if ($des->getEngine() == Base::ENGINE_MCRYPT) {
-            $mcrypt = $des->decrypt('d');
-            $this->assertEquals($result, $mcrypt, 'Failed asserting that the mcrypt engine produced the correct result');
-        } else {
-            self::markTestSkipped('Unable to initialize mcrypt engine');
-        }
-
-        $des->setPreferredEngine(Base::ENGINE_OPENSSL);
-        if ($des->getEngine() == Base::ENGINE_OPENSSL) {
-            $openssl = $des->decrypt('d');
-            $this->assertEquals($result, $openssl,  'Failed asserting that the OpenSSL engine produced the correct result');
-        } else {
-            self::markTestSkipped('Unable to initialize OpenSSL engine');
-        }
-    }
-}
diff --git a/tests/Unit/Crypt/DHTest.php b/tests/Unit/Crypt/DHTest.php
new file mode 100644
index 000000000..070d191c4
--- /dev/null
+++ b/tests/Unit/Crypt/DHTest.php
@@ -0,0 +1,275 @@
+<?php
+
+/**
+ * @author    Andreas Fischer <bantu@phpbb.com>
+ * @copyright 2013 Andreas Fischer
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt;
+
+use phpseclib3\Crypt\AES;
+use phpseclib3\Crypt\DH;
+use phpseclib3\Crypt\DH\Parameters;
+use phpseclib3\Crypt\DH\PrivateKey;
+use phpseclib3\Crypt\DH\PublicKey;
+use phpseclib3\Crypt\EC;
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Tests\PhpseclibTestCase;
+
+class DHTest extends PhpseclibTestCase
+{
+    public function testParametersWithString(): void
+    {
+        $a = DH::createParameters('diffie-hellman-group1-sha1');
+        $a = str_replace("\r\n", "\n", trim($a->__toString()));
+        $b = str_replace("\r\n", "\n", '-----BEGIN DH PARAMETERS-----
+MIGHAoGBAP//////////yQ/aoiFowjTExmKLgNwc0SkCTgiKZ8x0Agu+pjsTmyJR
+Sgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHCReSFtXZiXn7G9ExC6aY37WsL
+/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7OZTgf//////////AgEC
+-----END DH PARAMETERS-----');
+        $this->assertSame($b, "$a");
+    }
+
+    public function testParametersWithInteger(): void
+    {
+        $a = DH::createParameters(512);
+        $this->assertIsString("$a");
+    }
+
+    public function testParametersWithBigIntegers(): void
+    {
+        $prime = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
+                 '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
+                 '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
+                 'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381FFFFFFFFFFFFFFFF';
+        $prime = new BigInteger($prime, 16);
+        $base = new BigInteger(2);
+        $a = DH::createParameters($prime, $base);
+        $a = str_replace("\r\n", "\n", trim($a->__toString()));
+        $b = str_replace("\r\n", "\n", '-----BEGIN DH PARAMETERS-----
+MIGHAoGBAP//////////yQ/aoiFowjTExmKLgNwc0SkCTgiKZ8x0Agu+pjsTmyJR
+Sgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHCReSFtXZiXn7G9ExC6aY37WsL
+/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7OZTgf//////////AgEC
+-----END DH PARAMETERS-----');
+        $this->assertSame($b, "$a");
+    }
+
+    public function testCreateKey(): void
+    {
+        $param = DH::createParameters('diffie-hellman-group1-sha1');
+        $key = DH::createKey($param);
+        $this->assertIsString("$key");
+        $this->assertIsString((string) $key->getPublicKey());
+    }
+
+    public function testLoadPrivate(): void
+    {
+        $a = DH::load('-----BEGIN PRIVATE KEY-----
+MIIBIgIBADCBlQYJKoZIhvcNAQMBMIGHAoGBAP//////////yQ/aoiFowjTExmKL
+gNwc0SkCTgiKZ8x0Agu+pjsTmyJRSgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVt
+bVHCReSFtXZiXn7G9ExC6aY37WsL/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR
+7OZTgf//////////AgECBIGEAoGBALJhtp0aNlkpKTcY1qj519XB8CPc7aZii0xV
+bbb/3R93sweVmk2PlkSqxc2kdcofhL8Ev0DJKxB40Ipdqja71VoBbDZ2nMzS0J6s
+b6R8Z19Xazc0wq+p/wqalmnuCMBUBuuQ8aNNaW8FGwFwAI3I6CuQSsKObVDJO25m
+eKDXQq5i
+-----END PRIVATE KEY-----');
+        $this->assertInstanceOf(PrivateKey::class, $a);
+        $this->assertInstanceOf(PublicKey::class, $a->getPublicKey());
+        $this->assertInstanceOf(Parameters::class, $a->getParameters());
+    }
+
+    public function testLoadPublic(): void
+    {
+        $a = DH::load('-----BEGIN PUBLIC KEY-----
+MIIBHzCBlQYJKoZIhvcNAQMBMIGHAoGBAP//////////yQ/aoiFowjTExmKLgNwc
+0SkCTgiKZ8x0Agu+pjsTmyJRSgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHC
+ReSFtXZiXn7G9ExC6aY37WsL/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7OZT
+gf//////////AgECA4GEAAKBgCsa1YmlaQIvbOuIi/6DKr7jsdMcv50u/Opemca5
+i2REGZNPWmF3SRPrtq/4urrDRU0F2eQks7qnTkrauPK1/UvE1gwbqWrWgBko+6L+
+Q3ADAIcv9LEmTBnSAOsCs1K9ExAmSv/T2/4+9dW28UYb+p/uV477d1wf+nCWS6VU
+/gTm
+-----END PUBLIC KEY-----');
+        $this->assertInstanceOf(PublicKey::class, $a);
+    }
+
+    public function testLoadParameters(): void
+    {
+        $a = DH::load('-----BEGIN DH PARAMETERS-----
+MIGHAoGBAP//////////yQ/aoiFowjTExmKLgNwc0SkCTgiKZ8x0Agu+pjsTmyJR
+Sgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHCReSFtXZiXn7G9ExC6aY37WsL
+/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7OZTgf//////////AgEC
+-----END DH PARAMETERS-----');
+        $this->assertInstanceOf(Parameters::class, $a);
+    }
+
+    public function testComputeSecretWithPublicKey(): void
+    {
+        $ourPriv = DH::load('-----BEGIN PRIVATE KEY-----
+MIIBIgIBADCBlQYJKoZIhvcNAQMBMIGHAoGBAP//////////yQ/aoiFowjTExmKL
+gNwc0SkCTgiKZ8x0Agu+pjsTmyJRSgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVt
+bVHCReSFtXZiXn7G9ExC6aY37WsL/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR
+7OZTgf//////////AgECBIGEAoGBALJhtp0aNlkpKTcY1qj519XB8CPc7aZii0xV
+bbb/3R93sweVmk2PlkSqxc2kdcofhL8Ev0DJKxB40Ipdqja71VoBbDZ2nMzS0J6s
+b6R8Z19Xazc0wq+p/wqalmnuCMBUBuuQ8aNNaW8FGwFwAI3I6CuQSsKObVDJO25m
+eKDXQq5i
+-----END PRIVATE KEY-----');
+        $theirPub = DH::load('-----BEGIN PUBLIC KEY-----
+MIIBHzCBlQYJKoZIhvcNAQMBMIGHAoGBAP//////////yQ/aoiFowjTExmKLgNwc
+0SkCTgiKZ8x0Agu+pjsTmyJRSgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHC
+ReSFtXZiXn7G9ExC6aY37WsL/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7OZT
+gf//////////AgECA4GEAAKBgCsa1YmlaQIvbOuIi/6DKr7jsdMcv50u/Opemca5
+i2REGZNPWmF3SRPrtq/4urrDRU0F2eQks7qnTkrauPK1/UvE1gwbqWrWgBko+6L+
+Q3ADAIcv9LEmTBnSAOsCs1K9ExAmSv/T2/4+9dW28UYb+p/uV477d1wf+nCWS6VU
+/gTm
+-----END PUBLIC KEY-----');
+        $this->assertIsString(DH::computeSecret($ourPriv, $theirPub));
+    }
+
+    public function testComputeSecret(): void
+    {
+        // Ed25519 isn't normally used for DH (that honor goes to Curve25519) but that's not to say it can't
+        // be used
+        $curves = ['nistp256', 'curve25519', 'Ed25519'];
+        foreach ($curves as $curve) {
+            $ourPriv = EC::createKey($curve);
+            $theirPub = EC::createKey($curve)->getPublicKey();
+            $this->assertIsString(DH::computeSecret($ourPriv, $theirPub));
+        }
+    }
+
+    public function testEphemeralECDH(): void
+    {
+        // an RSA like hybrid cryptosystem can be done with ephemeral key ECDH
+
+        $plaintext = 'hello, world!';
+
+        $ourEphemeralPrivate = EC::createKey('Curve25519');
+        $ourEphemeralPublic = $ourEphemeralPrivate->getPublicKey();
+
+        $theirPrivate = EC::createKey('Curve25519');
+        $theirPublic = $theirPrivate->getPublicKey();
+
+        $key = DH::computeSecret($ourEphemeralPrivate, $theirPublic);
+
+        $aes = new AES('ctr');
+        $aes->setKey(substr($key, 0, 16));
+        $aes->setIV(substr($key, 16, 16));
+
+        $encrypted =
+            $ourEphemeralPublic->toString('MontgomeryPublic') .
+            $aes->encrypt($plaintext);
+
+        $theirPublic = substr($encrypted, 0, 32);
+        $theirPublic = EC::loadFormat('MontgomeryPublic', $theirPublic);
+
+        $ourPrivate = $theirPrivate;
+
+        $key = DH::computeSecret($ourPrivate, $theirPublic);
+
+        $aes = new AES('ctr');
+        $aes->setKey(substr($key, 0, 16));
+        $aes->setIV(substr($key, 16, 16));
+
+        $this->assertSame($plaintext, $aes->decrypt(substr($encrypted, 32)));
+    }
+
+    public function testMultiPartyDH(): void
+    {
+        // in multi party (EC)DH everyone, for each public key, everyone (save for the public key owner) "applies"
+        // their private key to it. they do so in series (as opposed to in parallel) and then everyone winds up
+        // with the same shared secret
+
+        $numParties = 4;
+
+        // create private keys
+        $parties = [];
+        for ($i = 0; $i < $numParties; $i++) {
+            $parties[] = EC::createKey('Curve25519');
+        }
+
+        // create shared secrets
+        $secrets = [];
+        for ($i = 0; $i < $numParties; $i++) {
+            $secrets[$i] = $parties[$i]->getPublicKey();
+            for ($j = 0; $j < $numParties; $j++) {
+                if ($i == $j) {
+                    continue;
+                }
+                $secrets[$i] = DH::computeSecret($parties[$j], $secrets[$i]);
+            }
+        }
+
+        for ($i = 1; $i < $numParties; $i++) {
+            $this->assertSame($secrets[0], $secrets[$i]);
+        }
+    }
+
+    public function testCurve25519(): void
+    {
+        // utilizing test vector from https://tools.ietf.org/html/rfc7748#section-6.1
+
+        $alicePrivate = EC::loadFormat('MontgomeryPrivate', pack('H*', '77076d0a7318a57d3c16c17251b26645df4c2f87ebc0992ab177fba51db92c2a'));
+        $bobPrivate = EC::loadFormat('MontgomeryPrivate', pack('H*', '5dab087e624a8a4b79e17f8b83800ee66f3bb1292618b6fd1c2f8b27ff88e0eb'));
+
+        $alicePublic = $alicePrivate->getPublicKey();
+        $bobPublic = $bobPrivate->getPublicKey();
+
+        $this->assertSame(
+            '8520f0098930a754748b7ddcb43ef75a0dbf3a0d26381af4eba4a98eaa9b4e6a',
+            bin2hex($alicePublic->toString('MontgomeryPublic'))
+        );
+
+        $this->assertSame(
+            'de9edb7d7b7dc1b4d35b61c2ece435373f8343c85b78674dadfc7e146f882b4f',
+            bin2hex($bobPublic->toString('MontgomeryPublic'))
+        );
+
+        $expected = pack('H*', '4a5d9d5ba4ce2de1728e3bf480350f25e07e21c947d19e3376f09b3c1e161742');
+
+        $this->assertSame($expected, DH::computeSecret($alicePrivate, $bobPublic));
+        $this->assertSame($expected, DH::computeSecret($bobPrivate, $alicePublic));
+    }
+
+    public function testCurve448(): void
+    {
+        // utilizing test vector from https://tools.ietf.org/html/rfc7748#section-6.2
+
+        $alicePrivate = EC::loadFormat('MontgomeryPrivate', pack(
+            'H*',
+            '9a8f4925d1519f5775cf46b04b5800d4ee9ee8bae8bc5565d498c28d' .
+            'd9c9baf574a9419744897391006382a6f127ab1d9ac2d8c0a598726b'
+        ));
+        $bobPrivate = EC::loadFormat('MontgomeryPrivate', pack(
+            'H*',
+            '1c306a7ac2a0e2e0990b294470cba339e6453772b075811d8fad0d1d' .
+            '6927c120bb5ee8972b0d3e21374c9c921b09d1b0366f10b65173992d'
+        ));
+
+        $alicePublic = $alicePrivate->getPublicKey();
+        $bobPublic = $bobPrivate->getPublicKey();
+
+        $this->assertSame(
+            '9b08f7cc31b7e3e67d22d5aea121074a273bd2b83de09c63faa73d2c' .
+            '22c5d9bbc836647241d953d40c5b12da88120d53177f80e532c41fa0',
+            bin2hex($alicePublic->toString('MontgomeryPublic'))
+        );
+
+        $this->assertSame(
+            '3eb7a829b0cd20f5bcfc0b599b6feccf6da4627107bdb0d4f345b430' .
+            '27d8b972fc3e34fb4232a13ca706dcb57aec3dae07bdc1c67bf33609',
+            bin2hex($bobPublic->toString('MontgomeryPublic'))
+        );
+
+        $expected = pack(
+            'H*',
+            '07fff4181ac6cc95ec1c16a94a0f74d12da232ce40a77552281d282b' .
+            'b60c0b56fd2464c335543936521c24403085d59a449a5037514a879d'
+        );
+
+        $this->assertSame($expected, DH::computeSecret($alicePrivate, $bobPublic));
+        $this->assertSame($expected, DH::computeSecret($bobPrivate, $alicePublic));
+    }
+}
diff --git a/tests/Unit/Crypt/DSA/CreateKeyTest.php b/tests/Unit/Crypt/DSA/CreateKeyTest.php
new file mode 100644
index 000000000..6f10e6a6f
--- /dev/null
+++ b/tests/Unit/Crypt/DSA/CreateKeyTest.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt\DSA;
+
+use phpseclib3\Crypt\DSA;
+use phpseclib3\Crypt\DSA\Parameters;
+use phpseclib3\Crypt\DSA\PrivateKey;
+use phpseclib3\Crypt\DSA\PublicKey;
+use phpseclib3\Tests\PhpseclibTestCase;
+
+/**
+ * @requires PHP 7.0
+ */
+class CreateKeyTest extends PhpseclibTestCase
+{
+    public function testCreateParameters()
+    {
+        $dsa = DSA::createParameters();
+        $this->assertInstanceOf(Parameters::class, $dsa);
+        $this->assertMatchesRegularExpression('#BEGIN DSA PARAMETERS#', "$dsa");
+
+        try {
+            DSA::createParameters(100, 100);
+        } catch (\Exception $e) {
+            $this->assertInstanceOf(\Exception::class, $e);
+        }
+
+        $dsa = DSA::createParameters(512, 160);
+        $this->assertInstanceOf(Parameters::class, $dsa);
+        $this->assertMatchesRegularExpression('#BEGIN DSA PARAMETERS#', "$dsa");
+
+        return $dsa;
+    }
+
+    /**
+     * @depends testCreateParameters
+     */
+    public function testCreateKey($params): void
+    {
+        $privatekey = DSA::createKey();
+        $this->assertInstanceOf(PrivateKey::class, $privatekey);
+        $this->assertInstanceOf(PublicKey::class, $privatekey->getPublicKey());
+
+        $privatekey = DSA::createKey($params);
+        $this->assertInstanceOf(PrivateKey::class, $privatekey);
+        $this->assertInstanceOf(PublicKey::class, $privatekey->getPublicKey());
+
+        $privatekey = DSA::createKey(512, 160);
+        $this->assertInstanceOf(PrivateKey::class, $privatekey);
+        $this->assertInstanceOf(PublicKey::class, $privatekey->getPublicKey());
+    }
+}
diff --git a/tests/Unit/Crypt/DSA/LoadDSAKeyTest.php b/tests/Unit/Crypt/DSA/LoadDSAKeyTest.php
new file mode 100644
index 000000000..d3fe7dd15
--- /dev/null
+++ b/tests/Unit/Crypt/DSA/LoadDSAKeyTest.php
@@ -0,0 +1,259 @@
+<?php
+
+/**
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2013 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt\DSA;
+
+use phpseclib3\Crypt\DSA\Parameters;
+use phpseclib3\Crypt\DSA\PrivateKey;
+use phpseclib3\Crypt\DSA\PublicKey;
+use phpseclib3\Crypt\PublicKeyLoader;
+use phpseclib3\Exception\NoKeyLoadedException;
+use phpseclib3\Tests\PhpseclibTestCase;
+
+class LoadDSAKeyTest extends PhpseclibTestCase
+{
+    public function testBadKey(): void
+    {
+        $this->expectException(NoKeyLoadedException::class);
+
+        $key = 'zzzzzzzzzzzzzz';
+        PublicKeyLoader::load($key);
+    }
+
+    public function testPuTTYKey(): void
+    {
+        $key = 'PuTTY-User-Key-File-2: ssh-dss
+Encryption: none
+Comment: dsa-key-20161223
+Public-Lines: 18
+AAAAB3NzaC1kc3MAAAEBAIsH1A8S7goEEneW6D/zJXh1zypZRlKlw7vNaJ7yXi9v
+qUkKnTSXK9lR4/nYy4SVTcVApY0sEU2RSDridLTy40ZeMPArH+sxR7lCSZ2AuNq9
+sQxu6VtYg1LKGekKYWC+r4TrZoTz2PUyrUd6sYBsYIX4ozbH2ITgYmYL9ONCrLbt
+4KsKO2EUE3xN3RHv8CkAp5BraCMw5z4vC43t0bcW63RN2mEvqWOqBFx5qe7uck4j
+pH7AvLyvwEye7t5KwJ8P1SMN72u4AWqyXqzLK3Ye0B7hQSFnbz0od4ps3EN+Irsu
+Kf20nkGgHKYJwenpIQwHz3xhBhtgiYCdQXb3ril1kd8AAAAVAJmhajsmmqwQqNkd
+k4JSJ/Y1SE11AAABADYHKKmAZ0OvCZ58m5CGPfuoX4h4nc5L0p3e0Sozcc9cJ5h3
+PvD18ggAf4cLoTpxETnXTFg+30shpKbr2WsE0Jrswe6V2bMaP7Hil6q3WWahLZx6
+9bEClnYCTlJkungzFjJmW+M7yd8xBHCBM6r83FKlLJjolJhHDL5DqX/uHP/9H0sl
+wncwALro1jTo3JU5oRdzMuLWf9P2MB7sEsoeWk2BOiil1BtKnItuObJgXUCCuaWB
+dPJyk4ZVMZZqr+vCnjocRrlQUwlMUG73Ze6KJKM1OgOKMt4PwaqD9oUaKq/gc+Eb
+UtCwVR6TEeIEkmazguvbAb6dSJ18TMZ07H6DJngAAAEAYE/7gKVb8P23zYzcfYOv
+3zG713/i/LAJ+dW3lQupyWkUnE8wDIht7DwKgcA/Vs73jG7SlqPjcMrNzBHjQE+y
+FVCP4xO+wDsh2wZ+KVppVkMljfGpp/0mQ0mQbrmTkaCNZc0ogXwtaI4r7Su2cCq0
+HMwrFJFFXXLaTZY49+lkrtP6q8WFOYJGK3WnrWvXyOe9Xnh2o8E1dQJ0RnshdOft
+j1KZ4JhOHnGKoz8+sKuchGVhs5VaMbJUur3cC8INaeKvtrEpwW/Ety5iy1iPyps9
+S9PlwN0KyVFGWdP2B4Gyj85IXCm3r+JNVoV5tVX9IUBTXnUor7YfWNncwWn56Lc+
+RQ==
+Private-Lines: 1
+AAAAFFMy7BG9rPXwzqZzIY/lqsHEILNf
+Private-MAC: 62b92ddd8b341b9414d640c24ba6ae929a78e039
+';
+
+        $dsa = PublicKeyLoader::load($key);
+
+        $this->assertInstanceOf(PrivateKey::class, $dsa);
+        $this->assertIsString("$dsa");
+        $this->assertIsString($dsa->getPublicKey()->toString('PuTTY'));
+        $this->assertIsString($dsa->getParameters()->toString('PuTTY'));
+
+        $dsa = $dsa->withPassword('password');
+        $this->assertGreaterThan(0, strlen("$dsa"));
+    }
+
+    public function testPKCS1Key(): void
+    {
+        $key = '-----BEGIN DSA PRIVATE KEY-----
+MIIDPQIBAAKCAQEAiwfUDxLuCgQSd5boP/MleHXPKllGUqXDu81onvJeL2+pSQqd
+NJcr2VHj+djLhJVNxUCljSwRTZFIOuJ0tPLjRl4w8Csf6zFHuUJJnYC42r2xDG7p
+W1iDUsoZ6QphYL6vhOtmhPPY9TKtR3qxgGxghfijNsfYhOBiZgv040Kstu3gqwo7
+YRQTfE3dEe/wKQCnkGtoIzDnPi8Lje3RtxbrdE3aYS+pY6oEXHmp7u5yTiOkfsC8
+vK/ATJ7u3krAnw/VIw3va7gBarJerMsrdh7QHuFBIWdvPSh3imzcQ34iuy4p/bSe
+QaAcpgnB6ekhDAfPfGEGG2CJgJ1BdveuKXWR3wIVAJmhajsmmqwQqNkdk4JSJ/Y1
+SE11AoIBADYHKKmAZ0OvCZ58m5CGPfuoX4h4nc5L0p3e0Sozcc9cJ5h3PvD18ggA
+f4cLoTpxETnXTFg+30shpKbr2WsE0Jrswe6V2bMaP7Hil6q3WWahLZx69bEClnYC
+TlJkungzFjJmW+M7yd8xBHCBM6r83FKlLJjolJhHDL5DqX/uHP/9H0slwncwALro
+1jTo3JU5oRdzMuLWf9P2MB7sEsoeWk2BOiil1BtKnItuObJgXUCCuaWBdPJyk4ZV
+MZZqr+vCnjocRrlQUwlMUG73Ze6KJKM1OgOKMt4PwaqD9oUaKq/gc+EbUtCwVR6T
+EeIEkmazguvbAb6dSJ18TMZ07H6DJngCggEAYE/7gKVb8P23zYzcfYOv3zG713/i
+/LAJ+dW3lQupyWkUnE8wDIht7DwKgcA/Vs73jG7SlqPjcMrNzBHjQE+yFVCP4xO+
+wDsh2wZ+KVppVkMljfGpp/0mQ0mQbrmTkaCNZc0ogXwtaI4r7Su2cCq0HMwrFJFF
+XXLaTZY49+lkrtP6q8WFOYJGK3WnrWvXyOe9Xnh2o8E1dQJ0RnshdOftj1KZ4JhO
+HnGKoz8+sKuchGVhs5VaMbJUur3cC8INaeKvtrEpwW/Ety5iy1iPyps9S9PlwN0K
+yVFGWdP2B4Gyj85IXCm3r+JNVoV5tVX9IUBTXnUor7YfWNncwWn56Lc+RQIUUzLs
+Eb2s9fDOpnMhj+WqwcQgs18=
+-----END DSA PRIVATE KEY-----';
+
+        $dsa = PublicKeyLoader::load($key);
+
+        $this->assertInstanceOf(PrivateKey::class, $dsa);
+        $this->assertIsString("$dsa");
+        $this->assertIsString($dsa->getPublicKey()->toString('PKCS1'));
+        $this->assertIsString((string) $dsa->getParameters());
+    }
+
+    public function testParameters(): void
+    {
+        $key = '-----BEGIN DSA PARAMETERS-----
+MIIBHgKBgQDandMycPZNOEwDXpIDSdFODWOQVO5tlnt38wK0X33TJh4wQdqOSiVF
+I+g+X8reP43ag3TEHu5bstrk6Znm7y1htTTvXQVTEwp6X3YHXbJG4Faul3g08Vud
+3gzV841wToVCMUinl0EOxMYP/CO9/Kvf66KACtqWITzJYBpwAeUKfwIVAM8e3xO8
+aityXVRiQRWeZtOI1yq9AoGAbmA+RzIZrtPx1mC5KzrpwgwgNHbbQBT83qeNKjEh
+N+S6A47iI5OVvpxd/ZwjdXoYo7D6RxR+3LNcT64DyYrBEZuzQzHeifaO6lBvDSNf
+L1cwyXx0KMaaampd34MzOIHbC44SHY+cE3aVVUsnmt6Ur1nQaVYVszl+AO6m8bPm
+4Vg=
+-----END DSA PARAMETERS-----';
+        $key = str_replace(["\n", "\r"], '', $key);
+        $dsa = PublicKeyLoader::load($key);
+
+        $this->assertInstanceOf(Parameters::class, $dsa);
+        $this->assertSame($key, str_replace(["\n", "\r"], '', "$dsa"));
+        $this->assertSame($key, str_replace(["\n", "\r"], '', (string) $dsa->getParameters()));
+    }
+
+    public function testPKCS8Public(): void
+    {
+        $key = '-----BEGIN PUBLIC KEY-----
+MIIBtjCCASsGByqGSM44BAEwggEeAoGBANqd0zJw9k04TANekgNJ0U4NY5BU7m2W
+e3fzArRffdMmHjBB2o5KJUUj6D5fyt4/jdqDdMQe7luy2uTpmebvLWG1NO9dBVMT
+CnpfdgddskbgVq6XeDTxW53eDNXzjXBOhUIxSKeXQQ7Exg/8I738q9/rooAK2pYh
+PMlgGnAB5Qp/AhUAzx7fE7xqK3JdVGJBFZ5m04jXKr0CgYBuYD5HMhmu0/HWYLkr
+OunCDCA0dttAFPzep40qMSE35LoDjuIjk5W+nF39nCN1ehijsPpHFH7cs1xPrgPJ
+isERm7NDMd6J9o7qUG8NI18vVzDJfHQoxppqal3fgzM4gdsLjhIdj5wTdpVVSyea
+3pSvWdBpVhWzOX4A7qbxs+bhWAOBhAACgYBTpSKcKoVKw+hglVClqvqQdNKGC4a+
+XC4lOh2221ZrTgy/sN92vT7cdBn4ydHoth6/bD236L/FYfiX4S4mOczPhrv/l/2u
+ZpmyOpXM/0opRMIRdmqVW4ardBFNokmlqngwcbaptfRnk9W2cQtx0lmKy6X/vnis
+3AElwP86TYgBhw==
+-----END PUBLIC KEY-----';
+
+        $dsa = PublicKeyLoader::load($key);
+
+        $this->assertInstanceOf(PublicKey::class, $dsa);
+        $this->assertIsString("$dsa");
+    }
+
+    public function testPKCS8Private(): void
+    {
+        $key = '-----BEGIN PRIVATE KEY-----
+MIIBSgIBADCCASsGByqGSM44BAEwggEeAoGBANqd0zJw9k04TANekgNJ0U4NY5BU
+7m2We3fzArRffdMmHjBB2o5KJUUj6D5fyt4/jdqDdMQe7luy2uTpmebvLWG1NO9d
+BVMTCnpfdgddskbgVq6XeDTxW53eDNXzjXBOhUIxSKeXQQ7Exg/8I738q9/rooAK
+2pYhPMlgGnAB5Qp/AhUAzx7fE7xqK3JdVGJBFZ5m04jXKr0CgYBuYD5HMhmu0/HW
+YLkrOunCDCA0dttAFPzep40qMSE35LoDjuIjk5W+nF39nCN1ehijsPpHFH7cs1xP
+rgPJisERm7NDMd6J9o7qUG8NI18vVzDJfHQoxppqal3fgzM4gdsLjhIdj5wTdpVV
+Syea3pSvWdBpVhWzOX4A7qbxs+bhWAQWAhQiF7sFfCtZ7oOgCb2aJ9ySC9sTug==
+-----END PRIVATE KEY-----';
+
+        $dsa = PublicKeyLoader::load($key);
+
+        $this->assertInstanceOf(PrivateKey::class, $dsa);
+        $this->assertIsString("$dsa");
+        $this->assertInstanceOf(PublicKey::class, $dsa->getPublicKey());
+        $this->assertInstanceOf(Parameters::class, $dsa->getParameters());
+    }
+
+    public function testPuTTYBadMAC(): void
+    {
+        $this->expectException(NoKeyLoadedException::class);
+
+        $key = 'PuTTY-User-Key-File-2: ssh-dss
+Encryption: none
+Comment: dsa-key-20161223
+Public-Lines: 18
+AAAAB3NzaC1kc3MAAAEBAIsH1A8S7goEEneW6D/zJXh1zypZRlKlw7vNaJ7yXi9v
+qUkKnTSXK9lR4/nYy4SVTcVApY0sEU2RSDridLTy40ZeMPArH+sxR7lCSZ2AuNq9
+sQxu6VtYg1LKGekKYWC+r4TrZoTz2PUyrUd6sYBsYIX4ozbH2ITgYmYL9ONCrLbt
+4KsKO2EUE3xN3RHv8CkAp5BraCMw5z4vC43t0bcW63RN2mEvqWOqBFx5qe7uck4j
+pH7AvLyvwEye7t5KwJ8P1SMN72u4AWqyXqzLK3Ye0B7hQSFnbz0od4ps3EN+Irsu
+Kf20nkGgHKYJwenpIQwHz3xhBhtgiYCdQXb3ril1kd8AAAAVAJmhajsmmqwQqNkd
+k4JSJ/Y1SE11AAABADYHKKmAZ0OvCZ58m5CGPfuoX4h4nc5L0p3e0Sozcc9cJ5h3
+PvD18ggAf4cLoTpxETnXTFg+30shpKbr2WsE0Jrswe6V2bMaP7Hil6q3WWahLZx6
+9bEClnYCTlJkungzFjJmW+M7yd8xBHCBM6r83FKlLJjolJhHDL5DqX/uHP/9H0sl
+wncwALro1jTo3JU5oRdzMuLWf9P2MB7sEsoeWk2BOiil1BtKnItuObJgXUCCuaWB
+dPJyk4ZVMZZqr+vCnjocRrlQUwlMUG73Ze6KJKM1OgOKMt4PwaqD9oUaKq/gc+Eb
+UtCwVR6TEeIEkmazguvbAb6dSJ18TMZ07H6DJngAAAEAYE/7gKVb8P23zYzcfYOv
+3zG713/i/LAJ+dW3lQupyWkUnE8wDIht7DwKgcA/Vs73jG7SlqPjcMrNzBHjQE+y
+FVCP4xO+wDsh2wZ+KVppVkMljfGpp/0mQ0mQbrmTkaCNZc0ogXwtaI4r7Su2cCq0
+HMwrFJFFXXLaTZY49+lkrtP6q8WFOYJGK3WnrWvXyOe9Xnh2o8E1dQJ0RnshdOft
+j1KZ4JhOHnGKoz8+sKuchGVhs5VaMbJUur3cC8INaeKvtrEpwW/Ety5iy1iPyps9
+S9PlwN0KyVFGWdP2B4Gyj85IXCm3r+JNVoV5tVX9IUBTXnUor7YfWNncwWn56Lc+
+RQ==
+Private-Lines: 1
+AAAAFFMy7BG9rPXwzqZzIY/lqsHEILNf
+Private-MAC: aaaaaadd8b341b9414d640c24ba6ae929a78e039
+';
+
+        PublicKeyLoader::load($key);
+    }
+
+    public function testXML(): void
+    {
+        $key = '-----BEGIN PUBLIC KEY-----
+MIIBtjCCASsGByqGSM44BAEwggEeAoGBANqd0zJw9k04TANekgNJ0U4NY5BU7m2W
+e3fzArRffdMmHjBB2o5KJUUj6D5fyt4/jdqDdMQe7luy2uTpmebvLWG1NO9dBVMT
+CnpfdgddskbgVq6XeDTxW53eDNXzjXBOhUIxSKeXQQ7Exg/8I738q9/rooAK2pYh
+PMlgGnAB5Qp/AhUAzx7fE7xqK3JdVGJBFZ5m04jXKr0CgYBuYD5HMhmu0/HWYLkr
+OunCDCA0dttAFPzep40qMSE35LoDjuIjk5W+nF39nCN1ehijsPpHFH7cs1xPrgPJ
+isERm7NDMd6J9o7qUG8NI18vVzDJfHQoxppqal3fgzM4gdsLjhIdj5wTdpVVSyea
+3pSvWdBpVhWzOX4A7qbxs+bhWAOBhAACgYBTpSKcKoVKw+hglVClqvqQdNKGC4a+
+XC4lOh2221ZrTgy/sN92vT7cdBn4ydHoth6/bD236L/FYfiX4S4mOczPhrv/l/2u
+ZpmyOpXM/0opRMIRdmqVW4ardBFNokmlqngwcbaptfRnk9W2cQtx0lmKy6X/vnis
+3AElwP86TYgBhw==
+-----END PUBLIC KEY-----';
+
+        $dsa = PublicKeyLoader::load($key);
+        $xml = $dsa->toString('XML');
+        $this->assertStringContainsString('DSAKeyValue', $xml);
+
+        $dsa = PublicKeyLoader::load($xml);
+        $pkcs8 = $dsa->toString('PKCS8');
+
+        $this->assertSame(
+            strtolower(preg_replace('#\s#', '', $pkcs8)),
+            strtolower(preg_replace('#\s#', '', $key))
+        );
+    }
+
+    public function testOpenSSHPrivate(): void
+    {
+        $key = '-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABswAAAAdzc2gtZH
+NzAAAAgQDpE1/71V6uuaeEqbaAzoEsA1kdJBZh9In3/VlCXwvlJ6zz8KSzbQxrC45sO7y9
+fMwD5QyWEphVeIXO/NSfcZhK/SD/D+N1Zx52Ku2KEFTb3dAhfNGe9yhsrAVI5WyE4lS2qe
+e5fLNnh138hYAdN7ENRoUAQ3I6Hk9HAIn+ltHMmQAAABUA95iPdxHL3ikkmZd1X5WhQFTI
++9sAAACBAMcn1PdWdUmE8D4KP6g0rq4KAElZc904mYX+bHQNMXONm4BrsScn3/iOf370Ea
+iUgkomo+CSP2H8S3pLBNbiQW7AzS9TGT782FlG/bXf8kSMFb7IzAuFmQMeouLZo40AwHEv
+7PpdzrXs6GRQ0vwJlNoqoUAUi9MMhexDzpGMbNjqAAAAgQCU1JuJZDzpk+cBgEdRTRGx6m
+JZkP9vHP7ctUhgKZcAPSyd8keN8gQCpvmZuK1ADtd/+pXBxbQBAPb1+p8wAgqDU4m8+LFf
+2igKtb8mf8qp/ghxV08/Tzf5WfcDWPxOesdlN48qLbSmUgsO7gq/1vodebMSHcduV4JTq8
+ix5Ey87QAAAeiOLNHLjizRywAAAAdzc2gtZHNzAAAAgQDpE1/71V6uuaeEqbaAzoEsA1kd
+JBZh9In3/VlCXwvlJ6zz8KSzbQxrC45sO7y9fMwD5QyWEphVeIXO/NSfcZhK/SD/D+N1Zx
+52Ku2KEFTb3dAhfNGe9yhsrAVI5WyE4lS2qee5fLNnh138hYAdN7ENRoUAQ3I6Hk9HAIn+
+ltHMmQAAABUA95iPdxHL3ikkmZd1X5WhQFTI+9sAAACBAMcn1PdWdUmE8D4KP6g0rq4KAE
+lZc904mYX+bHQNMXONm4BrsScn3/iOf370EaiUgkomo+CSP2H8S3pLBNbiQW7AzS9TGT78
+2FlG/bXf8kSMFb7IzAuFmQMeouLZo40AwHEv7PpdzrXs6GRQ0vwJlNoqoUAUi9MMhexDzp
+GMbNjqAAAAgQCU1JuJZDzpk+cBgEdRTRGx6mJZkP9vHP7ctUhgKZcAPSyd8keN8gQCpvmZ
+uK1ADtd/+pXBxbQBAPb1+p8wAgqDU4m8+LFf2igKtb8mf8qp/ghxV08/Tzf5WfcDWPxOes
+dlN48qLbSmUgsO7gq/1vodebMSHcduV4JTq8ix5Ey87QAAABQhHEzWiduF4V0DestSnJ3q
+9GNNTQAAAAxyb290QHZhZ3JhbnQBAgMEBQ==
+-----END OPENSSH PRIVATE KEY-----';
+
+        $key = PublicKeyLoader::load($key);
+
+        $key2 = PublicKeyLoader::load($key->toString('OpenSSH'));
+        $this->assertInstanceOf(PrivateKey::class, $key2);
+
+        $sig = $key->sign('zzz');
+
+        $key = 'ssh-dss AAAAB3NzaC1kc3MAAACBAOkTX/vVXq65p4SptoDOgSwDWR0kFmH0iff9WUJfC+UnrPPwpLNtDGsLjmw7vL18zAPlDJYSmFV4hc781J9xmEr9IP8P43VnHnYq7YoQVNvd0CF80Z73KGysBUjlbITiVLap57l8s2eHXfyFgB03sQ1GhQBDcjoeT0cAif6W0cyZAAAAFQD3mI93EcveKSSZl3VflaFAVMj72wAAAIEAxyfU91Z1SYTwPgo/qDSurgoASVlz3TiZhf5sdA0xc42bgGuxJyff+I5/fvQRqJSCSiaj4JI/YfxLeksE1uJBbsDNL1MZPvzYWUb9td/yRIwVvsjMC4WZAx6i4tmjjQDAcS/s+l3OtezoZFDS/AmU2iqhQBSL0wyF7EPOkYxs2OoAAACBAJTUm4lkPOmT5wGAR1FNEbHqYlmQ/28c/ty1SGAplwA9LJ3yR43yBAKm+Zm4rUAO13/6lcHFtAEA9vX6nzACCoNTibz4sV/aKAq1vyZ/yqn+CHFXTz9PN/lZ9wNY/E56x2U3jyottKZSCw7uCr/W+h15sxIdx25XglOryLHkTLzt root@vagrant';
+        $key = PublicKeyLoader::load($key);
+
+        $this->assertTrue($key->verify('zzz', $sig));
+    }
+}
diff --git a/tests/Unit/Crypt/DSA/SignatureTest.php b/tests/Unit/Crypt/DSA/SignatureTest.php
new file mode 100644
index 000000000..430836dd9
--- /dev/null
+++ b/tests/Unit/Crypt/DSA/SignatureTest.php
@@ -0,0 +1,129 @@
+<?php
+
+/**
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt\DSA;
+
+use phpseclib3\Crypt\DSA;
+use phpseclib3\Crypt\PublicKeyLoader;
+use phpseclib3\Tests\PhpseclibTestCase;
+
+class SignatureTest extends PhpseclibTestCase
+{
+    public function testPKCSSignature(): void
+    {
+        $message = 'hello, world!';
+
+        $dsa = PublicKeyLoader::load('-----BEGIN DSA PRIVATE KEY-----
+MIIBvAIBAAKBgQDsGAHAM16bsPlwl7jaec4QMynYa0YLiLiOZC4mvH4UW/tRJxTz
+aV7eH1EtnP9D9J78x/07wKYs8zJEWCXmuq0UluQfjA47+pb68b/ucQTNeZHboNN9
+5oEi+8BCSK0y8G3uf3Y89qHvqa9Si6rP374MinEMrbVFm+UpsGflFcd83wIVALtJ
+ANi+lYG7xMKQ/bE4+bS8gemNAoGBAORowvirD7AB9x2SpdiME41+O4jVR8rs6+GX
+Ml3Hif6Yt1kem0CeraX9SNoyBNAzjD5TVMGIdGlgRr6GNreHeXMGWlvdDkvCACER
+ZEEtMsKZicm+yl6kR8AGHTCA/PBltHfyrFQd4n9I//UDqI4RjqzvpCXGQcVEsSDY
+CCBGBQJRAoGBALnHTAZlpoLJZuSBVtnMuRM3cSX43IkE9w9FveDV1jX5mmfK7yBV
+pQFV8eVJfk91ERQ4Dn6ePLUv2dRIt4a0S0qHqadgzyoFyqkmmUi1kNLyixtRqh+m
+2gXx0t63HEpZDbEPppdpnlppZquVQh7TyrKSXW9MTzUkQjFI9UY7kZeKAhQXiJgI
+kBniZHdFBAZBTE14YJUBkw==
+-----END DSA PRIVATE KEY-----')
+            ->withSignatureFormat('ASN1');
+        $signature = $dsa->sign($message);
+
+        $dsa = PublicKeyLoader::load('-----BEGIN PUBLIC KEY-----
+MIIBuDCCASwGByqGSM44BAEwggEfAoGBAOwYAcAzXpuw+XCXuNp5zhAzKdhrRguI
+uI5kLia8fhRb+1EnFPNpXt4fUS2c/0P0nvzH/TvApizzMkRYJea6rRSW5B+MDjv6
+lvrxv+5xBM15kdug033mgSL7wEJIrTLwbe5/djz2oe+pr1KLqs/fvgyKcQyttUWb
+5SmwZ+UVx3zfAhUAu0kA2L6VgbvEwpD9sTj5tLyB6Y0CgYEA5GjC+KsPsAH3HZKl
+2IwTjX47iNVHyuzr4ZcyXceJ/pi3WR6bQJ6tpf1I2jIE0DOMPlNUwYh0aWBGvoY2
+t4d5cwZaW90OS8IAIRFkQS0ywpmJyb7KXqRHwAYdMID88GW0d/KsVB3if0j/9QOo
+jhGOrO+kJcZBxUSxINgIIEYFAlEDgYUAAoGBALnHTAZlpoLJZuSBVtnMuRM3cSX4
+3IkE9w9FveDV1jX5mmfK7yBVpQFV8eVJfk91ERQ4Dn6ePLUv2dRIt4a0S0qHqadg
+zyoFyqkmmUi1kNLyixtRqh+m2gXx0t63HEpZDbEPppdpnlppZquVQh7TyrKSXW9M
+TzUkQjFI9UY7kZeK
+-----END PUBLIC KEY-----')
+            ->withSignatureFormat('ASN1');
+
+        $this->assertTrue($dsa->verify($message, $signature));
+        $this->assertFalse($dsa->verify('foozbar', $signature));
+
+        // openssl dgst -dss1 -sign dsa_priv.pem foo.txt > sigfile.bin
+        $signature = '302c021456d7e7da10d1538a6cd45dcb2b0ce15c28bac03402147e973a4de1e92e8a87ed5218c797952a3f854df5';
+        $signature = pack('H*', $signature);
+
+        $dsa = $dsa->withHash('sha1');
+
+        $this->assertTrue($dsa->verify("foobar\n", $signature));
+        $this->assertFalse($dsa->verify('foozbar', $signature));
+
+        // openssl dgst -sha256 -sign dsa_priv.pem foo.txt > sigfile.bin
+        $signature = '302e021500b131ec2682c4c0be13e6558ba3d64929ebc0ac420215009946300a03561cef50c0a51d0cd0a2c835e798fc';
+        $signature = pack('H*', $signature);
+
+        $dsa = $dsa->withHash('sha256');
+
+        $this->assertTrue($dsa->verify('abcdefghijklmnopqrstuvwxyz', $signature));
+        $this->assertFalse($dsa->verify('zzzz', $signature));
+    }
+
+    public function testRandomSignature(): void
+    {
+        $message = 'hello, world!';
+
+        $dsa = PublicKeyLoader::load('-----BEGIN DSA PRIVATE KEY-----
+MIIBvAIBAAKBgQDsGAHAM16bsPlwl7jaec4QMynYa0YLiLiOZC4mvH4UW/tRJxTz
+aV7eH1EtnP9D9J78x/07wKYs8zJEWCXmuq0UluQfjA47+pb68b/ucQTNeZHboNN9
+5oEi+8BCSK0y8G3uf3Y89qHvqa9Si6rP374MinEMrbVFm+UpsGflFcd83wIVALtJ
+ANi+lYG7xMKQ/bE4+bS8gemNAoGBAORowvirD7AB9x2SpdiME41+O4jVR8rs6+GX
+Ml3Hif6Yt1kem0CeraX9SNoyBNAzjD5TVMGIdGlgRr6GNreHeXMGWlvdDkvCACER
+ZEEtMsKZicm+yl6kR8AGHTCA/PBltHfyrFQd4n9I//UDqI4RjqzvpCXGQcVEsSDY
+CCBGBQJRAoGBALnHTAZlpoLJZuSBVtnMuRM3cSX43IkE9w9FveDV1jX5mmfK7yBV
+pQFV8eVJfk91ERQ4Dn6ePLUv2dRIt4a0S0qHqadgzyoFyqkmmUi1kNLyixtRqh+m
+2gXx0t63HEpZDbEPppdpnlppZquVQh7TyrKSXW9MTzUkQjFI9UY7kZeKAhQXiJgI
+kBniZHdFBAZBTE14YJUBkw==
+-----END DSA PRIVATE KEY-----')
+            ->withSignatureFormat('ASN1');
+        $public = $dsa->getPublicKey();
+        $signature1 = $dsa->sign($message);
+        $signature2 = $dsa->sign($message);
+
+        // phpseclib's DSA implementation uses a CSPRNG to generate the k parameter.
+        // used correctly this should result in different signatures every time.
+        // RFC6979 describes a deterministic DSA scheme wherein two signatures for the same
+        // plaintext would yield the same value so if that were to be switched to then this
+        // unit test would need to be updated
+        $this->assertNotEquals($signature1, $signature2);
+
+        $this->assertTrue($public->verify($message, $signature1));
+        $this->assertTrue($public->verify($message, $signature2));
+
+        $dsa = $dsa->withSignatureFormat('SSH2');
+        $public = $public->withSignatureFormat('SSH2');
+
+        $signature = $dsa->sign($message);
+
+        $this->assertTrue($public->verify($message, $signature));
+    }
+
+    public function testSSHSignature(): void
+    {
+        $dsa = PublicKeyLoader::load('AAAAB3NzaC1kc3MAAACBAPyzZzm4oqmY12lxmHwNcfYDNyXr38M1lU6xy9I792U1YSKgX27nUW9eXdJ8Mrn63Le5rrBRfg2Niycx' .
+                   'JF2IwDpwCi7YpIv79uwT3RtA0chQDS4vx8qi8BWBzy7PZC9hmqY62+mgfj8ooga1sr+JpMh+8r4j3KjPM+wE37khkgkvAAAAFQDn' .
+                   '19pBng6TajI/vdg7GPnxsitCqQAAAIEA6Pl1Z/TVdkc+HpfkAvcg2Q+yNtnVq7+26RCbRDO3b9Ocr+tZA9u23qnO3KDYeygzaLnI' .
+                   'gpErp61Bj70iIUldhXy2LFGZFEC9XiKmt/tQxSDKiBbj3bS3wKfHrAlElgjhqxiRh+GixgSsmCj96eJFXcsxPjQU81HR+WJ0ALV1' .
+                   'UnMAAACABRdNuqqe1Y68es8TIflV71P0J7Ci2BbbqAXRwYYKc9/7DrygwaN2UIbMXyOLuojeZgQPPoM9nkzd6QZo8M9apawVKKwD' .
+                   'GAUj2of+F9WVRxhE0ohTQBzD/3HqT80pQsX+rYcxuSx1cCtdMp4oLrrfKO2J4EiWUkaoSB7SdCaj+vU=');
+        $dsa = $dsa
+            ->withHash('sha1')
+            ->withSignatureFormat('SSH2');
+        $message = pack('H*', '8bfc69a222c12ddf6bc6bf33c9cadc106af04feb');
+        $signature = pack('H*', '000000077373682d64737300000028a7a2e55dc43e5e6145aa94daa0552ea479d1139d6d6ba50650b489e24e976593e73f76557813d6bc');
+
+        $this->assertTrue($dsa->verify($message, $signature));
+    }
+}
diff --git a/tests/Unit/Crypt/EC/CurveTest.php b/tests/Unit/Crypt/EC/CurveTest.php
new file mode 100644
index 000000000..8aa02ab26
--- /dev/null
+++ b/tests/Unit/Crypt/EC/CurveTest.php
@@ -0,0 +1,517 @@
+<?php
+
+/**
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2015 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt\EC;
+
+use phpseclib3\Crypt\EC;
+use phpseclib3\Crypt\EC\Curves\Ed448;
+use phpseclib3\Crypt\PublicKeyLoader;
+use phpseclib3\File\ASN1;
+use phpseclib3\Tests\PhpseclibTestCase;
+
+class CurveTest extends PhpseclibTestCase
+{
+    public static function curves(): array
+    {
+        $curves = [];
+        foreach (new \DirectoryIterator(__DIR__ . '/../../../../phpseclib/Crypt/EC/Curves/') as $file) {
+            if ($file->getExtension() != 'php') {
+                continue;
+            }
+            $testName = $file->getBasename('.php');
+            if ($testName == 'Curve25519' || $testName == 'Curve448') {
+                continue;
+            }
+            $class = 'phpseclib3\Crypt\EC\Curves\\' . $testName;
+            $reflect = new \ReflectionClass($class);
+            if ($reflect->isFinal()) {
+                continue;
+            }
+            $curves[] = [$testName];
+        }
+
+        return $curves;
+    }
+
+    public static function allCurves(): array
+    {
+        $curves = [];
+        foreach (new \DirectoryIterator(__DIR__ . '/../../../../phpseclib/Crypt/EC/Curves/') as $file) {
+            if ($file->getExtension() != 'php') {
+                continue;
+            }
+            $testName = $file->getBasename('.php');
+            if ($testName == 'Curve25519' || $testName == 'Curve448') {
+                continue;
+            }
+            $curves[] = [$testName];
+        }
+
+        return $curves;
+    }
+
+    public static function curvesWithOIDs(): array
+    {
+        $class = new \ReflectionClass('phpseclib3\Crypt\EC\Formats\Keys\PKCS8');
+
+        $initialize = $class->getMethod('initialize_static_variables');
+        $initialize->setAccessible(true);
+        $initialize->invoke(null);
+
+        $property = $class->getProperty('curveOIDs');
+        $property->setAccessible(true);
+
+        $curves = [];
+
+        foreach ($property->getValue() as $curve => $oid) {
+            $curves[] = [$curve];
+        }
+
+        return $curves;
+    }
+
+    /**
+     * Verify that the base points are correct and verify the finite field math
+     *
+     * @dataProvider curves
+     */
+    public function testBasePoint($name): void
+    {
+        $class = 'phpseclib3\Crypt\EC\Curves\\' . $name;
+        $curve = new $class();
+        $this->assertTrue($curve->verifyPoint($curve->getBasePoint()), "Failed to verify basepoint of curve $name");
+    }
+
+    /**
+     * Verify the correctness of the point addition / doubling / multiplication algorithms
+     *
+     * @dataProvider curves
+     * @requires PHP 7.0
+     */
+    public function testKeyGeneration($name): void
+    {
+        $class = 'phpseclib3\Crypt\EC\Curves\\' . $name;
+        $curve = new $class();
+        $dA = $curve->createRandomMultiplier();
+        $QA = $curve->multiplyPoint($curve->getBasePoint(), $dA);
+        $this->assertTrue($curve->verifyPoint($QA), "Failed to verify point multiplication on curve $name with $dA");
+    }
+
+    /**
+     * Verify that OIDs have corresponding curve class
+     *
+     * @dataProvider curvesWithOIDs
+     */
+    public function testCurveExistance($name): void
+    {
+        $this->assertFileExists(__DIR__ . "/../../../../phpseclib/Crypt/EC/Curves/$name.php");
+    }
+
+    /**
+     * Verify that all named curves have a corresponding OID
+     *
+     * @dataProvider allCurves
+     */
+    public function testOIDExistance($name): void
+    {
+        switch ($name) {
+            case 'Ed25519':
+            case 'Ed448':
+                self::markTestSkipped('Ed25519 / Ed448 OIDs are treated a little differently');
+        }
+        $this->assertNotSame(ASN1::getOID($name), $name);
+    }
+
+    /**
+     * Sign with internal engine, verify with best engine
+     *
+     * @dataProvider curves
+     * @requires PHP 7.0
+     */
+    public function testInternalSign($name): void
+    {
+        // tests utilizing dataProvider only seem to output when all the dataProvider input
+        // has been exhausted. ie. when this test has been ran on every curve. on my local
+        // system it takes about 2.5m for this test to run, with the most time consuming curves
+        // being sect571r1 and sect571k1, which take about 30s each. on Travis CI, however,
+        // these curves seem to take about 2m each to run:
+        // https://travis-ci.org/terrafrost/phpseclib/jobs/450262081
+        // because of the 10m timeout that Travis CI has this means that there's a very
+        // good chance the binary curves (sect*) will timeout before the test is able to
+        // output anything
+        if (substr($name, 0, 4) == 'sect') {
+            self::markTestSkipped('Binary field curves are being skipped');
+        }
+
+        $plaintext = 'zzz';
+
+        EC::useInternalEngine();
+        $privatekey = EC::createKey($name);
+        $publickey = $privatekey->getPublicKey();
+        $sig = $privatekey->sign($plaintext);
+
+        EC::useBestEngine();
+        $this->assertTrue($publickey->verify($plaintext, $sig));
+    }
+
+    public function testCanSignWithAnEncryptedPrivateKey(): void
+    {
+        EC::useBestEngine();
+
+        $plaintext = 'zzz';
+
+        $privatekey = EC::createKey('Ed25519')->withPassword('foo');
+        $publickey = $privatekey->getPublicKey();
+        $sig = $privatekey->sign($plaintext);
+
+        $this->assertTrue($publickey->verify($plaintext, $sig));
+    }
+
+    /**
+     * Sign with best engine, verify with internal engine
+     *
+     * @dataProvider curves
+     * @requires PHP 7.0
+     */
+    public function testInternalVerify($name): void
+    {
+        if (substr($name, 0, 4) == 'sect') {
+            self::markTestSkipped('Binary field curves are being skipped');
+        }
+
+        $plaintext = 'zzz';
+
+        EC::useBestEngine();
+        $privatekey = EC::createKey($name);
+        $publickey = $privatekey->getPublicKey();
+        $sig = $privatekey->sign($plaintext);
+
+        EC::useInternalEngine();
+        $this->assertTrue($publickey->verify($plaintext, $sig));
+    }
+
+    /**
+     * Ed448 test vectors from https://tools.ietf.org/html/rfc8032#section-7.4
+     */
+    public function testEd448TestVectors(): void
+    {
+        EC::addFileFormat(Ed448PublicKey::class);
+        EC::addFileFormat(Ed448PrivateKey::class);
+
+        $private = pack('H*', '6c82a562cb808d10d632be89c8513ebf6c929f34ddfa8c9f63c9960ef6e348a3528c8a3fcc2f044e39a3fc5b94492f8f032e7549a20098f95b');
+        $public = pack('H*', '5fd7449b59b461fd2ce787ec616ad46a1da1342485a70e1f8a0ea75d80e96778edf124769b46c7061bd6783df1e50f6cd1fa1abeafe8256180');
+
+        $privateKey = PublicKeyLoader::load($private);
+        $publicKey = PublicKeyLoader::load($public);
+
+        $expected = '533a37f6bbe457251f023c0d88f976ae2dfb504a843e34d2074fd823d41a591f2b233f034f628281f2fd7a22ddd47d7828c59bd0a21bfd3980' .
+                    'ff0d2028d4b18a9df63e006c5d1c2d345b925d8dc00b4104852db99ac5c7cdda8530a113a0f4dbb61149f05a7363268c71d95808ff2e652600';
+        $this->assertSame($expected, bin2hex($sig = $privateKey->sign('')));
+        $this->assertTrue($publicKey->verify('', $sig));
+
+        $private = pack('H*', 'c4eab05d357007c632f3dbb48489924d552b08fe0c353a0d4a1f00acda2c463afbea67c5e8d2877c5e3bc397a659949ef8021e954e0a12274e');
+        $public = pack('H*', '43ba28f430cdff456ae531545f7ecd0ac834a55d9358c0372bfa0c6c6798c0866aea01eb00742802b8438ea4cb82169c235160627b4c3a9480');
+
+        $privateKey = PublicKeyLoader::load($private);
+        $publicKey = PublicKeyLoader::load($public);
+
+        $expected = '26b8f91727bd62897af15e41eb43c377efb9c610d48f2335cb0bd0087810f4352541b143c4b981b7e18f62de8ccdf633fc1bf037ab7cd77980' .
+                    '5e0dbcc0aae1cbcee1afb2e027df36bc04dcecbf154336c19f0af7e0a6472905e799f1953d2a0ff3348ab21aa4adafd1d234441cf807c03a00';
+        $this->assertSame($expected, bin2hex($sig = $privateKey->sign("\x03")));
+        $this->assertTrue($publicKey->verify("\x03", $sig));
+
+        $publicKey = $publicKey->withContext(pack('H*', '666f6f'));
+        $privateKey = $privateKey->withContext(pack('H*', '666f6f'));
+
+        $expected = 'd4f8f6131770dd46f40867d6fd5d5055de43541f8c5e35abbcd001b32a89f7d2151f7647f11d8ca2ae279fb842d607217fce6e042f6815ea00' .
+                    '0c85741de5c8da1144a6a1aba7f96de42505d7a7298524fda538fccbbb754f578c1cad10d54d0d5428407e85dcbc98a49155c13764e66c3c00';
+        $this->assertSame($expected, bin2hex($sig = $privateKey->sign("\x03")));
+        $this->assertTrue($publicKey->verify("\x03", $sig));
+
+        $private = pack('H*', '258cdd4ada32ed9c9ff54e63756ae582fb8fab2ac721f2c8e676a72768513d939f63dddb55609133f29adf86ec9929dccb52c1c5fd2ff7e21b');
+        $public = pack('H*', '3ba16da0c6f2cc1f30187740756f5e798d6bc5fc015d7c63cc9510ee3fd44adc24d8e968b6e46e6f94d19b945361726bd75e149ef09817f580');
+
+        $privateKey = PublicKeyLoader::load($private);
+        $publicKey = PublicKeyLoader::load($public);
+
+        $message = pack('H*', '64a65f3cdedcdd66811e2915');
+
+        $expected = '7eeeab7c4e50fb799b418ee5e3197ff6bf15d43a14c34389b59dd1a7b1b85b4ae90438aca634bea45e3a2695f1270f07fdcdf7c62b8efeaf00' .
+                    'b45c2c96ba457eb1a8bf075a3db28e5c24f6b923ed4ad747c3c9e03c7079efb87cb110d3a99861e72003cbae6d6b8b827e4e6c143064ff3c00';
+        $this->assertSame($expected, bin2hex($sig = $privateKey->sign($message)));
+        $this->assertTrue($publicKey->verify($message, $sig));
+
+        $private = pack('H*', '7ef4e84544236752fbb56b8f31a23a10e42814f5f55ca037cdcc11c64c9a3b2949c1bb60700314611732a6c2fea98eebc0266a11a93970100e');
+        $public = pack('H*', 'b3da079b0aa493a5772029f0467baebee5a8112d9d3a22532361da294f7bb3815c5dc59e176b4d9f381ca0938e13c6c07b174be65dfa578e80');
+
+        $privateKey = PublicKeyLoader::load($private);
+        $publicKey = PublicKeyLoader::load($public);
+
+        $message = pack('H*', '64a65f3cdedcdd66811e2915e7');
+
+        $expected = '6a12066f55331b6c22acd5d5bfc5d71228fbda80ae8dec26bdd306743c5027cb4890810c162c027468675ecf645a83176c0d7323a2ccde2d80' .
+                    'efe5a1268e8aca1d6fbc194d3f77c44986eb4ab4177919ad8bec33eb47bbb5fc6e28196fd1caf56b4e7e0ba5519234d047155ac727a1053100';
+        $this->assertSame($expected, bin2hex($sig = $privateKey->sign($message)));
+        $this->assertTrue($publicKey->verify($message, $sig));
+
+        $private = pack('H*', 'd65df341ad13e008567688baedda8e9dcdc17dc024974ea5b4227b6530e339bff21f99e68ca6968f3cca6dfe0fb9f4fab4fa135d5542ea3f01');
+        $public = pack('H*', 'df9705f58edbab802c7f8363cfe5560ab1c6132c20a9f1dd163483a26f8ac53a39d6808bf4a1dfbd261b099bb03b3fb50906cb28bd8a081f00');
+
+        $privateKey = PublicKeyLoader::load($private);
+        $publicKey = PublicKeyLoader::load($public);
+
+        $message = 'bd0f6a3747cd561bdddf4640a332461a4a30a12a434cd0bf40d766d9c6d458e5512204a30c17d1f50b5079631f64eb3112182da3005835461113718d1a5ef944';
+        $message = pack('H*', $message);
+
+        $expected = '554bc2480860b49eab8532d2a533b7d578ef473eeb58c98bb2d0e1ce488a98b18dfde9b9b90775e67f47d4a1c3482058efc9f40d2ca033a080' .
+                    '1b63d45b3b722ef552bad3b4ccb667da350192b61c508cf7b6b5adadc2c8d9a446ef003fb05cba5f30e88e36ec2703b349ca229c2670833900';
+        $this->assertSame($expected, bin2hex($sig = $privateKey->sign($message)));
+        $this->assertTrue($publicKey->verify($message, $sig));
+
+        $private = pack('H*', '2ec5fe3c17045abdb136a5e6a913e32ab75ae68b53d2fc149b77e504132d37569b7e766ba74a19bd6162343a21c8590aa9cebca9014c636df5');
+        $public = pack('H*', '79756f014dcfe2079f5dd9e718be4171e2ef2486a08f25186f6bff43a9936b9bfe12402b08ae65798a3d81e22e9ec80e7690862ef3d4ed3a00');
+
+        $privateKey = PublicKeyLoader::load($private);
+        $publicKey = PublicKeyLoader::load($public);
+
+        $message = '15777532b0bdd0d1389f636c5f6b9ba734c90af572877e2d272dd078aa1e567cfa80e12928bb542330e8409f3174504107ecd5efac61ae7504dabe2a602ede89e5cca6257a7c77e27a702b3ae39fc769fc54f2395ae6a1178cab4738e543072fc1c177fe71e92e25bf03e4ecb72f47b64d0465aaea4c7fad372536c8ba516a60' .
+                   '39c3c2a39f0e4d832be432dfa9a706a6e5c7e19f397964ca4258002f7c0541b590316dbc5622b6b2a6fe7a4abffd96105eca76ea7b98816af0748c10df048ce012d901015a51f189f3888145c03650aa23ce894c3bd889e030d565071c59f409a9981b51878fd6fc110624dcbcde0bf7a69ccce38fabdf86f3bef6044819de11';
+        $message = pack('H*', $message);
+
+        $expected = 'c650ddbb0601c19ca11439e1640dd931f43c518ea5bea70d3dcde5f4191fe53f00cf966546b72bcc7d58be2b9badef28743954e3a44a23f880' .
+                    'e8d4f1cfce2d7a61452d26da05896f0a50da66a239a8a188b6d825b3305ad77b73fbac0836ecc60987fd08527c1a8e80d5823e65cafe2a3d00';
+        $this->assertSame($expected, bin2hex($sig = $privateKey->sign($message)));
+        $this->assertTrue($publicKey->verify($message, $sig));
+
+        $private = pack('H*', '872d093780f5d3730df7c212664b37b8a0f24f56810daa8382cd4fa3f77634ec44dc54f1c2ed9bea86fafb7632d8be199ea165f5ad55dd9ce8');
+        $public = pack('H*', 'a81b2e8a70a5ac94ffdbcc9badfc3feb0801f258578bb114ad44ece1ec0e799da08effb81c5d685c0c56f64eecaef8cdf11cc38737838cf400');
+
+        $privateKey = PublicKeyLoader::load($private);
+        $publicKey = PublicKeyLoader::load($public);
+
+        $message = '6ddf802e1aae4986935f7f981ba3f0351d6273c0a0c22c9c0e8339168e675412a3debfaf435ed651558007db4384b650fcc07e3b586a27a4f7a00ac8a6fec2cd86ae4bf1570c41e6a40c931db27b2faa15a8cedd52cff7362c4e6e23daec0fbc3a79b6806e316efcc7b68119bf46bc76a26067a53f296dafdbdc11c77f7777e9' .
+                   '72660cf4b6a9b369a6665f02e0cc9b6edfad136b4fabe723d2813db3136cfde9b6d044322fee2947952e031b73ab5c603349b307bdc27bc6cb8b8bbd7bd323219b8033a581b59eadebb09b3c4f3d2277d4f0343624acc817804728b25ab797172b4c5c21a22f9c7839d64300232eb66e53f31c723fa37fe387c7d3e50bdf9813' .
+                   'a30e5bb12cf4cd930c40cfb4e1fc622592a49588794494d56d24ea4b40c89fc0596cc9ebb961c8cb10adde976a5d602b1c3f85b9b9a001ed3c6a4d3b1437f52096cd1956d042a597d561a596ecd3d1735a8d570ea0ec27225a2c4aaff26306d1526c1af3ca6d9cf5a2c98f47e1c46db9a33234cfd4d81f2c98538a09ebe76998' .
+                   'd0d8fd25997c7d255c6d66ece6fa56f11144950f027795e653008f4bd7ca2dee85d8e90f3dc315130ce2a00375a318c7c3d97be2c8ce5b6db41a6254ff264fa6155baee3b0773c0f497c573f19bb4f4240281f0b1f4f7be857a4e59d416c06b4c50fa09e1810ddc6b1467baeac5a3668d11b6ecaa901440016f389f80acc4db9' .
+                   '77025e7f5924388c7e340a732e554440e76570f8dd71b7d640b3450d1fd5f0410a18f9a3494f707c717b79b4bf75c98400b096b21653b5d217cf3565c9597456f70703497a078763829bc01bb1cbc8fa04eadc9a6e3f6699587a9e75c94e5bab0036e0b2e711392cff0047d0d6b05bd2a588bc109718954259f1d86678a579a3' .
+                   '120f19cfb2963f177aeb70f2d4844826262e51b80271272068ef5b3856fa8535aa2a88b2d41f2a0e2fda7624c2850272ac4a2f561f8f2f7a318bfd5caf9696149e4ac824ad3460538fdc25421beec2cc6818162d06bbed0c40a387192349db67a118bada6cd5ab0140ee273204f628aad1c135f770279a651e24d8c14d75a605' .
+                   '9d76b96a6fd857def5e0b354b27ab937a5815d16b5fae407ff18222c6d1ed263be68c95f32d908bd895cd76207ae726487567f9a67dad79abec316f683b17f2d02bf07e0ac8b5bc6162cf94697b3c27cd1fea49b27f23ba2901871962506520c392da8b6ad0d99f7013fbc06c2c17a569500c8a7696481c1cd33e9b14e40b82e' .
+                   '79a5f5db82571ba97bae3ad3e0479515bb0e2b0f3bfcd1fd33034efc6245eddd7ee2086ddae2600d8ca73e214e8c2b0bdb2b047c6a464a562ed77b73d2d841c4b34973551257713b753632efba348169abc90a68f42611a40126d7cb21b58695568186f7e569d2ff0f9e745d0487dd2eb997cafc5abf9dd102e62ff66cba87';
+        $message = pack('H*', $message);
+
+        $expected = 'e301345a41a39a4d72fff8df69c98075a0cc082b802fc9b2b6bc503f926b65bddf7f4c8f1cb49f6396afc8a70abe6d8aef0db478d4c6b29700' .
+                    '76c6a0484fe76d76b3a97625d79f1ce240e7c576750d295528286f719b413de9ada3e8eb78ed573603ce30d8bb761785dc30dbc320869e1a00';
+        $this->assertSame($expected, bin2hex($sig = $privateKey->sign($message)));
+        $this->assertTrue($publicKey->verify($message, $sig));
+    }
+
+    /**
+     * Ed25519 test vectors from https://tools.ietf.org/html/rfc8032#section-7.1 (and 7.2)
+     */
+    public function testEd25519TestVectors(): void
+    {
+        EC::useBestEngine();
+
+        $private = pack('H*', '9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60');
+        $public = pack('H*', 'd75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a');
+
+        $privateKey = EC::loadFormat('libsodium', $private . $public); // libsodium format
+        $publicKey = EC::loadFormat('libsodium', $public);
+
+        $expected = 'e5564300c360ac729086e2cc806e828a84877f1eb8e5d974d873e06522490155' .
+                    '5fb8821590a33bacc61e39701cf9b46bd25bf5f0595bbe24655141438e7a100b';
+        $this->assertSame($expected, bin2hex($sig = $privateKey->sign('')));
+        $this->assertTrue($publicKey->verify('', $sig));
+
+        $private = pack('H*', '4ccd089b28ff96da9db6c346ec114e0f5b8a319f35aba624da8cf6ed4fb8a6fb');
+        $public = pack('H*', '3d4017c3e843895a92b70aa74d1b7ebc9c982ccf2ec4968cc0cd55f12af4660c');
+
+        $privateKey = EC::loadFormat('libsodium', $private . $public);
+        $publicKey = EC::loadFormat('libsodium', $public);
+
+        $expected = '92a009a9f0d4cab8720e820b5f642540a2b27b5416503f8fb3762223ebdb69da' .
+                    '085ac1e43e15996e458f3613d0f11d8c387b2eaeb4302aeeb00d291612bb0c00';
+        $this->assertSame($expected, bin2hex($sig = $privateKey->sign("\x72")));
+        $this->assertTrue($publicKey->verify("\x72", $sig));
+
+        $private = pack('H*', 'c5aa8df43f9f837bedb7442f31dcb7b166d38535076f094b85ce3a2e0b4458f7');
+        $public = pack('H*', 'fc51cd8e6218a1a38da47ed00230f0580816ed13ba3303ac5deb911548908025');
+
+        $privateKey = EC::loadFormat('libsodium', $private . $public); // libsodium format
+        $publicKey = EC::loadFormat('libsodium', $public);
+
+        $expected = '6291d657deec24024827e69c3abe01a30ce548a284743a445e3680d7db5ac3ac' .
+                    '18ff9b538d16f290ae67f760984dc6594a7c15e9716ed28dc027beceea1ec40a';
+        $this->assertSame($expected, bin2hex($sig = $privateKey->sign("\xaf\x82")));
+        $this->assertTrue($publicKey->verify("\xaf\x82", $sig));
+
+        $private = pack('H*', 'f5e5767cf153319517630f226876b86c8160cc583bc013744c6bf255f5cc0ee5');
+        $public = pack('H*', '278117fc144c72340f67d0f2316e8386ceffbf2b2428c9c51fef7c597f1d426e');
+
+        $privateKey = EC::loadFormat('libsodium', $private . $public); // libsodium format
+        $publicKey = EC::loadFormat('libsodium', $public);
+
+        $message = '08b8b2b733424243760fe426a4b54908632110a66c2f6591eabd3345e3e4eb98' .
+                   'fa6e264bf09efe12ee50f8f54e9f77b1e355f6c50544e23fb1433ddf73be84d8' .
+                   '79de7c0046dc4996d9e773f4bc9efe5738829adb26c81b37c93a1b270b20329d' .
+                   '658675fc6ea534e0810a4432826bf58c941efb65d57a338bbd2e26640f89ffbc' .
+                   '1a858efcb8550ee3a5e1998bd177e93a7363c344fe6b199ee5d02e82d522c4fe' .
+                   'ba15452f80288a821a579116ec6dad2b3b310da903401aa62100ab5d1a36553e' .
+                   '06203b33890cc9b832f79ef80560ccb9a39ce767967ed628c6ad573cb116dbef' .
+                   'efd75499da96bd68a8a97b928a8bbc103b6621fcde2beca1231d206be6cd9ec7' .
+                   'aff6f6c94fcd7204ed3455c68c83f4a41da4af2b74ef5c53f1d8ac70bdcb7ed1' .
+                   '85ce81bd84359d44254d95629e9855a94a7c1958d1f8ada5d0532ed8a5aa3fb2' .
+                   'd17ba70eb6248e594e1a2297acbbb39d502f1a8c6eb6f1ce22b3de1a1f40cc24' .
+                   '554119a831a9aad6079cad88425de6bde1a9187ebb6092cf67bf2b13fd65f270' .
+                   '88d78b7e883c8759d2c4f5c65adb7553878ad575f9fad878e80a0c9ba63bcbcc' .
+                   '2732e69485bbc9c90bfbd62481d9089beccf80cfe2df16a2cf65bd92dd597b07' .
+                   '07e0917af48bbb75fed413d238f5555a7a569d80c3414a8d0859dc65a46128ba' .
+                   'b27af87a71314f318c782b23ebfe808b82b0ce26401d2e22f04d83d1255dc51a' .
+                   'ddd3b75a2b1ae0784504df543af8969be3ea7082ff7fc9888c144da2af58429e' .
+                   'c96031dbcad3dad9af0dcbaaaf268cb8fcffead94f3c7ca495e056a9b47acdb7' .
+                   '51fb73e666c6c655ade8297297d07ad1ba5e43f1bca32301651339e22904cc8c' .
+                   '42f58c30c04aafdb038dda0847dd988dcda6f3bfd15c4b4c4525004aa06eeff8' .
+                   'ca61783aacec57fb3d1f92b0fe2fd1a85f6724517b65e614ad6808d6f6ee34df' .
+                   'f7310fdc82aebfd904b01e1dc54b2927094b2db68d6f903b68401adebf5a7e08' .
+                   'd78ff4ef5d63653a65040cf9bfd4aca7984a74d37145986780fc0b16ac451649' .
+                   'de6188a7dbdf191f64b5fc5e2ab47b57f7f7276cd419c17a3ca8e1b939ae49e4' .
+                   '88acba6b965610b5480109c8b17b80e1b7b750dfc7598d5d5011fd2dcc5600a3' .
+                   '2ef5b52a1ecc820e308aa342721aac0943bf6686b64b2579376504ccc493d97e' .
+                   '6aed3fb0f9cd71a43dd497f01f17c0e2cb3797aa2a2f256656168e6c496afc5f' .
+                   'b93246f6b1116398a346f1a641f3b041e989f7914f90cc2c7fff357876e506b5' .
+                   '0d334ba77c225bc307ba537152f3f1610e4eafe595f6d9d90d11faa933a15ef1' .
+                   '369546868a7f3a45a96768d40fd9d03412c091c6315cf4fde7cb68606937380d' .
+                   'b2eaaa707b4c4185c32eddcdd306705e4dc1ffc872eeee475a64dfac86aba41c' .
+                   '0618983f8741c5ef68d3a101e8a3b8cac60c905c15fc910840b94c00a0b9d0';
+        $message = pack('H*', $message);
+
+        $expected = '0aab4c900501b3e24d7cdf4663326a3a87df5e4843b2cbdb67cbf6e460fec350' .
+                    'aa5371b1508f9f4528ecea23c436d94b5e8fcd4f681e30a6ac00a9704a188a03';
+        $this->assertSame($expected, bin2hex($sig = $privateKey->sign($message)));
+        $this->assertTrue($publicKey->verify($message, $sig));
+
+        $private = pack('H*', '833fe62409237b9d62ec77587520911e9a759cec1d19755b7da901b96dca3d42');
+        $public = pack('H*', 'ec172b93ad5e563bf4932c70e1245034c35467ef2efd4d64ebf819683467e2bf');
+
+        $privateKey = EC::loadFormat('libsodium', $private . $public);
+        $publicKey = EC::loadFormat('libsodium', $public);
+
+        $message = 'ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a' .
+                   '2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f';
+        $message = pack('H*', $message); // hash('sha512', 'abc')
+
+        $expected = 'dc2a4459e7369633a52b1bf277839a00201009a3efbf3ecb69bea2186c26b589' .
+                    '09351fc9ac90b3ecfdfbc7c66431e0303dca179c138ac17ad9bef1177331a704';
+        $this->assertSame($expected, bin2hex($sig = $privateKey->sign($message)));
+        $this->assertTrue($publicKey->verify($message, $sig));
+
+        $private = pack('H*', '0305334e381af78f141cb666f6199f57bc3495335a256a95bd2a55bf546663f6');
+        $public = pack('H*', 'dfc9425e4f968f7f0c29f0259cf5f9aed6851c2bb4ad8bfb860cfee0ab248292');
+
+        $privateKey = EC::loadFormat('libsodium', $private . $public);
+        $publicKey = EC::loadFormat('libsodium', $public);
+
+        $privateKey = $privateKey->withContext("\x62\x61\x72");
+        $publicKey = $publicKey->withContext("\x62\x61\x72");
+
+        $message = 'f726936d19c800494e3fdaff20b276a8';
+        $message = pack('H*', $message);
+
+        $expected = 'fc60d5872fc46b3aa69f8b5b4351d5808f92bcc044606db097abab6dbcb1aee3' .
+                    '216c48e8b3b66431b5b186d1d28f8ee15a5ca2df6668346291c2043d4eb3e90d';
+        $this->assertSame($expected, bin2hex($sig = $privateKey->sign($message)));
+        $this->assertTrue($publicKey->verify($message, $sig));
+
+        $private = pack('H*', '0305334e381af78f141cb666f6199f57bc3495335a256a95bd2a55bf546663f6');
+        $public = pack('H*', 'dfc9425e4f968f7f0c29f0259cf5f9aed6851c2bb4ad8bfb860cfee0ab248292');
+
+        $privateKey = EC::loadFormat('libsodium', $private . $public);
+        $publicKey = EC::loadFormat('libsodium', $public);
+
+        $privateKey = $privateKey->withContext("\x66\x6f\x6f");
+        $publicKey = $publicKey->withContext("\x66\x6f\x6f");
+
+        $message = '508e9e6882b979fea900f62adceaca35';
+        $message = pack('H*', $message);
+
+        $expected = '8b70c1cc8310e1de20ac53ce28ae6e7207f33c3295e03bb5c0732a1d20dc6490' .
+                    '8922a8b052cf99b7c4fe107a5abb5b2c4085ae75890d02df26269d8945f84b0b';
+        $this->assertSame($expected, bin2hex($sig = $privateKey->sign($message)));
+        $this->assertTrue($publicKey->verify($message, $sig));
+
+        $private = pack('H*', 'ab9c2853ce297ddab85c993b3ae14bcad39b2c682beabc27d6d4eb20711d6560');
+        $public = pack('H*', '0f1d1274943b91415889152e893d80e93275a1fc0b65fd71b4b0dda10ad7d772');
+
+        $privateKey = EC::loadFormat('libsodium', $private . $public);
+        $publicKey = EC::loadFormat('libsodium', $public);
+
+        $privateKey = $privateKey->withContext("\x66\x6f\x6f");
+        $publicKey = $publicKey->withContext("\x66\x6f\x6f");
+
+        $message = 'f726936d19c800494e3fdaff20b276a8';
+        $message = pack('H*', $message);
+
+        $expected = '21655b5f1aa965996b3f97b3c849eafba922a0a62992f73b3d1b73106a84ad85' .
+                    'e9b86a7b6005ea868337ff2d20a7f5fbd4cd10b0be49a68da2b2e0dc0ad8960f';
+        $this->assertSame($expected, bin2hex($sig = $privateKey->sign($message)));
+        $this->assertTrue($publicKey->verify($message, $sig));
+    }
+
+    public function testRandomSignature(): void
+    {
+        $message = 'hello, world!';
+        $private = PublicKeyLoader::load('PuTTY-User-Key-File-2: ecdsa-sha2-nistp256
+Encryption: none
+Comment: ecdsa-key-20181105
+Public-Lines: 3
+AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJEXCsWA8s18
+m25MJlVE1urbXPYFi4q8oMbb2H0kE2f5WPxizsKXRmb1J68paXQizryL9fC4FTqI
+CJ1+UnaPfk0=
+Private-Lines: 1
+AAAAIQDwaPlajbXY1SxhuwsUqN1CEZ5g4adsbmJsKm+ZbUVm4g==
+Private-MAC: b85ca0eb7c612df5d18af85128821bd53faaa3ef');
+        $public = $private->getPublicKey();
+
+        $signature1 = $private->sign($message, 'ASN1');
+        $signature2 = $private->sign($message, 'ASN1');
+        // phpseclib's EC implementation uses a CSPRNG to generate the k parameter.
+        // used correctly this should result in different signatures every time.
+        // RFC6979 describes a deterministic EC scheme wherein two signatures for the same
+        // plaintext would yield the same value so if that were to be switched to then this
+        // unit test would need to be updated
+        $this->assertNotEquals($signature1, $signature2);
+
+        $this->assertTrue($public->verify($message, $signature1, 'ASN1'));
+        $this->assertTrue($public->verify($message, $signature2, 'ASN1'));
+
+        $signature1 = $private->sign($message, 'SSH2');
+        $signature2 = $private->sign($message, 'SSH2');
+        $this->assertNotEquals($signature1, $signature2);
+        $this->assertTrue($public->verify($message, $signature1, 'SSH2'));
+        $this->assertTrue($public->verify($message, $signature2, 'SSH2'));
+
+        $signature = $private->sign($message, 'Raw');
+        $this->assertTrue($public->verify($message, $signature, 'Raw'));
+    }
+
+    public function testBadRSEd25519(): void
+    {
+        // see https://research.nccgroup.com/2021/11/08/technical-advisory-arbitrary-signature-forgery-in-stark-bank-ecdsa-libraries/
+        $public = PublicKeyLoader::load('-----BEGIN PUBLIC KEY-----
+MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAE1zY+JIBlt8l+1I2f0ItA6oauDx9bFsm6
+hk6TVQ4mP3lH+96p9keQBMRAY1D5znOyPk9107PceO+3kwoat1zKzw==
+-----END PUBLIC KEY-----');
+
+        $signature = base64_decode('MAYCAQACAQA=');
+        $message = 'hello, world!';
+
+        $this->assertFalse($public->verify($message, $signature));
+    }
+}
diff --git a/tests/Unit/Crypt/EC/Ed448PrivateKey.php b/tests/Unit/Crypt/EC/Ed448PrivateKey.php
new file mode 100644
index 000000000..bf3a8abf5
--- /dev/null
+++ b/tests/Unit/Crypt/EC/Ed448PrivateKey.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt\EC;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\EC\Curves\Ed448;
+use phpseclib3\Exception\UnexpectedValueException;
+
+class Ed448PrivateKey
+{
+    public static function load($key, ?string $password = null): array
+    {
+        if (!Strings::is_stringable($key)) {
+            throw new UnexpectedValueException('Key should be a string - not a ' . gettype($key));
+        }
+
+        $components = ['curve' => new Ed448()];
+        $arr = $components['curve']->extractSecret($key);
+        $components['dA'] = $arr['dA'];
+        $components['secret'] = $arr['secret'];
+        $components['QA'] = $components['curve']->multiplyPoint($components['curve']->getBasePoint(), $components['dA']);
+
+        return $components;
+    }
+}
diff --git a/tests/Unit/Crypt/EC/Ed448PublicKey.php b/tests/Unit/Crypt/EC/Ed448PublicKey.php
new file mode 100644
index 000000000..764fd4926
--- /dev/null
+++ b/tests/Unit/Crypt/EC/Ed448PublicKey.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt\EC;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\EC\Curves\Ed448;
+use phpseclib3\Crypt\EC\Formats\Keys\Common;
+use phpseclib3\Exception\UnexpectedValueException;
+
+class Ed448PublicKey
+{
+    use Common;
+
+    public static function load($key, ?string $password = null): array
+    {
+        if (!Strings::is_stringable($key)) {
+            throw new UnexpectedValueException('Key should be a string - not a ' . gettype($key));
+        }
+
+        $components = ['curve' => new Ed448()];
+        $components['QA'] = self::extractPoint($key, $components['curve']);
+
+        return $components;
+    }
+}
diff --git a/tests/Unit/Crypt/EC/KeyTest.php b/tests/Unit/Crypt/EC/KeyTest.php
new file mode 100644
index 000000000..0f84446e3
--- /dev/null
+++ b/tests/Unit/Crypt/EC/KeyTest.php
@@ -0,0 +1,766 @@
+<?php
+
+/**
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2013 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt\EC;
+
+use phpseclib3\Crypt\EC;
+use phpseclib3\Crypt\EC\Formats\Keys\OpenSSH;
+use phpseclib3\Crypt\EC\Formats\Keys\PKCS1;
+use phpseclib3\Crypt\EC\Formats\Keys\PKCS8;
+use phpseclib3\Crypt\EC\Formats\Keys\PuTTY;
+use phpseclib3\Crypt\EC\Formats\Keys\XML;
+use phpseclib3\Crypt\EC\PrivateKey;
+use phpseclib3\Crypt\EC\PublicKey;
+use phpseclib3\Crypt\PublicKeyLoader;
+use phpseclib3\Tests\PhpseclibTestCase;
+
+class KeyTest extends PhpseclibTestCase
+{
+    public function testBinaryPKCS1PrivateParameters(): void
+    {
+        $key = PublicKeyLoader::load('-----BEGIN EC PARAMETERS-----
+BgUrgQQAIg==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MIGkAgEBBDBPoZHEeuf9UjjhevAbGxWwsmmWw34vkxJwtZ0AknmSUAHo0OAowJSQ
+Stf/0U65RhWgBwYFK4EEACKhZANiAASVZJGIs6m/TZhbFoTwBtpvU1JcyixD2YI3
+5YnoIx/6Q1oqJg1vrrmUoXaeEpaO6JH8RgItTl9lYMdmOk5309WJka6tI1QAAK3+
+Jq9z4moG4whp3JsuiBQG9wnaHVrQPA4=
+-----END EC PRIVATE KEY-----');
+        $this->assertSameNL('secp384r1', $key->getCurve());
+    }
+
+    // openssl ecparam -name secp256k1 -genkey -noout -out secp256k1.pem
+    public function testPKCS1PrivateKey(): void
+    {
+        $key = PublicKeyLoader::load($expected = '-----BEGIN EC PRIVATE KEY-----
+MHQCAQEEIEzUawcXqUsQhaEQ51JLeOIY0ddzlO2nNgwDk32ETqwkoAcGBSuBBAAK
+oUQDQgAEFuVcVb9iCUhg2cknHPE+BouHGhQ39ORjMaMI3T4RfRxr6dj5HAXdEqVZ
+1W94KMe30ndmTndcJ8BPeT1Dd15FdQ==
+-----END EC PRIVATE KEY-----');
+        $this->assertSameNL('secp256k1', $key->getCurve());
+        //PKCS1::useNamedCurve();
+        $this->assertSameNL($expected, $key->toString('PKCS1'));
+    }
+
+    // openssl ecparam -name secp256k1 -genkey -noout -out secp256k1.pem -param_enc explicit
+    public function testPKCS1PrivateKeySpecifiedCurve(): void
+    {
+        $key = PublicKeyLoader::load('-----BEGIN EC PRIVATE KEY-----
+MIIBEwIBAQQgFr6TF5meGfgCXDqVxoSEltGI+T94G42PPbA6/ibq+ouggaUwgaIC
+AQEwLAYHKoZIzj0BAQIhAP////////////////////////////////////7///wv
+MAYEAQAEAQcEQQR5vmZ++dy7rFWgYpXOhwsHApv82y3OKNlZ8oFbFvgXmEg62ncm
+o8RlXaT7/A4RCKj9F7RIpoVUGZxH0I/7ENS4AiEA/////////////////////rqu
+3OavSKA7v9JejNA2QUECAQGhRANCAASCTRhjXqmdbqphSdxNkfTNAOmDW5cZ5fnZ
+ys0Tk4pUv/XdiMZtVCGTNsotGeFbT5X64JkP/BFi3PVqjwy2VhOc
+-----END EC PRIVATE KEY-----');
+        $this->assertSameNL('secp256k1', $key->getCurve());
+
+        // this key and the above key have a few small differences.
+        // in both keys the coefficient's are 0 and 7. in the above
+        // key both coefficients are encoded using a single byte.
+        // in the following key the coefficient's are encoded
+        // as 32 bytes (ie. the length of the reduction prime).
+        // eg. one byte null padded to 32 bytes.
+        // also, in the above key the cofactor (1; optional) is
+        // included whereas in the following key it is not
+        $expected = '-----BEGIN EC PRIVATE KEY-----
+MIIBTgIBAQQgFr6TF5meGfgCXDqVxoSEltGI+T94G42PPbA6/ibq+ouggeAwgd0C
+AQEwLAYHKoZIzj0BAQIhAP////////////////////////////////////7///wv
+MEQEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABCAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAABwRBBHm+Zn753LusVaBilc6HCwcCm/zbLc4o
+2VnygVsW+BeYSDradyajxGVdpPv8DhEIqP0XtEimhVQZnEfQj/sQ1LgCIQD/////
+///////////////+uq7c5q9IoDu/0l6M0DZBQaFEA0IABIJNGGNeqZ1uqmFJ3E2R
+9M0A6YNblxnl+dnKzROTilS/9d2Ixm1UIZM2yi0Z4VtPlfrgmQ/8EWLc9WqPDLZW
+E5w=
+-----END EC PRIVATE KEY-----';
+        PKCS1::useSpecifiedCurve();
+        $this->assertSameNL($expected, $key->toString('PKCS1'));
+    }
+
+    // openssl ecparam -name secp256k1 -genkey -noout -out secp256k1.pem
+    // openssl pkcs8 -topk8 -nocrypt -in secp256k1.pem -out secp256k1-2.pem
+    public function testPKCS8PrivateKey(): void
+    {
+        $key = PublicKeyLoader::load($expected = '-----BEGIN PRIVATE KEY-----
+MIGEAgEAMBAGByqGSM49AgEGBSuBBAAKBG0wawIBAQQgAYCXwnhqMT6fCIKIkQ0w
+cac7QqHrn4TCQMF9a+im74WhRANCAATwCjyGuP8xQbvVjznqazL36oeAnD32I+X2
++wscW3OmyTDpk41HaWYPh+j+BoufsSkCwf8dBRGEQbCieZbbZogy
+-----END PRIVATE KEY-----');
+        $this->assertSameNL('secp256k1', $key->getCurve());
+        $this->assertSameNL($expected, $key->toString('PKCS8'));
+    }
+
+    // openssl ecparam -name secp256k1 -genkey -noout -out secp256k1.pem -param_enc explicit
+    // openssl pkcs8 -topk8 -nocrypt -in secp256k1.pem -out secp256k1-2.pem
+    public function testPKCS8PrivateKeySpecifiedCurve(): void
+    {
+        $key = PublicKeyLoader::load('-----BEGIN PRIVATE KEY-----
+MIIBIwIBADCBrgYHKoZIzj0CATCBogIBATAsBgcqhkjOPQEBAiEA////////////
+/////////////////////////v///C8wBgQBAAQBBwRBBHm+Zn753LusVaBilc6H
+CwcCm/zbLc4o2VnygVsW+BeYSDradyajxGVdpPv8DhEIqP0XtEimhVQZnEfQj/sQ
+1LgCIQD////////////////////+uq7c5q9IoDu/0l6M0DZBQQIBAQRtMGsCAQEE
+IKFfw3vfd5pqA5SZOTFtpr7hdJoKP/rmTPMCggkAOA35oUQDQgAEnX66+UCzUW3T
+/fkLGIIfZjJm5bIMwAV85LpDom2hI441JRx+/W4WqtGuW+B/LABS6ZHp+qzepThC
+HsjS3Q9Pew==
+-----END PRIVATE KEY-----');
+        $this->assertSameNL('secp256k1', $key->getCurve());
+
+        // see testPKCS1PrivateKeySpecifiedCurve for an explanation
+        // of how this key and the above key differ
+        $expected = '-----BEGIN PRIVATE KEY-----
+MIIBXgIBADCB6QYHKoZIzj0CATCB3QIBATAsBgcqhkjOPQEBAiEA////////////
+/////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEE
+eb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio
+/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQ
+NkFBBG0wawIBAQQgoV/De993mmoDlJk5MW2mvuF0mgo/+uZM8wKCCQA4DfmhRANC
+AASdfrr5QLNRbdP9+QsYgh9mMmblsgzABXzkukOibaEjjjUlHH79bhaq0a5b4H8s
+AFLpken6rN6lOEIeyNLdD097
+-----END PRIVATE KEY-----';
+        PKCS8::useSpecifiedCurve();
+        $this->assertSameNL($expected, $key->toString('PKCS8'));
+    }
+
+    // openssl ecparam -name sect113r1 -genkey -noout -out sect113r1.pem
+    public function testBinaryPKCS1PrivateKey(): void
+    {
+        $key = PublicKeyLoader::load('-----BEGIN EC PRIVATE KEY-----
+MEECAQEEDwBZdP4eSzKk/uQa6jdtfKAHBgUrgQQABKEiAyAABAHqCoNb++mK5qvE
+c4rCzQEuI19czqvXpEPcAWSXew==
+-----END EC PRIVATE KEY-----');
+        $this->assertSameNL('sect113r1', $key->getCurve());
+
+        // the difference between this and the above key is that
+        // the privateKey part of the above key has a leading null
+        // byte whereas this one doesn't
+        $expected = '-----BEGIN EC PRIVATE KEY-----
+MEACAQEEDll0/h5LMqT+5BrqN218oAcGBSuBBAAEoSIDIAAEAeoKg1v76Yrmq8Rz
+isLNAS4jX1zOq9ekQ9wBZJd7
+-----END EC PRIVATE KEY-----';
+
+        PKCS1::useNamedCurve();
+        $this->assertSameNL($expected, $key->toString('PKCS1'));
+    }
+
+    // openssl ecparam -name sect113r1 -genkey -noout -out sect113r1.pem -param_enc explicit
+    public function testBinaryPKCS1PrivateKeySpecifiedCurve(): void
+    {
+        $key = PublicKeyLoader::load('-----BEGIN EC PRIVATE KEY-----
+MIHNAgEBBA8AuSc4BeeyYTq9rbSDuL2ggZIwgY8CAQEwHAYHKoZIzj0BAjARAgFx
+BgkqhkjOPQECAwICAQkwNwQOMIglDKbnx/5knOhYIPcEDui+5NPiJgdEGIvg6ccj
+AxUAEOcjqxTWluZ2h1YVF1b+v4/LSakEHwQAnXNhbzX0qxQH1zViwQ8ApSgwJ3lY
+7oTRMV7TGIYCDwEAAAAAAAAA2czsijnlbwIBAqEiAyAABAFC7c50y7uw+iuHeMCt
+WwCpKNBUcVeiHme609Dv/g==
+-----END EC PRIVATE KEY-----');
+        $this->assertSameNL('sect113r1', $key->getCurve());
+
+        // this key and the above key have a few small differences.
+        // the above key has the (optional) seed for the verifiably
+        // random function whereas the following key does not.
+        // also, in the above key the cofactor (1; optional) is
+        // included whereas in the following key it is not;
+        // finally, in the above the privateKey has a leading null
+        // byte whereas it doesn't in the following key
+        $expected = '-----BEGIN EC PRIVATE KEY-----
+MIGwAgEBBA65JzgF57JhOr2ttIO4vaB3MHUCAQEwHAYHKoZIzj0BAjARAgFxBgkq
+hkjOPQECAwICAQkwIAQOMIglDKbnx/5knOhYIPcEDui+5NPiJgdEGIvg6ccjBB8E
+AJ1zYW819KsUB9c1YsEPAKUoMCd5WO6E0TFe0xiGAg8BAAAAAAAAANnM7Io55W+h
+IgMgAAQBQu3OdMu7sPorh3jArVsAqSjQVHFXoh5nutPQ7/4=
+-----END EC PRIVATE KEY-----';
+        PKCS1::useSpecifiedCurve();
+        $this->assertSameNL($expected, $key->toString('PKCS1'));
+    }
+
+    // openssl ecparam -name sect113r1 -genkey -noout -out sect113r1.pem
+    // openssl pkcs8 -topk8 -nocrypt -in sect113r1.pem -out sect113r1-2.pem
+    // sect113r1's reduction polynomial is a trinomial
+    public function testBinaryPKCS8PrivateKey(): void
+    {
+        $key = PublicKeyLoader::load('-----BEGIN PRIVATE KEY-----
+MFECAQAwEAYHKoZIzj0CAQYFK4EEAAQEOjA4AgEBBA8A5OuqAY8HYoFOaz9mE6mh
+IgMgAAQASF3rOTPXvH0QdRBvsrMBdLMf27yd8AWABrZTxvI=
+-----END PRIVATE KEY-----');
+        $this->assertSameNL('sect113r1', $key->getCurve());
+
+        // the difference between this and the above key is that
+        // the privateKey part of the above key has a leading null
+        // byte whereas this one doesn't
+        $expected = '-----BEGIN PRIVATE KEY-----
+MFACAQAwEAYHKoZIzj0CAQYFK4EEAAQEOTA3AgEBBA7k66oBjwdigU5rP2YTqaEi
+AyAABABIXes5M9e8fRB1EG+yswF0sx/bvJ3wBYAGtlPG8g==
+-----END PRIVATE KEY-----';
+
+        PKCS8::useNamedCurve();
+        $this->assertSameNL($expected, $key->toString('PKCS8'));
+    }
+
+    // openssl ecparam -name sect113r1 -genkey -noout -out sect113r1.pem -param_enc explicit
+    // openssl pkcs8 -topk8 -nocrypt -in sect113r1.pem -out sect113r1-2.pem
+    public function testBinaryPKCS8PrivateKeySpecifiedCurve(): void
+    {
+        $key = PublicKeyLoader::load('-----BEGIN PRIVATE KEY-----
+MIHdAgEAMIGbBgcqhkjOPQIBMIGPAgEBMBwGByqGSM49AQIwEQIBcQYJKoZIzj0B
+AgMCAgEJMDcEDjCIJQym58f+ZJzoWCD3BA7ovuTT4iYHRBiL4OnHIwMVABDnI6sU
+1pbmdodWFRdW/r+Py0mpBB8EAJ1zYW819KsUB9c1YsEPAKUoMCd5WO6E0TFe0xiG
+Ag8BAAAAAAAAANnM7Io55W8CAQIEOjA4AgEBBA8AXtfDMRsRTx8snPbWHquhIgMg
+AAQA9xdWGJ6vV23+vkdq0C8BLJVg5E3amMyf/5keGa4=
+-----END PRIVATE KEY-----');
+        $this->assertSameNL('sect113r1', $key->getCurve());
+
+        // see testBinaryPKCS1PrivateKeySpecifiedCurve() for an
+        // explanation of the differences between the above key
+        // and the following key
+        $expected = '-----BEGIN PRIVATE KEY-----
+MIHBAgEAMIGABgcqhkjOPQIBMHUCAQEwHAYHKoZIzj0BAjARAgFxBgkqhkjOPQEC
+AwICAQkwIAQOMIglDKbnx/5knOhYIPcEDui+5NPiJgdEGIvg6ccjBB8EAJ1zYW81
+9KsUB9c1YsEPAKUoMCd5WO6E0TFe0xiGAg8BAAAAAAAAANnM7Io55W8EOTA3AgEB
+BA5e18MxGxFPHyyc9tYeq6EiAyAABAD3F1YYnq9Xbf6+R2rQLwEslWDkTdqYzJ//
+mR4Zrg==
+-----END PRIVATE KEY-----';
+        PKCS8::useSpecifiedCurve();
+        $this->assertSameNL($expected, $key->toString('PKCS8'));
+    }
+
+    // openssl ecparam -name sect131r1 -genkey -noout -out sect131r1.pem -param_enc explicit
+    // sect131r1's reduction polynomial is a pentanomial
+    public function testBinaryPentanomialPKCS1PrivateKey(): void
+    {
+        $key = PublicKeyLoader::load('-----BEGIN EC PRIVATE KEY-----
+MIHoAgEBBBECPEK9NCISWf2riBsORoTM+6CBpzCBpAIBATAlBgcqhkjOPQECMBoC
+AgCDBgkqhkjOPQECAwMwCQIBAgIBAwIBCDA9BBEHoRsJp2tWIURBj/P/jCVwuAQR
+AhfAVhCIS2O5xscpFnj500EDFQBNaW5naHVhUXWYW9OtutohtDqX4gQjBACBuvkf
+35gzxA+cGBNDY4OZB4xufqOMAB9zyBNLG0754VACEQQAAAAAAAAAAjEjlTqUZLVN
+AgECoSYDJAAEBEIolGjo5lnsYqNagqYPOaEGOglkllDO2aWPtB6n+x/WXw==
+-----END EC PRIVATE KEY-----');
+        $this->assertSameNL('sect131r1', $key->getCurve());
+
+        // see testBinaryPKCS1PrivateKeySpecifiedCurve() for an
+        // explanation of the differences between the above key
+        // and the following key
+        $expected = '-----BEGIN EC PRIVATE KEY-----
+MIHOAgEBBBECPEK9NCISWf2riBsORoTM+6CBjTCBigIBATAlBgcqhkjOPQECMBoC
+AgCDBgkqhkjOPQECAwMwCQIBAgIBAwIBCDAmBBEHoRsJp2tWIURBj/P/jCVwuAQR
+AhfAVhCIS2O5xscpFnj500EEIwQAgbr5H9+YM8QPnBgTQ2ODmQeMbn6jjAAfc8gT
+SxtO+eFQAhEEAAAAAAAAAAIxI5U6lGS1TaEmAyQABARCKJRo6OZZ7GKjWoKmDzmh
+BjoJZJZQztmlj7Qep/sf1l8=
+-----END EC PRIVATE KEY-----';
+        PKCS1::useSpecifiedCurve();
+        $this->assertSameNL($expected, $key->toString('PKCS1'));
+    }
+
+    // from https://tools.ietf.org/html/draft-ietf-curdle-pkix-07#section-10.1
+    public function testEd25519PublicKey(): void
+    {
+        $expected = '-----BEGIN PUBLIC KEY-----
+MCowBQYDK2VwAyEAGb9ECWmEzf6FQbrBZ9w7lshQhqowtrbLDFw4rXAxZuE=
+-----END PUBLIC KEY-----';
+        $key = PublicKeyLoader::load($expected);
+        $this->assertSameNL('Ed25519', $key->getCurve());
+        $this->assertSameNL($expected, $key->toString('PKCS8'));
+    }
+
+    // from https://tools.ietf.org/html/draft-ietf-curdle-pkix-07#section-10.3
+    public function testEd25519PrivateKey(): void
+    {
+        // without public key (public key should be derived)
+        $expected = '-----BEGIN PRIVATE KEY-----
+MC4CAQAwBQYDK2VwBCIEINTuctv5E1hK1bbY8fdp+K06/nwoy/HU++CXqI9EdVhC
+-----END PRIVATE KEY-----';
+        $key = PublicKeyLoader::load($expected);
+        $this->assertSameNL($expected, $key->toString('PKCS8'));
+        $this->assertSameNL('Ed25519', $key->getCurve());
+        $this->assertSameNL('Ed25519', $key->getPublicKey()->getCurve());
+
+        // with public key
+        $key = PublicKeyLoader::load('-----BEGIN PRIVATE KEY-----
+MHICAQEwBQYDK2VwBCIEINTuctv5E1hK1bbY8fdp+K06/nwoy/HU++CXqI9EdVhC
+oB8wHQYKKoZIhvcNAQkJFDEPDA1DdXJkbGUgQ2hhaXJzgSEAGb9ECWmEzf6FQbrB
+Z9w7lshQhqowtrbLDFw4rXAxZuE=
+-----END PRIVATE KEY-----');
+        $this->assertSameNL('Ed25519', $key->getCurve());
+        $this->assertSameNL('Ed25519', $key->getPublicKey()->getCurve());
+
+        // the above key not only omits NULL - it also includes a
+        // unstructuredName attribute with a value of "Curdle Chairs"
+        // that the following key does not have
+        $key = PublicKeyLoader::load('-----BEGIN PRIVATE KEY-----
+MFMCAQEwBwYDK2VwBQAEIgQg1O5y2/kTWErVttjx92n4rTr+fCjL8dT74Jeoj0R1
+WEKBIQAZv0QJaYTN/oVBusFn3DuWyFCGqjC2tssMXDitcDFm4Q==
+-----END PRIVATE KEY-----');
+        $this->assertSameNL('Ed25519', $key->getCurve());
+        $this->assertSameNL('Ed25519', $key->getPublicKey()->getCurve());
+    }
+
+    // Generate with:
+    // openssl genpkey -algorithm ed448 | openssl ec -pubout
+    public function testEd448PublicKey(): void
+    {
+        $expected = '-----BEGIN PUBLIC KEY-----
+MEMwBQYDK2VxAzoAsA7zbld48IfDhm7Qd6FYrvnljtjhPRRqZi04NWyj8VXrWe1x
+BMLQFJEE0JDmKayUWpUWsRXwmb6A
+-----END PUBLIC KEY-----';
+        $key = PublicKeyLoader::load($expected);
+        $this->assertSameNL('Ed448', $key->getCurve());
+        $this->assertSameNL($expected, $key->toString('PKCS8'));
+    }
+
+    // Generate with:
+    // openssl genpkey -algorithm ed448
+    public function testEd448PrivateKey(): void
+    {
+        $expected = '-----BEGIN PRIVATE KEY-----
+MEcCAQAwBQYDK2VxBDsEOettXaJYob4hJNKJNOD+FfMvdesLKNp0KwochI6AKmAb
+tWhtkn99WOjd1PsGMh9zz2Vhdg3MwasOMQ==
+-----END PRIVATE KEY-----';
+        $key = PublicKeyLoader::load($expected);
+        $this->assertSameNL($expected, $key->toString('PKCS8'));
+        $this->assertSameNL('Ed448', $key->getCurve());
+        $this->assertSameNL('Ed448', $key->getPublicKey()->getCurve());
+    }
+
+    public function testPuTTYnistp256(): void
+    {
+        $key = PublicKeyLoader::load($expected = 'PuTTY-User-Key-File-2: ecdsa-sha2-nistp256
+Encryption: none
+Comment: ecdsa-key-20181105
+Public-Lines: 3
+AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJEXCsWA8s18
+m25MJlVE1urbXPYFi4q8oMbb2H0kE2f5WPxizsKXRmb1J68paXQizryL9fC4FTqI
+CJ1+UnaPfk0=
+Private-Lines: 1
+AAAAIQDwaPlajbXY1SxhuwsUqN1CEZ5g4adsbmJsKm+ZbUVm4g==
+Private-MAC: b85ca0eb7c612df5d18af85128821bd53faaa3ef
+');
+        $this->assertSameNL('secp256r1', $key->getCurve());
+
+        PuTTY::setComment('ecdsa-key-20181105');
+        $this->assertSameNL($expected, $key->toString('PuTTY'));
+
+        $key = PublicKeyLoader::load($expected = 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJEXCsWA8s18m25MJlVE1urbXPYFi4q8oMbb2H0kE2f5WPxizsKXRmb1J68paXQizryL9fC4FTqICJ1+UnaPfk0= ecdsa-key-20181105');
+        $this->assertSameNL('secp256r1', $key->getCurve());
+
+        OpenSSH::setComment('ecdsa-key-20181105');
+        $this->assertSameNL($expected, $key->toString('OpenSSH'));
+    }
+
+    public function testPuTTYnistp384(): void
+    {
+        $key = PublicKeyLoader::load($expected = 'PuTTY-User-Key-File-2: ecdsa-sha2-nistp384
+Encryption: none
+Comment: ecdsa-key-20181105
+Public-Lines: 3
+AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBOI53wHG3Cdc
+AJZq5PXWZAEAxxsNVFQlQgOX9toWEOgqQF5LbK2nWLKRvaHMzocUXaTYZDccSS0A
+TZFPT3j1Er1LU9cu4PHpyS07v262jdzkxIvKCPcAeISuV80MC7rHog==
+Private-Lines: 2
+AAAAMQCEMkGMDg6N7bUqdvLXe0YmY4qBSi8hmAuMvU38RDoVFVmV+R4RYmMueyrX
+be9Oyus=
+Private-MAC: 97a990a3d5f6b8f268d4be9c4ab9ebfd8fa79849
+');
+        $this->assertSameNL('secp384r1', $key->getCurve());
+
+        PuTTY::setComment('ecdsa-key-20181105');
+        $this->assertSameNL($expected, $key->toString('PuTTY'));
+
+        $key = PublicKeyLoader::load($expected = 'ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBOI53wHG3CdcAJZq5PXWZAEAxxsNVFQlQgOX9toWEOgqQF5LbK2nWLKRvaHMzocUXaTYZDccSS0ATZFPT3j1Er1LU9cu4PHpyS07v262jdzkxIvKCPcAeISuV80MC7rHog== ecdsa-key-20181105');
+        $this->assertSameNL('secp384r1', $key->getCurve());
+
+        OpenSSH::setComment('ecdsa-key-20181105');
+        $this->assertSameNL($expected, $key->toString('OpenSSH'));
+    }
+
+    public function testPuTTYnistp521(): void
+    {
+        $key = PublicKeyLoader::load($expected = 'PuTTY-User-Key-File-2: ecdsa-sha2-nistp521
+Encryption: none
+Comment: ecdsa-key-20181105
+Public-Lines: 4
+AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAF1Eg0MjaJw
+ooFj6HCNh4RWbvmQRY+sdczJyBdT3EaTc/6IUcCfW7w7rAeRp2CDdE9RlAVD8IuL
+qW7DJH06Xeov8wBO5G6jUqXu0rlHsOSiC6VcCxBJuWVNB1IorHnS7PX0f6HdLlIE
+me73P77drqpn5YY0XLtP6hFrF7H5XfCxpNyaJA==
+Private-Lines: 2
+AAAAQgHJl8/dIArolFymdzhagXCfd2l8UF3CQXWGVGDQ0R04nnntlyztYiVdRXXK
+r84NnzS7dJcAsR9YaUOZ69NRKNiUAQ==
+Private-MAC: 6d49ce289b85549a43d74422dd8bb3ba8798c72c
+');
+        $this->assertSameNL('secp521r1', $key->getCurve());
+
+        PuTTY::setComment('ecdsa-key-20181105');
+        $this->assertSameNL($expected, $key->toString('PuTTY'));
+
+        $key = PublicKeyLoader::load($expected = 'ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAF1Eg0MjaJwooFj6HCNh4RWbvmQRY+sdczJyBdT3EaTc/6IUcCfW7w7rAeRp2CDdE9RlAVD8IuLqW7DJH06Xeov8wBO5G6jUqXu0rlHsOSiC6VcCxBJuWVNB1IorHnS7PX0f6HdLlIEme73P77drqpn5YY0XLtP6hFrF7H5XfCxpNyaJA== ecdsa-key-20181105');
+        $this->assertSameNL('secp521r1', $key->getCurve());
+
+        OpenSSH::setComment('ecdsa-key-20181105');
+        $this->assertSameNL($expected, $key->toString('OpenSSH'));
+    }
+
+    public function testPuTTYed25519(): void
+    {
+        $key = PublicKeyLoader::load($expected = 'PuTTY-User-Key-File-2: ssh-ed25519
+Encryption: none
+Comment: ed25519-key-20181105
+Public-Lines: 2
+AAAAC3NzaC1lZDI1NTE5AAAAIC6I6RyYAqtBcWXws9EDqGbhFtc5rKG4NMn/G7te
+mQtu
+Private-Lines: 1
+AAAAIAHu1uI7dxFzo/SleEI2CekXKmgqlXwOgvfaRWxiX4Jd
+Private-MAC: 8a06821a1c8b8b40fc40f876e543c4ea3fb81bb9
+');
+        $this->assertSameNL('Ed25519', $key->getCurve());
+
+        PuTTY::setComment('ed25519-key-20181105');
+        $this->assertSameNL($expected, $key->toString('PuTTY'));
+
+        $key = PublicKeyLoader::load($expected = 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC6I6RyYAqtBcWXws9EDqGbhFtc5rKG4NMn/G7temQtu ed25519-key-20181105');
+        $this->assertSameNL('Ed25519', $key->getCurve());
+
+        OpenSSH::setComment('ed25519-key-20181105');
+        $this->assertSameNL($expected, $key->toString('OpenSSH'));
+    }
+
+    public function testlibsodium(): void
+    {
+        if (!function_exists('sodium_crypto_sign_keypair')) {
+            self::markTestSkipped('libsodium extension is not available.');
+        }
+
+        $kp = sodium_crypto_sign_keypair();
+
+        $key = EC::loadFormat('libsodium', $expected = sodium_crypto_sign_secretkey($kp));
+        $this->assertSameNL('Ed25519', $key->getCurve());
+        $this->assertSameNL($expected, $key->toString('libsodium'));
+
+        $key = EC::loadFormat('libsodium', $expected = sodium_crypto_sign_publickey($kp));
+        $this->assertSameNL('Ed25519', $key->getCurve());
+        $this->assertSameNL($expected, $key->toString('libsodium'));
+    }
+
+    // ssh-keygen -t ed25519
+    public function testOpenSSHPrivateKey(): void
+    {
+        $key = PublicKeyLoader::load('-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+QyNTUxOQAAACCpm7dS1/WDTW+uuhp2+aFLPKaJle6+oJqDGLXhlQAX4AAAAJg8TmN5PE5j
+eQAAAAtzc2gtZWQyNTUxOQAAACCpm7dS1/WDTW+uuhp2+aFLPKaJle6+oJqDGLXhlQAX4A
+AAAEDltCTSbrr42IS4hhkS6ly0W2XItRQwxjLT+03bIyA+V6mbt1LX9YNNb666Gnb5oUs8
+pomV7r6gmoMYteGVABfgAAAAD3ZhZ3JhbnRAdmFncmFudAECAwQFBg==
+-----END OPENSSH PRIVATE KEY-----');
+        $this->assertSameNL('Ed25519', $key->getCurve());
+
+        // testing this key is a little difficult because of this format's
+        // two back to back checkint fields. both fields correspond to the
+        // same randomly generated number. ostensibly this let's you verify
+        // successful decryption of encrypted keys but phpseclib doesn't
+        // support encrypted keys
+        // none-the-less, because of the randomized component we can't easily
+        // see if the key string is equal to another known string
+        $key2 = PublicKeyLoader::load($key->toString('OpenSSH'));
+        $this->assertSameNL('Ed25519', $key2->getCurve());
+    }
+
+    // from https://www.w3.org/TR/xmldsig-core/#sec-RFC4050Compat
+    public function testXMLKey(): void
+    {
+        $key = PublicKeyLoader::load($orig = '<ECDSAKeyValue xmlns="http://www.w3.org/2001/04/xmldsig-more#">
+<DomainParameters>
+  <NamedCurve URN="urn:oid:1.2.840.10045.3.1.7" />
+</DomainParameters>
+<PublicKey>
+  <X Value="58511060653801744393249179046482833320204931884267326155134056258624064349885" />
+  <Y Value="102403352136827775240910267217779508359028642524881540878079119895764161434936" />
+</PublicKey>
+</ECDSAKeyValue>');
+        $this->assertSameNL('secp256r1', $key->getCurve());
+
+        XML::enableRFC4050Syntax();
+
+        $dom = new \DOMDocument();
+        $dom->preserveWhiteSpace = false;
+        $dom->loadXML($orig);
+        $expected = $dom->C14N();
+
+        //$dom = new DOMDocument();
+        //$dom->preserveWhiteSpace = false;
+        $dom->loadXML($key->toString('XML'));
+        $actual = $dom->C14N();
+
+        $this->assertSameNL($expected, $actual);
+    }
+
+    public function assertSameNL($expected, $actual, $message = ''): void
+    {
+        $expected = str_replace("\r\n", "\n", $expected);
+        $actual = str_replace("\r\n", "\n", $actual);
+        $this->assertSame($expected, $actual, $message);
+    }
+
+    public function testOpenSSHPrivateEC(): void
+    {
+        $key = '-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAaAAAABNlY2RzYS
+1zaGEyLW5pc3RwMjU2AAAACG5pc3RwMjU2AAAAQQTk2tbDiyQPzljR+LLIsMzJiwqkfHkG
+StUt3kO00FKMoYv3RJfP6mqdE3E3pPcT5cBg4yB+KzYsYDxwuBc03oQcAAAAqCTU2l0k1N
+pdAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOTa1sOLJA/OWNH4
+ssiwzMmLCqR8eQZK1S3eQ7TQUoyhi/dEl8/qap0TcTek9xPlwGDjIH4rNixgPHC4FzTehB
+wAAAAgZ8mK8+EsQ46susQn4mwMNmpvTaKX9Q9KDvOrzotP2qgAAAAMcm9vdEB2YWdyYW50
+AQIDBA==
+-----END OPENSSH PRIVATE KEY-----';
+
+        $key = PublicKeyLoader::load($key);
+
+        $key2 = PublicKeyLoader::load($key->toString('OpenSSH'));
+        $this->assertInstanceOf(PrivateKey::class, $key2);
+
+        $sig = $key->sign('zzz');
+
+        $key = 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOTa1sOLJA/OWNH4ssiwzMmLCqR8eQZK1S3eQ7TQUoyhi/dEl8/qap0TcTek9xPlwGDjIH4rNixgPHC4FzTehBw= root@vagrant';
+        $key = PublicKeyLoader::load($key);
+
+        $this->assertTrue($key->verify('zzz', $sig));
+    }
+
+    public function testOpenSSHPrivateEd25519(): void
+    {
+        $key = '-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+QyNTUxOQAAACChhCZwqkIh43AfURPOgbyYeZRCKvd4jFcyAK4xmiqxQwAAAJDqGgwS6hoM
+EgAAAAtzc2gtZWQyNTUxOQAAACChhCZwqkIh43AfURPOgbyYeZRCKvd4jFcyAK4xmiqxQw
+AAAEDzL/Yl1Vr/5MxhIIEkVKXBMEIumVG8gUjT9i2PTGSehqGEJnCqQiHjcB9RE86BvJh5
+lEIq93iMVzIArjGaKrFDAAAADHJvb3RAdmFncmFudAE=
+-----END OPENSSH PRIVATE KEY-----';
+
+        $key = PublicKeyLoader::load($key);
+        $sig = $key->sign('zzz');
+        $sig2 = $key->withSignatureFormat('SSH2')->sign('zzz');
+
+        $key = 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKGEJnCqQiHjcB9RE86BvJh5lEIq93iMVzIArjGaKrFD root@vagrant';
+        $key = PublicKeyLoader::load($key);
+
+        $this->assertTrue($key->verify('zzz', $sig));
+        $this->assertTrue($key->withSignatureFormat('SSH2')->verify('zzz', $sig2));
+    }
+
+    /**
+     * @group github1712
+     */
+    public function testKeyTooLarge(): void
+    {
+        $this->expectException('RangeException');
+
+        $key = '-----BEGIN PRIVATE KEY-----
+MIIEDwIBADATBgcqhkjOPQIBBggqhkjOPQMBBwSCA/MwggPvAgEBBIID6P//////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////8=
+-----END PRIVATE KEY-----';
+
+        $private = EC::loadFormat('PKCS8', $key);
+    }
+
+    /**
+     * @group github1712
+     */
+    public function testLargeCurve25519Key(): void
+    {
+        $raw = pack('H*', '8426220e7a57dc8d685d3966e3a23600e32563ce6033e07d0c89dbb5bd296577');
+        $key = EC::loadFormat('MontgomeryPrivate', $raw);
+
+        $this->assertSameNL($raw, $key->toString('MontgomeryPrivate'));
+    }
+
+    public function testOpenSSHEncryptedCreation(): void
+    {
+        if (PHP_INT_SIZE == 4) {
+            self::markTestSkipped('32-bit integers slow OpenSSH encrypted keys down too much');
+        }
+
+        $key = EC::createKey('Ed25519');
+        $key = $key->withPassword('test')->toString('OpenSSH');
+
+        $key = PublicKeyLoader::load($key, 'test');
+        $this->assertInstanceOf(PrivateKey::class, $key);
+    }
+
+    public function testECasJWK(): void
+    {
+        // keys are from https://datatracker.ietf.org/doc/html/rfc7517#appendix-A
+
+        $plaintext = 'zzz';
+
+        $key = '     {"keys":
+       [
+         {"kty":"EC",
+          "crv":"P-256",
+          "x":"MKBCTNIcKUSDii11ySs3526iDZ8AiTo7Tu6KPAqv7D4",
+          "y":"4Etl6SRW2YiLUrN5vfvVHuhp7x8PxltmWWlbbM4IFyM",
+          "d":"870MB6gfuTJ4HtUnUvYMyJpr5eUZNP4Bk43bVdj3eAE",
+          "use":"enc",
+          "kid":"1"}
+       ]
+     }';
+
+        $keyWithoutWS = preg_replace('#\s#', '', $key);
+
+        $key = PublicKeyLoader::load($key);
+
+        $phpseclibKey = str_replace('=', '', $key->toString('JWK', [
+            'use' => 'enc',
+            'kid' => '1',
+        ]));
+
+        $this->assertSame($keyWithoutWS, $phpseclibKey);
+
+        $sig = $key->sign($plaintext);
+
+        $key = '{"keys":
+       [
+         {"kty":"EC",
+          "crv":"P-256",
+          "x":"MKBCTNIcKUSDii11ySs3526iDZ8AiTo7Tu6KPAqv7D4",
+          "y":"4Etl6SRW2YiLUrN5vfvVHuhp7x8PxltmWWlbbM4IFyM",
+          "use":"enc",
+          "kid":"1"}
+       ]
+     }';
+
+        $keyWithoutWS = preg_replace('#\s#', '', $key);
+
+        $key = PublicKeyLoader::load($key);
+
+        $phpseclibKey = str_replace('=', '', $key->toString('JWK', [
+            'use' => 'enc',
+            'kid' => '1',
+        ]));
+
+        $this->assertSame($keyWithoutWS, $phpseclibKey);
+
+        $this->assertTrue($key->verify($plaintext, $sig));
+    }
+
+    public function testEd25519asJWK(): void
+    {
+        // keys are from https://www.rfc-editor.org/rfc/rfc8037.html#appendix-A
+
+        $plaintext = 'zzz';
+
+        $key = '   {"kty":"OKP","crv":"Ed25519",
+   "x":"11qYAYKxCrfVS_7TyWQHOg7hcvPapiMlrwIaaPcHURo",
+   "d":"nWGxne_9WmC6hEr0kuwsxERJxWl7MmkZcDusAxyuf2A"}';
+
+        $keyWithoutWS = preg_replace('#\s#', '', $key);
+        $keyWithoutWS = '{"keys":[' . $keyWithoutWS . ']}';
+
+        $key = PublicKeyLoader::load($key);
+
+        $phpseclibKey = str_replace('=', '', $key->toString('JWK'));
+
+        $this->assertSame($keyWithoutWS, $phpseclibKey);
+
+        $sig = $key->sign($plaintext);
+
+        $key = '   {"kty":"OKP","crv":"Ed25519",
+   "x":"11qYAYKxCrfVS_7TyWQHOg7hcvPapiMlrwIaaPcHURo"}';
+
+        $keyWithoutWS = preg_replace('#\s#', '', $key);
+        $keyWithoutWS = '{"keys":[' . $keyWithoutWS . ']}';
+
+        $key = PublicKeyLoader::load($key);
+
+        $phpseclibKey = str_replace('=', '', $key->toString('JWK'));
+
+        $this->assertSame($keyWithoutWS, $phpseclibKey);
+
+        $this->assertTrue($key->verify($plaintext, $sig));
+    }
+
+    public function testNakedPKCS8PubKey(): void
+    {
+        $key = 'MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAErPJyxEu2/oKCrJaaTVTrq39DKJ2XcN6W+k8UvGf+Y/lDWNbFitQocabsDUvSN0edHH3UKP5QPTz4cOlyIPMrXQ==';
+        $key = PublicKeyLoader::load($key);
+        $this->assertInstanceOf(PublicKey::class, $key);
+    }
+
+    public function testMislabledPKCS8PubKey(): void
+    {
+        $this->expectException('\phpseclib3\Exception\NoKeyLoadedException');
+
+        $key = '-----BEGIN PRIVATE KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAErPJyxEu2/oKCrJaaTVTrq39DKJ2X
+cN6W+k8UvGf+Y/lDWNbFitQocabsDUvSN0edHH3UKP5QPTz4cOlyIPMrXQ==
+-----END PUBLIC KEY-----';
+        $key = PublicKeyLoader::load($key);
+        $this->assertInstanceOf(PublicKey::class, $key);
+    }
+
+    /**
+     * @group github1956
+     */
+    public function testIEEESignature(): void
+    {
+        $key = '{"alg":"ES256","crv":"P-256","ext":true,"key_ops":["verify"],"kty":"EC","x":"FKwqyGd4i2NAl8RUXCCBRCAIbcpeGyfyXwgA_AWHb8Y","y":"njxhw5O6zGVkBlcPDKYj0E-6VO1giHTUkJWBhgKNqd8"}';
+        $key = PublicKeyLoader::load($key)->withSignatureFormat('IEEE')->withHash('sha384');
+
+        $signature = 'a4f61518323bac50b4f87a0f766ebb10d1db25358a0a20a98dab20be4e9c3be2d77ff5a8415cfce2967999c73d2a49b2d8c01990f72c04d99ebe3c4ebf75b4e9';
+        $signature = pack('H*', $signature);
+
+        $this->assertTrue($key->verify('hello world!', $signature));
+    }
+
+    public function testExcessivelyLargeBinaryField(): void
+    {
+        $this->expectException('\OutOfBoundsException');
+
+        $key = '-----BEGIN PUBLIC KEY-----
+MIIBDDCB0wYHKoZIzj0CATCBxwIBATAgBgcqhkjOPQECMBUCBH////8GCSqGSM49
+AQIDAgICAMEwTQQZABeFj+t6mJdRaeFx93tAh94JisipEd97AQQZAP37Sb/mw6if
+rK2qeh5bvHzBwuXYMUeIFAMVABA/rsdNaW5naHVhUXV3f8Wxke8wBDMEAfSBvF8P
++Ep0rWzfb970v2F5YlNy2MDF4QAl45nykDcSzPPqnjoa0X+wsyAbavfOGwUCGQEA
+AAAAAAAAAAAAAADH80p3j0Q6zJIOukkCAQIDNAAEAE2mUTAwdPK952h3G8ZinK8B
+z9DYTLdGkQDqox3AtEs9nn6kE1O/vHE4bqMegjj4gbA=
+-----END PUBLIC KEY-----';
+        $key = EC::loadFormat('PKCS8', $key);
+        $this->assertInstanceOf(PublicKey::class, $key);
+    }
+
+    public function testIEEESignatureCreate(): void
+    {
+        $key = PublicKeyLoader::load('-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg7+qVCtyt+tV2hTou
+kbZNIHu+PaE0osExnxdlkiC+VYqhRANCAAS8yEueJvIAnCk++0rsD8X9dk3hAmyb
+4lv6WkjCQU5iksxIG/E60L8IeDZX8+oNzHPjNN5/6MBk0ISrGKyFhlH1
+-----END PRIVATE KEY-----');
+
+        $priv = $key->withSignatureFormat('IEEE');
+        $sig = $priv->sign('ddd');
+
+        $this->assertTrue($key->getPublicKey()->withSignatureFormat('IEEE')->verify('ddd', $sig));
+    }
+}
diff --git a/tests/Unit/Crypt/GCMTest.php b/tests/Unit/Crypt/GCMTest.php
new file mode 100644
index 000000000..16981b955
--- /dev/null
+++ b/tests/Unit/Crypt/GCMTest.php
@@ -0,0 +1,237 @@
+<?php
+
+/**
+ * @author    Andreas Fischer <bantu@phpbb.com>
+ * @copyright 2013 Andreas Fischer
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt;
+
+use phpseclib3\Crypt\AES;
+use phpseclib3\Tests\PhpseclibTestCase;
+
+class GCMTest extends PhpseclibTestCase
+{
+    /**
+     * Produces all combinations of test values.
+     */
+    public static function engine128Vectors(): array
+    {
+        $engines = [
+            'PHP',
+            'Eval',
+            'OpenSSL',
+            'OpenSSL (GCM)',
+        ];
+
+        // test vectors come from the following URL:
+        // http://csrc.nist.gov/groups/ST/toolkit/BCM/documents/proposedmodes/gcm/gcm-spec.pdf
+
+        $p1 = '00000000000000000000000000000000';
+        $p2 = 'd9313225f88406e5a55909c5aff5269a' .
+              '86a7a9531534f7da2e4c303d8a318a72' .
+              '1c3c0c95956809532fcf0e2449a6b525' .
+              'b16aedf5aa0de657ba637b391aafd255';
+        $p3 = 'd9313225f88406e5a55909c5aff5269a' .
+              '86a7a9531534f7da2e4c303d8a318a72' .
+              '1c3c0c95956809532fcf0e2449a6b525' .
+              'b16aedf5aa0de657ba637b39';
+
+        $n1 = '000000000000000000000000';
+        $n2 = 'cafebabefacedbaddecaf888';
+        $n3 = 'cafebabefacedbad';
+        $n4 = '9313225df88406e555909c5aff5269aa' .
+              '6a7a9538534f7da1e4c303d2a318a728' .
+              'c3c0c95156809539fcf0e2429a6b5254' .
+              '16aedbf5a0de6a57a637b39b';
+
+        $k1 = '00000000000000000000000000000000';
+        $k2 = 'feffe9928665731c6d6a8f9467308308';
+
+        $c1 = '0388dace60b6a392f328c2b971b2fe78';
+        $c2 = '42831ec2217774244b7221b784d0d49c' .
+              'e3aa212f2c02a4e035c17e2329aca12e' .
+              '21d514b25466931c7d8f6a5aac84aa05' .
+              '1ba30b396a0aac973d58e091473f5985';
+        $c3 = '42831ec2217774244b7221b784d0d49c' .
+              'e3aa212f2c02a4e035c17e2329aca12e' .
+              '21d514b25466931c7d8f6a5aac84aa05' .
+              '1ba30b396a0aac973d58e091';
+        $c4 = '61353b4c2806934a777ff51fa22a4755' .
+              '699b2a714fcdc6f83766e5f97b6c7423' .
+              '73806900e49f24b22b097544d4896b42' .
+              '4989b5e1ebac0f07c23f4598';
+        $c5 = '8ce24998625615b603a033aca13fb894' .
+              'be9112a5c3a211a8ba262a3cca7e2ca7' .
+              '01e4a9a4fba43c90ccdcb281d48c7c6f' .
+              'd62875d2aca417034c34aee5';
+
+        $a1 = 'feedfacedeadbeeffeedfacedeadbeef' .
+              'abaddad2';
+
+        $subvectors = [
+            // key, plaintext, nonce, aad, ciphertext, tag
+            // Test Case 1
+            [$k1, '', $n1, '', '', '58e2fccefa7e3061367f1d57a4e7455a'],
+            // Test Case 2
+            [$k1, $p1, $n1, '', $c1, 'ab6e47d42cec13bdf53a67b21257bddf'],
+            // Test Case 3
+            [$k2, $p2, $n2, '', $c2, '4d5c2af327cd64a62cf35abd2ba6fab4'],
+            // Test Case 4
+            [$k2, $p3, $n2, $a1, $c3, '5bc94fbc3221a5db94fae95ae7121a47'],
+            // Test Case 5
+            [$k2, $p3, $n3, $a1, $c4, '3612d2e79e3b0785561be14aaca2fccb'],
+            // Test Case 6
+            [$k2, $p3, $n4, $a1, $c5, '619cc5aefffe0bfa462af43c1699d050'],
+        ];
+
+        $vectors = [];
+        for ($i = 0; $i < count($subvectors); $i++) {
+            for ($j = 0; $j < count($subvectors[$i]); $j++) {
+                $subvectors[$i][$j] = pack('H*', $subvectors[$i][$j]);
+            }
+            foreach ($engines as $engine) {
+                $temp = $subvectors[$i];
+                array_unshift($temp, $engine);
+                $vectors[] = $temp;
+            }
+        }
+
+        return $vectors;
+    }
+
+    /**
+     * @dataProvider engine128Vectors
+     */
+    public function test128Vectors($engine, $key, $plaintext, $nonce, $aad, $ciphertext, $tag): void
+    {
+        $aes = new AES('gcm');
+        $aes->setKey($key);
+        $aes->setNonce($nonce);
+        $aes->setAAD($aad);
+
+        if (!$aes->isValidEngine($engine)) {
+            self::markTestSkipped("Unable to initialize $engine engine");
+        }
+        $aes->setPreferredEngine($engine);
+
+        $ciphertext2 = $aes->encrypt($plaintext);
+        $this->assertEquals($ciphertext, $ciphertext2);
+        $this->assertEquals($tag, $aes->getTag());
+        $aes->setTag($tag);
+        $this->assertEquals($plaintext, $aes->decrypt($ciphertext));
+    }
+
+    /**
+     * Produces all combinations of test values.
+     */
+    public static function engine256Vectors(): array
+    {
+        $engines = [
+            'PHP',
+            'Eval',
+            'OpenSSL',
+            'OpenSSL (GCM)',
+            'libsodium',
+        ];
+
+        $p1 = '00000000000000000000000000000000';
+        $p2 = 'd9313225f88406e5a55909c5aff5269a' .
+              '86a7a9531534f7da2e4c303d8a318a72' .
+              '1c3c0c95956809532fcf0e2449a6b525' .
+              'b16aedf5aa0de657ba637b391aafd255';
+        $p3 = 'd9313225f88406e5a55909c5aff5269a' .
+              '86a7a9531534f7da2e4c303d8a318a72' .
+              '1c3c0c95956809532fcf0e2449a6b525' .
+              'b16aedf5aa0de657ba637b39';
+
+        $n1 = '000000000000000000000000';
+        $n2 = 'cafebabefacedbaddecaf888';
+        $n3 = 'cafebabefacedbad';
+        $n4 = '9313225df88406e555909c5aff5269aa' .
+              '6a7a9538534f7da1e4c303d2a318a728' .
+              'c3c0c95156809539fcf0e2429a6b5254' .
+              '16aedbf5a0de6a57a637b39b';
+
+        $k1 = '00000000000000000000000000000000' .
+              '00000000000000000000000000000000';
+        $k2 = 'feffe9928665731c6d6a8f9467308308' .
+              'feffe9928665731c6d6a8f9467308308';
+
+        $c1 = 'cea7403d4d606b6e074ec5d3baf39d18';
+        $c2 = '522dc1f099567d07f47f37a32a84427d' .
+              '643a8cdcbfe5c0c97598a2bd2555d1aa' .
+              '8cb08e48590dbb3da7b08b1056828838' .
+              'c5f61e6393ba7a0abcc9f662898015ad';
+        $c3 = '522dc1f099567d07f47f37a32a84427d' .
+              '643a8cdcbfe5c0c97598a2bd2555d1aa' .
+              '8cb08e48590dbb3da7b08b1056828838' .
+              'c5f61e6393ba7a0abcc9f662';
+        $c4 = 'c3762df1ca787d32ae47c13bf19844cb' .
+              'af1ae14d0b976afac52ff7d79bba9de0' .
+              'feb582d33934a4f0954cc2363bc73f78' .
+              '62ac430e64abe499f47c9b1f';
+        $c5 = '5a8def2f0c9e53f1f75d7853659e2a20' .
+              'eeb2b22aafde6419a058ab4f6f746bf4' .
+              '0fc0c3b780f244452da3ebf1c5d82cde' .
+              'a2418997200ef82e44ae7e3f';
+
+        $a1 = 'feedfacedeadbeeffeedfacedeadbeef' .
+              'abaddad2';
+
+        $subvectors = [
+            // key, plaintext, nonce, aad, ciphertext, tag
+            // Test Case 13
+            [$k1, '', $n1, '', '', '530f8afbc74536b9a963b4f1c4cb738b'],
+            // Test Case 14
+            [$k1, $p1, $n1, '', $c1, 'd0d1c8a799996bf0265b98b5d48ab919'],
+            // Test Case 15
+            [$k2, $p2, $n2, '', $c2, 'b094dac5d93471bdec1a502270e3cc6c'],
+            // Test Case 16
+            [$k2, $p3, $n2, $a1, $c3, '76fc6ece0f4e1768cddf8853bb2d551b'],
+            // Test Case 17
+            [$k2, $p3, $n3, $a1, $c4, '3a337dbf46a792c45e454913fe2ea8f2'],
+            // Test Case 18
+            [$k2, $p3, $n4, $a1, $c5, 'a44a8266ee1c8eb0c8b5d4cf5ae9f19a'],
+        ];
+
+        $vectors = [];
+        for ($i = 0; $i < count($subvectors); $i++) {
+            for ($j = 0; $j < count($subvectors[$i]); $j++) {
+                $subvectors[$i][$j] = pack('H*', $subvectors[$i][$j]);
+            }
+            foreach ($engines as $engine) {
+                $temp = $subvectors[$i];
+                array_unshift($temp, $engine);
+                $vectors[] = $temp;
+            }
+        }
+
+        return $vectors;
+    }
+
+    /**
+     * @dataProvider engine256Vectors
+     */
+    public function test256Vectors($engine, $key, $plaintext, $nonce, $aad, $ciphertext, $tag): void
+    {
+        $aes = new AES('gcm');
+        $aes->setKey($key);
+        $aes->setNonce($nonce);
+        $aes->setAAD($aad);
+
+        if (!$aes->isValidEngine($engine)) {
+            self::markTestSkipped("Unable to initialize $engine engine");
+        }
+        $aes->setPreferredEngine($engine);
+
+        $ciphertext2 = $aes->encrypt($plaintext);
+        $this->assertEquals($ciphertext, $ciphertext2);
+        $this->assertEquals($tag, $aes->getTag());
+        $aes->setTag($tag);
+        $this->assertEquals($plaintext, $aes->decrypt($ciphertext));
+    }
+}
diff --git a/tests/Unit/Crypt/HashTest.php b/tests/Unit/Crypt/HashTest.php
index 72779ea18..0d9e455fe 100644
--- a/tests/Unit/Crypt/HashTest.php
+++ b/tests/Unit/Crypt/HashTest.php
@@ -1,15 +1,22 @@
 <?php
+
 /**
  * @author    Andreas Fischer <bantu@phpbb.com>
  * @copyright 2012 Andreas Fischer
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\Crypt\Hash;
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt;
 
-class Unit_Crypt_HashTest extends PhpseclibTestCase
+use phpseclib3\Crypt\Hash;
+use phpseclib3\Exception\UnsupportedAlgorithmException;
+use phpseclib3\Tests\PhpseclibTestCase;
+
+class HashTest extends PhpseclibTestCase
 {
-    protected function assertHashesTo($hash, $message, $expected)
+    protected function assertHashesTo($hash, $message, $expected): void
     {
         $hash = new Hash($hash);
 
@@ -20,7 +27,7 @@ protected function assertHashesTo($hash, $message, $expected)
         );
     }
 
-    protected function assertHMACsTo($hash, $key, $message, $expected)
+    protected function assertHMACsTo($hash, $key, $message, $expected): void
     {
         $hash = new Hash($hash);
         $hash->setKey($key);
@@ -37,201 +44,374 @@ protected function assertHMACsTo($hash, $key, $message, $expected)
         );
     }
 
-    public static function hashData()
+    public static function hashData(): array
     {
-        return array(
-            array('md5', '', 'd41d8cd98f00b204e9800998ecf8427e'),
-            array('md5', 'The quick brown fox jumps over the lazy dog', '9e107d9d372bb6826bd81d3542a419d6'),
-            array('md5', 'The quick brown fox jumps over the lazy dog.', 'e4d909c290d0fb1ca068ffaddf22cbd0'),
-            array('sha1', 'The quick brown fox jumps over the lazy dog', '2fd4e1c67a2d28fced849ee1bb76e7391b93eb12'),
-            array('sha1', 'The quick brown fox jumps over the lazy dog.', '408d94384216f890ff7a0c3528e8bed1e0b01621'),
-            array(
+        return [
+            ['md5', '', 'd41d8cd98f00b204e9800998ecf8427e'],
+            ['md5', 'The quick brown fox jumps over the lazy dog', '9e107d9d372bb6826bd81d3542a419d6'],
+            ['md5', 'The quick brown fox jumps over the lazy dog.', 'e4d909c290d0fb1ca068ffaddf22cbd0'],
+            ['sha1', 'The quick brown fox jumps over the lazy dog', '2fd4e1c67a2d28fced849ee1bb76e7391b93eb12'],
+            ['sha1', 'The quick brown fox jumps over the lazy dog.', '408d94384216f890ff7a0c3528e8bed1e0b01621'],
+            [
                 'sha256',
                 '',
-                'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
-            ),
-            array(
+                'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855',
+            ],
+            [
                 'sha256',
                 'The quick brown fox jumps over the lazy dog',
                 'd7a8fbb307d7809469ca9abcb0082e4f8d5651e46d3cdb762d02d0bf37c9e592',
-            ),
-            array(
+            ],
+            [
                 'sha256',
                 'The quick brown fox jumps over the lazy dog.',
                 'ef537f25c895bfa782526529a9b63d97aa631564d5d789c2b765448c8635fb6c',
-            ),
-            array(
+            ],
+            [
                 'sha384',
                 '',
-                '38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b'
-            ),
-            array(
+                '38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b',
+            ],
+            [
                 'sha384',
                 'The quick brown fox jumps over the lazy dog',
                 'ca737f1014a48f4c0b6dd43cb177b0afd9e5169367544c494011e3317dbf9a509cb1e5dc1e85a941bbee3d7f2afbc9b1',
-            ),
-            array(
+            ],
+            [
                 'sha512',
                 '',
-                'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'
-            ),
-            array(
+                'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e',
+            ],
+            [
                 'sha512',
                 'The quick brown fox jumps over the lazy dog',
                 '07e547d9586f6a73f73fbac0435ed76951218fb7d0c8d788a309d785436bbb642e93a252a954f23912547d1e8a3b5ed6e1bfd7097821233fa0538f3db854fee6',
-            ),
-            array(
+            ],
+            [
                 'sha512',
                 'The quick brown fox jumps over the lazy dog.',
                 '91ea1245f20d46ae9a037a989f54f1f790f0a47607eeb8a14d12890cea77a1bbc6c7ed9cf205e67b7f2b8fd4c7dfd3a7a8617e45f3c463d481c7e586c39ac1ed',
-            ),
-            array(
-                'whirlpool',
-                'The quick brown fox jumps over the lazy dog.',
-                '87a7ff096082e3ffeb86db10feb91c5af36c2c71bc426fe310ce662e0338223e217def0eab0b02b80eecf875657802bc5965e48f5c0a05467756f0d3f396faba'
-            ),
-            array(
-                'whirlpool',
-                'The quick brown fox jumps over the lazy dog.',
-                '87a7ff096082e3ffeb86db10feb91c5af36c2c71bc426fe310ce662e0338223e217def0eab0b02b80eecf875657802bc5965e48f5c0a05467756f0d3f396faba'
-            ),
-        );
+            ],
+            // from http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/SHA512_224.pdf
+            [
+                'sha512/224',
+                'abc',
+                '4634270f707b6a54daae7530460842e20e37ed265ceee9a43e8924aa',
+            ],
+            [
+                'sha512/224',
+                'abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu',
+                '23fec5bb94d60b23308192640b0c453335d664734fe40e7268674af9',
+            ],
+            // from http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/SHA512_256.pdf
+            [
+                'sha512/256',
+                'abc',
+                '53048e2681941ef99b2e29b76b4c7dabe4c2d0c634fc6d46e0e2f13107e7af23',
+            ],
+            [
+                'sha512/256',
+                'abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu',
+                '3928e184fb8690f840da3988121d31be65cb9d3ef83ee6146feac861e19b563a',
+            ],
+            // from http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/SHA224.pdf
+            [
+                'sha224',
+                'abc',
+                '23097D223405D8228642A477BDA255B32AADBCE4BDA0B3F7E36C9DA7',
+            ],
+            [
+                'sha224',
+                'abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq',
+                '75388B16512776CC5DBA5DA1FD890150B0C6455CB4F58B1952522525',
+            ],
+            // from https://www.di-mgt.com.au/sha_testvectors.html#KECCAK-KAT
+            [
+                'sha3-224',
+                'abc',
+                'e642824c3f8cf24ad09234ee7d3c766fc9a3a5168d0c94ad73b46fdf',
+            ],
+            [
+                'sha3-256',
+                'abc',
+                '3a985da74fe225b2045c172d6bd390bd855f086e3e9d525b46bfe24511431532',
+            ],
+            [
+                'sha3-384',
+                'abc',
+                'ec01498288516fc926459f58e2c6ad8df9b473cb0fc08c2596da7cf0e49be4b298d88cea927ac7f539f1edf228376d25',
+            ],
+            [
+                'sha3-512',
+                'abc',
+                'b751850b1a57168a5693cd924b6b096e08f621827444f70d884f5d0240d2712e10e116e9192af3c91a7ec57647e3934057340b4cf408d5a56592f8274eec53f0',
+            ],
+            [
+                'shake256-912', // this is what Ed448 uses
+                str_repeat('a', 135), // one character shy of the block size (136)
+                '55b991ece1e567b6e7c2c714444dd201cd51f4f3832d08e1d26bebc63e07a3d7ddeed4a5aa6df7a15f89f2050566f75d9cf1a4dea4ed1f578df0985d5706d49e877d9a913dcdbc26a4c4e807ec72dc10438df95873e24660e39cd49aa4e5df286cb5ba60eaad91ff134754c21cd736681a8f',
+            ],
+            // from https://docs.ethers.io/v5/api/utils/hashing/
+            [
+                'keccak256', // used by Ethereum
+                "\x12\x34",
+                '56570de287d73cd1cb6092bb8fdee6173974955fdef345ae579ee9f475ea7432',
+            ],
+            [
+                'keccak256',
+                '',
+                'c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470',
+            ],
+            [
+                'keccak256',
+                'hello world',
+                '47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad',
+            ],
+        ];
     }
 
     /**
-     * @dataProvider hmacData()
+     * @dataProvider hmacData
      */
-    public function testHMAC($hash, $key, $message, $result)
+    public function testHMAC($hash, $key, $message, $result): void
     {
         $this->assertHMACsTo($hash, $key, $message, $result);
     }
 
     /**
-     * @dataProvider hmacData()
+     * @dataProvider hmacData
      */
-    public function testHMAC96($hash, $key, $message, $result)
+    public function testHMAC96($hash, $key, $message, $result): void
     {
         $this->assertHMACsTo($hash . '-96', $key, $message, substr($result, 0, 24));
     }
 
-    public static function hmacData()
+    public static function hmacData(): array
     {
-        return array(
-            array('md5', '', '', '74e6f7298a9c2d168935f58c001bad88'),
-            array('md5', 'key', 'The quick brown fox jumps over the lazy dog', '80070713463e7749b90c2dc24911e275'),
-            // RFC 4231
-            // Test Case 1
-            array(
+        return [
+            ['md5', '', '', '74e6f7298a9c2d168935f58c001bad88'],
+            ['md5', 'key', 'The quick brown fox jumps over the lazy dog', '80070713463e7749b90c2dc24911e275'],
+
+            // from https://tools.ietf.org/rfc/rfc4231.txt
+            // test case 1
+            [
+                'sha224',
+                str_repeat("\x0b", 20),
+                'Hi There',
+                '896fb1128abbdf196832107cd49df33f47b4b1169912ba4f53684b22',
+            ],
+            // test case 2
+            [
+                'sha224',
+                'Jefe',
+                'what do ya want for nothing?',
+                'a30e01098bc6dbbf45690f3a7e9e6d0f8bbea2a39e6148008fd05e44',
+            ],
+            // test case 3
+            [
+                'sha224',
+                pack('H*', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),
+                pack('H*', 'dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd'),
+                '7fb3cb3588c6c1f6ffa9694d7d6ad2649365b0c1f65d69d1ec8333ea',
+            ],
+            // test case 4
+            [
+                'sha224',
+                pack('H*', '0102030405060708090a0b0c0d0e0f10111213141516171819'),
+                pack('H*', 'cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd'),
+                '6c11506874013cac6a2abc1bb382627cec6a90d86efc012de7afec5a',
+            ],
+            // skip test case 5; truncation is only supported to 96 bits (eg. sha1-96) and that's already unit tested
+            // test case 6
+            [
+                'sha224',
+                pack('H*', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),
+                'Test Using Larger Than Block-Size Key - Hash Key First',
+                '95e9a0db962095adaebe9b2d6f0dbce2d499f112f2d2b7273fa6870e',
+            ],
+            // test case 7
+            [
+                'sha224',
+                pack('H*', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),
+                'This is a test using a larger than block-size key and a larger than block-size data. The key needs to be hashed before being used by the HMAC algorithm.',
+                '3a854166ac5d9f023f54d517d0b39dbd946770db9c2b95c9f6f565d1',
+            ],
+
+            // test case 1
+            [
                 'sha256',
-                pack('H*', '0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b'),
-                pack('H*', '4869205468657265'),
+                str_repeat("\x0b", 20),
+                'Hi There',
                 'b0344c61d8db38535ca8afceaf0bf12b881dc200c9833da726e9376c2e32cff7',
-            ),
-            // Test Case 2
-            array(
+            ],
+            // test case 2
+            [
                 'sha256',
-                pack('H*', '4a656665'),
-                pack('H*', '7768617420646f2079612077616e7420666f72206e6f7468696e673f'),
+                'Jefe',
+                'what do ya want for nothing?',
                 '5bdcc146bf60754e6a042426089575c75a003f089d2739839dec58b964ec3843',
-            ),
-            // Test Case 3
-            array(
+            ],
+            // test case 3
+            [
                 'sha256',
                 pack('H*', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),
                 pack('H*', 'dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd'),
                 '773ea91e36800e46854db8ebd09181a72959098b3ef8c122d9635514ced565fe',
-            ),
-            // Test Case 4
-            array(
+            ],
+            // test case 4
+            [
                 'sha256',
                 pack('H*', '0102030405060708090a0b0c0d0e0f10111213141516171819'),
                 pack('H*', 'cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd'),
                 '82558a389a443c0ea4cc819899f2083a85f0faa3e578f8077a2e3ff46729665b',
-            ),
-            // RFC 4231
-            // Test Case 1
-            array(
+            ],
+            // skip test case 5; truncation is only supported to 96 bits (eg. sha1-96) and that's already unit tested
+            // test case 6
+            [
+                'sha256',
+                pack('H*', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),
+                'Test Using Larger Than Block-Size Key - Hash Key First',
+                '60e431591ee0b67f0d8a26aacbf5b77f8e0bc6213728c5140546040f0ee37f54',
+            ],
+            // test case 7
+            [
+                'sha256',
+                pack('H*', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),
+                'This is a test using a larger than block-size key and a larger than block-size data. The key needs to be hashed before being used by the HMAC algorithm.',
+                '9b09ffa71b942fcb27635fbcd5b0e944bfdc63644f0713938a7f51535c3a35e2',
+            ],
+
+            // test case 1
+            [
+                'sha384',
+                str_repeat("\x0b", 20),
+                'Hi There',
+                'afd03944d84895626b0825f4ab46907f15f9dadbe4101ec682aa034c7cebc59cfaea9ea9076ede7f4af152e8b2fa9cb6',
+            ],
+            // test case 2
+            [
+                'sha384',
+                'Jefe',
+                'what do ya want for nothing?',
+                'af45d2e376484031617f78d2b58a6b1b9c7ef464f5a01b47e42ec3736322445e8e2240ca5e69e2c78b3239ecfab21649',
+            ],
+            // test case 3
+            [
+                'sha384',
+                pack('H*', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),
+                pack('H*', 'dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd'),
+                '88062608d3e6ad8a0aa2ace014c8a86f0aa635d947ac9febe83ef4e55966144b2a5ab39dc13814b94e3ab6e101a34f27',
+            ],
+            // test case 4
+            [
+                'sha384',
+                pack('H*', '0102030405060708090a0b0c0d0e0f10111213141516171819'),
+                pack('H*', 'cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd'),
+                '3e8a69b7783c25851933ab6290af6ca77a9981480850009cc5577c6e1f573b4e6801dd23c4a7d679ccf8a386c674cffb',
+            ],
+            // skip test case 5; truncation is only supported to 96 bits (eg. sha1-96) and that's already unit tested
+            // test case 6
+            [
+                'sha384',
+                pack('H*', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),
+                'Test Using Larger Than Block-Size Key - Hash Key First',
+                '4ece084485813e9088d2c63a041bc5b44f9ef1012a2b588f3cd11f05033ac4c60c2ef6ab4030fe8296248df163f44952',
+            ],
+            // test case 7
+            [
+                'sha384',
+                pack('H*', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),
+                'This is a test using a larger than block-size key and a larger than block-size data. The key needs to be hashed before being used by the HMAC algorithm.',
+                '6617178e941f020d351e2f254e8fd32c602420feb0b8fb9adccebb82461e99c5a678cc31e799176d3860e6110c46523e',
+            ],
+
+            // test case 1
+            [
                 'sha512',
-                pack('H*', '0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b'),
-                pack('H*', '4869205468657265'),
+                str_repeat("\x0b", 20),
+                'Hi There',
                 '87aa7cdea5ef619d4ff0b4241a1d6cb02379f4e2ce4ec2787ad0b30545e17cdedaa833b7d6b8a702038b274eaea3f4e4be9d914eeb61f1702e696c203a126854',
-            ),
-            // Test Case 2
-            array(
+            ],
+            // test case 2
+            [
                 'sha512',
-                pack('H*', '4a656665'),
-                pack('H*', '7768617420646f2079612077616e7420666f72206e6f7468696e673f'),
+                'Jefe',
+                'what do ya want for nothing?',
                 '164b7a7bfcf819e2e395fbe73b56e0a387bd64222e831fd610270cd7ea2505549758bf75c05a994a6d034f65f8f0e6fdcaeab1a34d4a6b4b636e070a38bce737',
-            ),
-            // Test Case 3
-            array(
+            ],
+            // test case 3
+            [
                 'sha512',
                 pack('H*', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),
                 pack('H*', 'dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd'),
                 'fa73b0089d56a284efb0f0756c890be9b1b5dbdd8ee81a3655f83e33b2279d39bf3e848279a722c806b485a47e67c807b946a337bee8942674278859e13292fb',
-            ),
-            // Test Case 4
-            array(
+            ],
+            // test case 4
+            [
                 'sha512',
                 pack('H*', '0102030405060708090a0b0c0d0e0f10111213141516171819'),
                 pack('H*', 'cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd'),
                 'b0ba465637458c6990e5a8c5f61d4af7e576d97ff94b872de76f8050361ee3dba91ca5c11aa25eb4d679275cc5788063a5f19741120c4f2de2adebeb10a298dd',
-            ),
-            array(
-                'whirlpool',
-                'abcd',
-                'The quick brown fox jumps over the lazy dog',
-                'e71aabb2588d789292fa6fef00b35cc269ec3ea912b1c1cd7127daf95f004a5df5392ee563d322bac7e19d9eab161932fe9c257d63e0d09eca0d91ab4010125e',
-            ),
-        );
+            ],
+            // skip test case 5; truncation is only supported to 96 bits (eg. sha1-96) and that's already unit tested
+            // test case 6
+            [
+                'sha512',
+                pack('H*', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),
+                'Test Using Larger Than Block-Size Key - Hash Key First',
+                '80b24263c7c1a3ebb71493c1dd7be8b49b46d1f41b4aeec1121b013783f8f3526b56d037e05f2598bd0fd2215d6a1e5295e64f73f63f0aec8b915a985d786598',
+            ],
+            // test case 7
+            [
+                'sha512',
+                pack('H*', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),
+                'This is a test using a larger than block-size key and a larger than block-size data. The key needs to be hashed before being used by the HMAC algorithm.',
+                'e37b6a775dc87dbaa4dfa9f96e5e3ffddebd71f8867289865df5a32d20cdc944b6022cac3c4982b10d5eeb55c3e4de15134676fb6de0446065c97440fa8c6a58',
+            ],
+        ];
     }
 
     /**
-     * @dataProvider hashData()
+     * @dataProvider hashData
      */
-    public function testHash($hash, $message, $result)
+    public function testHash($hash, $message, $result): void
     {
         $this->assertHashesTo($hash, $message, $result);
     }
 
     /**
-     * @dataProvider hashData()
+     * @dataProvider hashData
      */
-    public function testHash96($hash, $message, $result)
+    public function testHash96($hash, $message, $result): void
     {
+        if (preg_match('#^sha3-\d+#', $hash) || preg_match('#^shake(?:128|256)-\d+#', $hash) || $hash === 'keccak256') {
+            self::markTestSkipped($hash . '-96 not supported');
+        }
         $this->assertHashesTo($hash . '-96', $message, substr($result, 0, 24));
     }
 
-    public function testConstructorDefault()
+    public function testConstructorDefault(): void
     {
         $hash = new Hash();
         $this->assertSame($hash->getHash(), 'sha256');
     }
 
-    /**
-     * @expectedException \phpseclib\Exception\UnsupportedAlgorithmException
-     */
-    public function testConstructorArgumentInvalid()
+    public function testConstructorArgumentInvalid(): void
     {
+        $this->expectException(UnsupportedAlgorithmException::class);
+
         new Hash('abcdefghijklmnopqrst');
     }
 
-    public function testConstructorArgumentValid()
+    public function testSetHashInvalid(): void
     {
-        $hash = new Hash('whirlpool');
-        $this->assertSame($hash->getHash(), 'whirlpool');
-    }
+        $this->expectException(UnsupportedAlgorithmException::class);
 
-    /**
-     * @expectedException \phpseclib\Exception\UnsupportedAlgorithmException
-     */
-    public function testSetHashInvalid()
-    {
         $hash = new Hash('md5');
         $hash->setHash('abcdefghijklmnopqrst-96');
     }
 
-    public function testSetHashValid()
+    public function testSetHashValid(): void
     {
         $hash = new Hash('md5');
         $this->assertSame($hash->getHash(), 'md5');
@@ -242,24 +422,67 @@ public function testSetHashValid()
     /**
      * @dataProvider lengths
      */
-    public function testGetLengthKnown($algorithm, $length)
+    public function testGetLengthKnown($algorithm, $length): void
     {
         $hash = new Hash($algorithm);
-        $this->assertSame($hash->getLength(), $length);
+        $this->assertSame($hash->getLengthInBytes(), $length);
     }
 
-    public function lengths()
+    public static function lengths(): array
     {
-        return array(
+        return [
             // known
-            array('md5-96', 12),
-            array('md5', 16),
-            array('sha1', 20),
-            array('sha256', 32),
-            array('sha384', 48),
-            array('sha512', 64),
-            // unknown
-            array('whirlpool', 64),
-        );
+            ['md5-96', 12],
+            ['md5', 16],
+            ['sha1', 20],
+            ['sha256', 32],
+            ['sha384', 48],
+            ['sha512', 64],
+        ];
+    }
+
+    public static function UMACs(): array
+    {
+        return [
+            ['', 'umac-32', '113145FB', "umac-32 and message of <empty>"],
+            ['', 'umac-64', '6E155FAD26900BE1', "umac-64 and message of <empty>"],
+            ['', 'umac-96', '32FEDB100C79AD58F07FF764', "umac-96 and message of <empty>"],
+            ['aaa', 'umac-32', '3B91D102', "umac-32 and message of 'a' * 3"],
+            ['aaa', 'umac-64', '44B5CB542F220104', "umac-64 and message of 'a' * 3"],
+            ['aaa', 'umac-96', '185E4FE905CBA7BD85E4C2DC', "umac-96 and message of 'a' * 3"],
+            [str_repeat('a', 1 << 10), 'umac-32', '599B350B', "umac-32 and message of 'a' * 2^10"],
+            [str_repeat('a', 1 << 10), 'umac-64', '26BF2F5D60118BD9', "umac-64 and message of 'a' * 2^10"],
+            [str_repeat('a', 1 << 10), 'umac-96', '7A54ABE04AF82D60FB298C3C', "umac-96 and message of 'a' * 2^10"],
+            [str_repeat('a', 1 << 15), 'umac-32', '58DCF532', "umac-32 and message of 'a' * 2^15"],
+            [str_repeat('a', 1 << 15), 'umac-64', '27F8EF643B0D118D', "umac-64 and message of 'a' * 2^15"],
+            [str_repeat('a', 1 << 15), 'umac-96', '7B136BD911E4B734286EF2BE', "umac-96 and message of 'a' * 2^15"],
+            //[str_repeat('a', 1 << 20), 'umac-32', 'DB6364D1', "umac-32 and message of 'a' * 2^20"],
+            //[str_repeat('a', 1 << 20), 'umac-64', 'A4477E87E9F55853', "umac-64 and message of 'a' * 2^20"],
+            //[str_repeat('a', 1 << 20), 'umac-96', 'F8ACFA3AC31CFEEA047F7B11', "umac-96 and message of 'a' * 2^20"],
+            //[str_repeat('a', 1 << 25), 'umac-32', '5109A660', "umac-32 and message of 'a' * 2^25"],
+            //[str_repeat('a', 1 << 25), 'umac-64', '2E2DBC36860A0A5F', "umac-64 and message of 'a' * 2^25"],
+            //[str_repeat('a', 1 << 25), 'umac-96', '72C6388BACE3ACE6FBF062D9', "umac-96 and message of 'a' * 2^25"],
+            ['abc', 'umac-32', 'ABF3A3A0', "umac-32 and message of 'abc' * 1"],
+            ['abc', 'umac-64', 'D4D7B9F6BD4FBFCF', "umac-64 and message of 'abc' * 1"],
+            ['abc', 'umac-96', '883C3D4B97A61976FFCF2323', "umac-96 and message of 'abc' * 1"],
+            [str_repeat('abc', 500), 'umac-32', 'ABEB3C8B', "umac-32 and message of 'abc' * 500"],
+            [str_repeat('abc', 500), 'umac-64', 'D4CF26DDEFD5C01A', "umac-64 and message of 'abc' * 500"],
+            [str_repeat('abc', 500), 'umac-96', '8824A260C53C66A36C9260A6', "umac-96 and message of 'abc' * 500"],
+
+        ];
+    }
+
+    /**
+     * @dataProvider UMACs
+     */
+    public function testUMACs($message, $algo, $tag, $error): void
+    {
+        $k = 'abcdefghijklmnop'; // A 16-byte UMAC key
+        $n = 'bcdefghi'; // An 8-byte nonce
+
+        $hash = new Hash($algo);
+        $hash->setNonce($n);
+        $hash->setKey($k);
+        $this->assertSame($hash->hash($message), pack('H*', $tag), $error);
     }
 }
diff --git a/tests/Unit/Crypt/RC2Test.php b/tests/Unit/Crypt/RC2Test.php
index 04171ffca..2bae103b0 100644
--- a/tests/Unit/Crypt/RC2Test.php
+++ b/tests/Unit/Crypt/RC2Test.php
@@ -1,41 +1,46 @@
 <?php
+
 /**
  * @author    Andreas Fischer <bantu@phpbb.com>
  * @copyright MMXIII Andreas Fischer
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\Crypt\Base;
-use phpseclib\Crypt\RC2;
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt;
 
-class Unit_Crypt_RC2Test extends PhpseclibTestCase
+use phpseclib3\Crypt\RC2;
+use phpseclib3\Tests\PhpseclibTestCase;
+
+class RC2Test extends PhpseclibTestCase
 {
-    var $engines = array(
-        Base::ENGINE_INTERNAL => 'internal',
-        Base::ENGINE_MCRYPT => 'mcrypt',
-        Base::ENGINE_OPENSSL => 'OpenSSL',
-    );
+    public static $engines = [
+        'PHP',
+        'Eval',
+        'OpenSSL',
+    ];
 
-    public function engineVectors()
+    public static function engineVectors(): array
     {
         // tests from https://tools.ietf.org/html/rfc2268#page-8
-        $tests = array(
+        $tests = [
             // key, effective key length, plaintext, ciphertext
-            array('0000000000000000', 63, '0000000000000000', 'ebb773f993278eff'),
-            array('ffffffffffffffff', 64, 'ffffffffffffffff', '278b27e42e2f0d49'),
-            array('3000000000000000', 64, '1000000000000001', '30649edf9be7d2c2'),
-            array('88', 64, '0000000000000000', '61a8a244adacccf0'),
-            array('88bca90e90875a', 64, '0000000000000000', '6ccf4308974c267f'),
-            array('88bca90e90875a7f0f79c384627bafb2', 64, '0000000000000000', '1a807d272bbe5db1'),
-            array('88bca90e90875a7f0f79c384627bafb2', 128, '0000000000000000', '2269552ab0f85ca6'),
-            array('88bca90e90875a7f0f79c384627bafb216f80a6f85920584c42fceb0be255daf1e', 129, '0000000000000000', '5b78d3a43dfff1f1')
-        );
-
-        $result = array();
-
-        foreach ($this->engines as $engine => $engineName) {
+            ['0000000000000000', 63, '0000000000000000', 'ebb773f993278eff'],
+            ['ffffffffffffffff', 64, 'ffffffffffffffff', '278b27e42e2f0d49'],
+            ['3000000000000000', 64, '1000000000000001', '30649edf9be7d2c2'],
+            ['88', 64, '0000000000000000', '61a8a244adacccf0'],
+            ['88bca90e90875a', 64, '0000000000000000', '6ccf4308974c267f'],
+            ['88bca90e90875a7f0f79c384627bafb2', 64, '0000000000000000', '1a807d272bbe5db1'],
+            ['88bca90e90875a7f0f79c384627bafb2', 128, '0000000000000000', '2269552ab0f85ca6'],
+            ['88bca90e90875a7f0f79c384627bafb216f80a6f85920584c42fceb0be255daf1e', 129, '0000000000000000', '5b78d3a43dfff1f1'],
+        ];
+
+        $result = [];
+
+        foreach (self::$engines as $engine) {
             foreach ($tests as $test) {
-                $result[] = array($engine, $engineName, $test[0], $test[1], $test[2], $test[3]);
+                $result[] = [$engine, $test[0], $test[1], $test[2], $test[3]];
             }
         }
 
@@ -43,9 +48,9 @@ public function engineVectors()
     }
 
     // this test is just confirming RC2's key expansion
-    public function testEncryptPadding()
+    public function testEncryptPadding(): void
     {
-        $rc2 = new RC2(Base::MODE_ECB);
+        $rc2 = new RC2('ecb');
 
         // unlike Crypt_AES / Crypt_Rijndael, when you tell Crypt_RC2 that the key length is 128-bits the key isn't null padded to that length.
         // instead, RC2 key expansion is used to extend it out to that length. this isn't done for AES / Rijndael since that doesn't define any
@@ -71,7 +76,7 @@ public function testEncryptPadding()
 
         // now, to OpenSSL's credit, null padding is internally consistent with OpenSSL. OpenSSL only supports fixed length keys. For rc2, rc4 and
         // bf (blowfish), all keys are 128 bits (or are null padded / truncated accordingly). to use 40-bit or 64-bit keys with RC4 with OpenSSL you
-        // don't use the rc4 algorithm - you use the rc4-40 or rc4-64 algorithm. and similarily, it's not aes-cbc that you use - it's either aes-128-cbc
+        // don't use the rc4 algorithm - you use the rc4-40 or rc4-64 algorithm. and similarly, it's not aes-cbc that you use - it's either aes-128-cbc
         // or aes-192-cbc or aes-256-cbc. this is in contrast to mcrypt, which (with the exception of RC2) actually supports variable and arbitrary
         // length keys.
 
@@ -82,24 +87,16 @@ public function testEncryptPadding()
 
         $rc2->setKey(str_repeat('d', 16), 128);
 
-        $rc2->setPreferredEngine(Base::ENGINE_INTERNAL);
+        $rc2->setPreferredEngine('PHP');
         $internal = $rc2->encrypt('d');
 
         $result = pack('H*', 'e3b36057f4821346');
         $this->assertEquals($result, $internal, 'Failed asserting that the internal engine produced the correct result');
 
-        $rc2->setPreferredEngine(Base::ENGINE_MCRYPT);
-        if ($rc2->getEngine() == Base::ENGINE_MCRYPT) {
-            $mcrypt = $rc2->encrypt('d');
-            $this->assertEquals($result, $mcrypt, 'Failed asserting that the mcrypt engine produced the correct result');
-        } else {
-            self::markTestSkipped('Unable to initialize mcrypt engine');
-        }
-
-        $rc2->setPreferredEngine(Base::ENGINE_OPENSSL);
-        if ($rc2->getEngine() == Base::ENGINE_OPENSSL) {
+        $rc2->setPreferredEngine('OpenSSL');
+        if ($rc2->getEngine() == 'OpenSSL') {
             $openssl = $rc2->encrypt('d');
-            $this->assertEquals($result, $openssl,  'Failed asserting that the OpenSSL engine produced the correct result');
+            $this->assertEquals($result, $openssl, 'Failed asserting that the OpenSSL engine produced the correct result');
         } else {
             self::markTestSkipped('Unable to initialize OpenSSL engine');
         }
@@ -108,18 +105,22 @@ public function testEncryptPadding()
     /**
      * @dataProvider engineVectors
      */
-    public function testVectors($engine, $engineName, $key, $keyLen, $plaintext, $ciphertext)
+    public function testVectors($engine, $key, $keyLen, $plaintext, $ciphertext): void
     {
-        $rc2 = new RC2();
+        $rc2 = new RC2('cbc');
         $rc2->disablePadding();
         $rc2->setKeyLength($keyLen);
         $rc2->setKey(pack('H*', $key)); // could also do $rc2->setKey(pack('H*', $key), $keyLen)
+        $rc2->setIV(str_repeat("\0", $rc2->getBlockLength() >> 3));
         if (!$rc2->isValidEngine($engine)) {
-            self::markTestSkipped('Unable to initialize ' . $engineName . ' engine');
+            self::markTestSkipped("Unable to initialize $engine engine");
         }
         $rc2->setPreferredEngine($engine);
 
         $result = bin2hex($rc2->encrypt(pack('H*', $plaintext)));
-        $this->assertEquals($result, $ciphertext, "Failed asserting that $plaintext yielded expected output in $engineName engine");
+        $this->assertEquals($result, $ciphertext, "Failed asserting that $plaintext yielded expected output in $engine engine");
+
+        $result = bin2hex($rc2->decrypt(pack('H*', $ciphertext)));
+        $this->assertEquals($result, $plaintext, "Failed asserting that decrypted result yielded $plaintext as a result in $engine engine");
     }
 }
diff --git a/tests/Unit/Crypt/RC4Test.php b/tests/Unit/Crypt/RC4Test.php
index 1a020ff88..eed1bc92c 100644
--- a/tests/Unit/Crypt/RC4Test.php
+++ b/tests/Unit/Crypt/RC4Test.php
@@ -1,193 +1,199 @@
 <?php
+
 /**
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2014 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\Crypt\Base;
-use phpseclib\Crypt\RC4;
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt;
 
-class Unit_Crypt_RC4Test extends PhpseclibTestCase
+use phpseclib3\Crypt\Random;
+use phpseclib3\Crypt\RC4;
+use phpseclib3\Tests\PhpseclibTestCase;
+
+class RC4Test extends PhpseclibTestCase
 {
-    public function engineVectors()
+    public static function engineVectors(): array
     {
-        $engines = array(
-            Base::ENGINE_INTERNAL => 'internal',
-            Base::ENGINE_MCRYPT => 'mcrypt',
-            Base::ENGINE_OPENSSL => 'OpenSSL',
-        );
+        $engines = [
+            'PHP',
+            'Eval',
+            'OpenSSL',
+        ];
         // tests from https://tools.ietf.org/html/rfc6229
-        $tests = array(
-            array(
+        $tests = [
+            [
                 'key' => pack('H*', '0102030405'), // 40-bit key
-                'output' => array(
-                    array('offset' =>    0, 'result' => 'b2396305f03dc027ccc3524a0a1118a8'),
-                    array('offset' =>   16, 'result' => '6982944f18fc82d589c403a47a0d0919'),
-                    array('offset' =>  240, 'result' => '28cb1132c96ce286421dcaadb8b69eae'),
-                    array('offset' =>  256, 'result' => '1cfcf62b03eddb641d77dfcf7f8d8c93'),
-                    array('offset' =>  496, 'result' => '42b7d0cdd918a8a33dd51781c81f4041'),
-                    array('offset' =>  512, 'result' => '6459844432a7da923cfb3eb4980661f6'),
-                    array('offset' =>  752, 'result' => 'ec10327bde2beefd18f9277680457e22'),
-                    array('offset' =>  768, 'result' => 'eb62638d4f0ba1fe9fca20e05bf8ff2b'),
-                    array('offset' => 1008, 'result' => '45129048e6a0ed0b56b490338f078da5'),
-                    array('offset' => 1024, 'result' => '30abbcc7c20b01609f23ee2d5f6bb7df'),
-                    array('offset' => 1520, 'result' => '3294f744d8f9790507e70f62e5bbceea'),
-                    array('offset' => 1536, 'result' => 'd8729db41882259bee4f825325f5a130'),
-                    array('offset' => 2032, 'result' => '1eb14a0c13b3bf47fa2a0ba93ad45b8b'),
-                    array('offset' => 2048, 'result' => 'cc582f8ba9f265e2b1be9112e975d2d7'),
-                    array('offset' => 3056, 'result' => 'f2e30f9bd102ecbf75aaade9bc35c43c'),
-                    array('offset' => 3072, 'result' => 'ec0e11c479dc329dc8da7968fe965681'),
-                    array('offset' => 4080, 'result' => '068326a2118416d21f9d04b2cd1ca050'),
-                    array('offset' => 4096, 'result' => 'ff25b58995996707e51fbdf08b34d875')
-                )
-            ),
-            array(
+                'output' => [
+                    ['offset' =>    0, 'result' => 'b2396305f03dc027ccc3524a0a1118a8'],
+                    ['offset' =>   16, 'result' => '6982944f18fc82d589c403a47a0d0919'],
+                    ['offset' =>  240, 'result' => '28cb1132c96ce286421dcaadb8b69eae'],
+                    ['offset' =>  256, 'result' => '1cfcf62b03eddb641d77dfcf7f8d8c93'],
+                    ['offset' =>  496, 'result' => '42b7d0cdd918a8a33dd51781c81f4041'],
+                    ['offset' =>  512, 'result' => '6459844432a7da923cfb3eb4980661f6'],
+                    ['offset' =>  752, 'result' => 'ec10327bde2beefd18f9277680457e22'],
+                    ['offset' =>  768, 'result' => 'eb62638d4f0ba1fe9fca20e05bf8ff2b'],
+                    ['offset' => 1008, 'result' => '45129048e6a0ed0b56b490338f078da5'],
+                    ['offset' => 1024, 'result' => '30abbcc7c20b01609f23ee2d5f6bb7df'],
+                    ['offset' => 1520, 'result' => '3294f744d8f9790507e70f62e5bbceea'],
+                    ['offset' => 1536, 'result' => 'd8729db41882259bee4f825325f5a130'],
+                    ['offset' => 2032, 'result' => '1eb14a0c13b3bf47fa2a0ba93ad45b8b'],
+                    ['offset' => 2048, 'result' => 'cc582f8ba9f265e2b1be9112e975d2d7'],
+                    ['offset' => 3056, 'result' => 'f2e30f9bd102ecbf75aaade9bc35c43c'],
+                    ['offset' => 3072, 'result' => 'ec0e11c479dc329dc8da7968fe965681'],
+                    ['offset' => 4080, 'result' => '068326a2118416d21f9d04b2cd1ca050'],
+                    ['offset' => 4096, 'result' => 'ff25b58995996707e51fbdf08b34d875'],
+                ],
+            ],
+            [
                 'key' => pack('H*', '01020304050607'), // 56-bit key
-                'output' => array(
-                    array('offset' =>    0, 'result' => '293f02d47f37c9b633f2af5285feb46b'),
-                    array('offset' =>   16, 'result' => 'e620f1390d19bd84e2e0fd752031afc1'),
-                    array('offset' =>  240, 'result' => '914f02531c9218810df60f67e338154c'),
-                    array('offset' =>  256, 'result' => 'd0fdb583073ce85ab83917740ec011d5'),
-                    array('offset' =>  496, 'result' => '75f81411e871cffa70b90c74c592e454'),
-                    array('offset' =>  512, 'result' => '0bb87202938dad609e87a5a1b079e5e4'),
-                    array('offset' =>  752, 'result' => 'c2911246b612e7e7b903dfeda1dad866'),
-                    array('offset' =>  768, 'result' => '32828f91502b6291368de8081de36fc2'),
-                    array('offset' => 1008, 'result' => 'f3b9a7e3b297bf9ad804512f9063eff1'),
-                    array('offset' => 1024, 'result' => '8ecb67a9ba1f55a5a067e2b026a3676f'),
-                    array('offset' => 1520, 'result' => 'd2aa902bd42d0d7cfd340cd45810529f'),
-                    array('offset' => 1536, 'result' => '78b272c96e42eab4c60bd914e39d06e3'),
-                    array('offset' => 2032, 'result' => 'f4332fd31a079396ee3cee3f2a4ff049'),
-                    array('offset' => 2048, 'result' => '05459781d41fda7f30c1be7e1246c623'),
-                    array('offset' => 3056, 'result' => 'adfd3868b8e51485d5e610017e3dd609'),
-                    array('offset' => 3072, 'result' => 'ad26581c0c5be45f4cea01db2f3805d5'),
-                    array('offset' => 4080, 'result' => 'f3172ceffc3b3d997c85ccd5af1a950c'),
-                    array('offset' => 4096, 'result' => 'e74b0b9731227fd37c0ec08a47ddd8b8')
-                )
-            ),
-            array(
+                'output' => [
+                    ['offset' =>    0, 'result' => '293f02d47f37c9b633f2af5285feb46b'],
+                    ['offset' =>   16, 'result' => 'e620f1390d19bd84e2e0fd752031afc1'],
+                    ['offset' =>  240, 'result' => '914f02531c9218810df60f67e338154c'],
+                    ['offset' =>  256, 'result' => 'd0fdb583073ce85ab83917740ec011d5'],
+                    ['offset' =>  496, 'result' => '75f81411e871cffa70b90c74c592e454'],
+                    ['offset' =>  512, 'result' => '0bb87202938dad609e87a5a1b079e5e4'],
+                    ['offset' =>  752, 'result' => 'c2911246b612e7e7b903dfeda1dad866'],
+                    ['offset' =>  768, 'result' => '32828f91502b6291368de8081de36fc2'],
+                    ['offset' => 1008, 'result' => 'f3b9a7e3b297bf9ad804512f9063eff1'],
+                    ['offset' => 1024, 'result' => '8ecb67a9ba1f55a5a067e2b026a3676f'],
+                    ['offset' => 1520, 'result' => 'd2aa902bd42d0d7cfd340cd45810529f'],
+                    ['offset' => 1536, 'result' => '78b272c96e42eab4c60bd914e39d06e3'],
+                    ['offset' => 2032, 'result' => 'f4332fd31a079396ee3cee3f2a4ff049'],
+                    ['offset' => 2048, 'result' => '05459781d41fda7f30c1be7e1246c623'],
+                    ['offset' => 3056, 'result' => 'adfd3868b8e51485d5e610017e3dd609'],
+                    ['offset' => 3072, 'result' => 'ad26581c0c5be45f4cea01db2f3805d5'],
+                    ['offset' => 4080, 'result' => 'f3172ceffc3b3d997c85ccd5af1a950c'],
+                    ['offset' => 4096, 'result' => 'e74b0b9731227fd37c0ec08a47ddd8b8'],
+                ],
+            ],
+            [
                 'key' => pack('H*', '0102030405060708'), // 64-bit key
-                'output' => array(
-                    array('offset' =>    0, 'result' => '97ab8a1bf0afb96132f2f67258da15a8'),
-                    array('offset' =>   16, 'result' => '8263efdb45c4a18684ef87e6b19e5b09'),
-                    array('offset' =>  240, 'result' => '9636ebc9841926f4f7d1f362bddf6e18'),
-                    array('offset' =>  256, 'result' => 'd0a990ff2c05fef5b90373c9ff4b870a'),
-                    array('offset' =>  496, 'result' => '73239f1db7f41d80b643c0c52518ec63'),
-                    array('offset' =>  512, 'result' => '163b319923a6bdb4527c626126703c0f'),
-                    array('offset' =>  752, 'result' => '49d6c8af0f97144a87df21d91472f966'),
-                    array('offset' =>  768, 'result' => '44173a103b6616c5d5ad1cee40c863d0'),
-                    array('offset' => 1008, 'result' => '273c9c4b27f322e4e716ef53a47de7a4'),
-                    array('offset' => 1024, 'result' => 'c6d0e7b226259fa9023490b26167ad1d'),
-                    array('offset' => 1520, 'result' => '1fe8986713f07c3d9ae1c163ff8cf9d3'),
-                    array('offset' => 1536, 'result' => '8369e1a965610be887fbd0c79162aafb'),
-                    array('offset' => 2032, 'result' => '0a0127abb44484b9fbef5abcae1b579f'),
-                    array('offset' => 2048, 'result' => 'c2cdadc6402e8ee866e1f37bdb47e42c'),
-                    array('offset' => 3056, 'result' => '26b51ea37df8e1d6f76fc3b66a7429b3'),
-                    array('offset' => 3072, 'result' => 'bc7683205d4f443dc1f29dda3315c87b'),
-                    array('offset' => 4080, 'result' => 'd5fa5a3469d29aaaf83d23589db8c85b'),
-                    array('offset' => 4096, 'result' => '3fb46e2c8f0f068edce8cdcd7dfc5862')
-                )
-            ),
-            array(
+                'output' => [
+                    ['offset' =>    0, 'result' => '97ab8a1bf0afb96132f2f67258da15a8'],
+                    ['offset' =>   16, 'result' => '8263efdb45c4a18684ef87e6b19e5b09'],
+                    ['offset' =>  240, 'result' => '9636ebc9841926f4f7d1f362bddf6e18'],
+                    ['offset' =>  256, 'result' => 'd0a990ff2c05fef5b90373c9ff4b870a'],
+                    ['offset' =>  496, 'result' => '73239f1db7f41d80b643c0c52518ec63'],
+                    ['offset' =>  512, 'result' => '163b319923a6bdb4527c626126703c0f'],
+                    ['offset' =>  752, 'result' => '49d6c8af0f97144a87df21d91472f966'],
+                    ['offset' =>  768, 'result' => '44173a103b6616c5d5ad1cee40c863d0'],
+                    ['offset' => 1008, 'result' => '273c9c4b27f322e4e716ef53a47de7a4'],
+                    ['offset' => 1024, 'result' => 'c6d0e7b226259fa9023490b26167ad1d'],
+                    ['offset' => 1520, 'result' => '1fe8986713f07c3d9ae1c163ff8cf9d3'],
+                    ['offset' => 1536, 'result' => '8369e1a965610be887fbd0c79162aafb'],
+                    ['offset' => 2032, 'result' => '0a0127abb44484b9fbef5abcae1b579f'],
+                    ['offset' => 2048, 'result' => 'c2cdadc6402e8ee866e1f37bdb47e42c'],
+                    ['offset' => 3056, 'result' => '26b51ea37df8e1d6f76fc3b66a7429b3'],
+                    ['offset' => 3072, 'result' => 'bc7683205d4f443dc1f29dda3315c87b'],
+                    ['offset' => 4080, 'result' => 'd5fa5a3469d29aaaf83d23589db8c85b'],
+                    ['offset' => 4096, 'result' => '3fb46e2c8f0f068edce8cdcd7dfc5862'],
+                ],
+            ],
+            [
                 'key' => pack('H*', '0102030405060708090a'), // 80-bit key
-                'output' => array(
-                    array('offset' =>    0, 'result' => 'ede3b04643e586cc907dc21851709902'),
-                    array('offset' =>   16, 'result' => '03516ba78f413beb223aa5d4d2df6711'),
-                    array('offset' =>  240, 'result' => '3cfd6cb58ee0fdde640176ad0000044d'),
-                    array('offset' =>  256, 'result' => '48532b21fb6079c9114c0ffd9c04a1ad'),
-                    array('offset' =>  496, 'result' => '3e8cea98017109979084b1ef92f99d86'),
-                    array('offset' =>  512, 'result' => 'e20fb49bdb337ee48b8d8dc0f4afeffe'),
-                    array('offset' =>  752, 'result' => '5c2521eacd7966f15e056544bea0d315'),
-                    array('offset' =>  768, 'result' => 'e067a7031931a246a6c3875d2f678acb'),
-                    array('offset' => 1008, 'result' => 'a64f70af88ae56b6f87581c0e23e6b08'),
-                    array('offset' => 1024, 'result' => 'f449031de312814ec6f319291f4a0516'),
-                    array('offset' => 1520, 'result' => 'bdae85924b3cb1d0a2e33a30c6d79599'),
-                    array('offset' => 1536, 'result' => '8a0feddbac865a09bcd127fb562ed60a'),
-                    array('offset' => 2032, 'result' => 'b55a0a5b51a12a8be34899c3e047511a'),
-                    array('offset' => 2048, 'result' => 'd9a09cea3ce75fe39698070317a71339'),
-                    array('offset' => 3056, 'result' => '552225ed1177f44584ac8cfa6c4eb5fc'),
-                    array('offset' => 3072, 'result' => '7e82cbabfc95381b080998442129c2f8'),
-                    array('offset' => 4080, 'result' => '1f135ed14ce60a91369d2322bef25e3c'),
-                    array('offset' => 4096, 'result' => '08b6be45124a43e2eb77953f84dc8553')
-                )
-            ),
-            array(
+                'output' => [
+                    ['offset' =>    0, 'result' => 'ede3b04643e586cc907dc21851709902'],
+                    ['offset' =>   16, 'result' => '03516ba78f413beb223aa5d4d2df6711'],
+                    ['offset' =>  240, 'result' => '3cfd6cb58ee0fdde640176ad0000044d'],
+                    ['offset' =>  256, 'result' => '48532b21fb6079c9114c0ffd9c04a1ad'],
+                    ['offset' =>  496, 'result' => '3e8cea98017109979084b1ef92f99d86'],
+                    ['offset' =>  512, 'result' => 'e20fb49bdb337ee48b8d8dc0f4afeffe'],
+                    ['offset' =>  752, 'result' => '5c2521eacd7966f15e056544bea0d315'],
+                    ['offset' =>  768, 'result' => 'e067a7031931a246a6c3875d2f678acb'],
+                    ['offset' => 1008, 'result' => 'a64f70af88ae56b6f87581c0e23e6b08'],
+                    ['offset' => 1024, 'result' => 'f449031de312814ec6f319291f4a0516'],
+                    ['offset' => 1520, 'result' => 'bdae85924b3cb1d0a2e33a30c6d79599'],
+                    ['offset' => 1536, 'result' => '8a0feddbac865a09bcd127fb562ed60a'],
+                    ['offset' => 2032, 'result' => 'b55a0a5b51a12a8be34899c3e047511a'],
+                    ['offset' => 2048, 'result' => 'd9a09cea3ce75fe39698070317a71339'],
+                    ['offset' => 3056, 'result' => '552225ed1177f44584ac8cfa6c4eb5fc'],
+                    ['offset' => 3072, 'result' => '7e82cbabfc95381b080998442129c2f8'],
+                    ['offset' => 4080, 'result' => '1f135ed14ce60a91369d2322bef25e3c'],
+                    ['offset' => 4096, 'result' => '08b6be45124a43e2eb77953f84dc8553'],
+                ],
+            ],
+            [
                 'key' => pack('H*', '0102030405060708090a0b0c0d0e0f10'), // 128-bit key
-                'output' => array(
-                    array('offset' =>    0, 'result' => '9ac7cc9a609d1ef7b2932899cde41b97'),
-                    array('offset' =>   16, 'result' => '5248c4959014126a6e8a84f11d1a9e1c'),
-                    array('offset' =>  240, 'result' => '065902e4b620f6cc36c8589f66432f2b'),
-                    array('offset' =>  256, 'result' => 'd39d566bc6bce3010768151549f3873f'),
-                    array('offset' =>  496, 'result' => 'b6d1e6c4a5e4771cad79538df295fb11'),
-                    array('offset' =>  512, 'result' => 'c68c1d5c559a974123df1dbc52a43b89'),
-                    array('offset' =>  752, 'result' => 'c5ecf88de897fd57fed301701b82a259'),
-                    array('offset' =>  768, 'result' => 'eccbe13de1fcc91c11a0b26c0bc8fa4d'),
-                    array('offset' => 1008, 'result' => 'e7a72574f8782ae26aabcf9ebcd66065'),
-                    array('offset' => 1024, 'result' => 'bdf0324e6083dcc6d3cedd3ca8c53c16'),
-                    array('offset' => 1520, 'result' => 'b40110c4190b5622a96116b0017ed297'),
-                    array('offset' => 1536, 'result' => 'ffa0b514647ec04f6306b892ae661181'),
-                    array('offset' => 2032, 'result' => 'd03d1bc03cd33d70dff9fa5d71963ebd'),
-                    array('offset' => 2048, 'result' => '8a44126411eaa78bd51e8d87a8879bf5'),
-                    array('offset' => 3056, 'result' => 'fabeb76028ade2d0e48722e46c4615a3'),
-                    array('offset' => 3072, 'result' => 'c05d88abd50357f935a63c59ee537623'),
-                    array('offset' => 4080, 'result' => 'ff38265c1642c1abe8d3c2fe5e572bf8'),
-                    array('offset' => 4096, 'result' => 'a36a4c301ae8ac13610ccbc12256cacc')
-                )
-            ),
-            array(
+                'output' => [
+                    ['offset' =>    0, 'result' => '9ac7cc9a609d1ef7b2932899cde41b97'],
+                    ['offset' =>   16, 'result' => '5248c4959014126a6e8a84f11d1a9e1c'],
+                    ['offset' =>  240, 'result' => '065902e4b620f6cc36c8589f66432f2b'],
+                    ['offset' =>  256, 'result' => 'd39d566bc6bce3010768151549f3873f'],
+                    ['offset' =>  496, 'result' => 'b6d1e6c4a5e4771cad79538df295fb11'],
+                    ['offset' =>  512, 'result' => 'c68c1d5c559a974123df1dbc52a43b89'],
+                    ['offset' =>  752, 'result' => 'c5ecf88de897fd57fed301701b82a259'],
+                    ['offset' =>  768, 'result' => 'eccbe13de1fcc91c11a0b26c0bc8fa4d'],
+                    ['offset' => 1008, 'result' => 'e7a72574f8782ae26aabcf9ebcd66065'],
+                    ['offset' => 1024, 'result' => 'bdf0324e6083dcc6d3cedd3ca8c53c16'],
+                    ['offset' => 1520, 'result' => 'b40110c4190b5622a96116b0017ed297'],
+                    ['offset' => 1536, 'result' => 'ffa0b514647ec04f6306b892ae661181'],
+                    ['offset' => 2032, 'result' => 'd03d1bc03cd33d70dff9fa5d71963ebd'],
+                    ['offset' => 2048, 'result' => '8a44126411eaa78bd51e8d87a8879bf5'],
+                    ['offset' => 3056, 'result' => 'fabeb76028ade2d0e48722e46c4615a3'],
+                    ['offset' => 3072, 'result' => 'c05d88abd50357f935a63c59ee537623'],
+                    ['offset' => 4080, 'result' => 'ff38265c1642c1abe8d3c2fe5e572bf8'],
+                    ['offset' => 4096, 'result' => 'a36a4c301ae8ac13610ccbc12256cacc'],
+                ],
+            ],
+            [
                 'key' => pack('H*', '0102030405060708090a0b0c0d0e0f101112131415161718'), // 192-bit key
-                'output' => array(
-                    array('offset' =>    0, 'result' => '0595e57fe5f0bb3c706edac8a4b2db11'),
-                    array('offset' =>   16, 'result' => 'dfde31344a1af769c74f070aee9e2326'),
-                    array('offset' =>  240, 'result' => 'b06b9b1e195d13d8f4a7995c4553ac05'),
-                    array('offset' =>  256, 'result' => '6bd2378ec341c9a42f37ba79f88a32ff'),
-                    array('offset' =>  496, 'result' => 'e70bce1df7645adb5d2c4130215c3522'),
-                    array('offset' =>  512, 'result' => '9a5730c7fcb4c9af51ffda89c7f1ad22'),
-                    array('offset' =>  752, 'result' => '0485055fd4f6f0d963ef5ab9a5476982'),
-                    array('offset' =>  768, 'result' => '591fc66bcda10e452b03d4551f6b62ac'),
-                    array('offset' => 1008, 'result' => '2753cc83988afa3e1688a1d3b42c9a02'),
-                    array('offset' => 1024, 'result' => '93610d523d1d3f0062b3c2a3bbc7c7f0'),
-                    array('offset' => 1520, 'result' => '96c248610aadedfeaf8978c03de8205a'),
-                    array('offset' => 1536, 'result' => '0e317b3d1c73b9e9a4688f296d133a19'),
-                    array('offset' => 2032, 'result' => 'bdf0e6c3cca5b5b9d533b69c56ada120'),
-                    array('offset' => 2048, 'result' => '88a218b6e2ece1e6246d44c759d19b10'),
-                    array('offset' => 3056, 'result' => '6866397e95c140534f94263421006e40'),
-                    array('offset' => 3072, 'result' => '32cb0a1e9542c6b3b8b398abc3b0f1d5'),
-                    array('offset' => 4080, 'result' => '29a0b8aed54a132324c62e423f54b4c8'),
-                    array('offset' => 4096, 'result' => '3cb0f3b5020a98b82af9fe154484a168')
-                )
-            ),
-            array(
+                'output' => [
+                    ['offset' =>    0, 'result' => '0595e57fe5f0bb3c706edac8a4b2db11'],
+                    ['offset' =>   16, 'result' => 'dfde31344a1af769c74f070aee9e2326'],
+                    ['offset' =>  240, 'result' => 'b06b9b1e195d13d8f4a7995c4553ac05'],
+                    ['offset' =>  256, 'result' => '6bd2378ec341c9a42f37ba79f88a32ff'],
+                    ['offset' =>  496, 'result' => 'e70bce1df7645adb5d2c4130215c3522'],
+                    ['offset' =>  512, 'result' => '9a5730c7fcb4c9af51ffda89c7f1ad22'],
+                    ['offset' =>  752, 'result' => '0485055fd4f6f0d963ef5ab9a5476982'],
+                    ['offset' =>  768, 'result' => '591fc66bcda10e452b03d4551f6b62ac'],
+                    ['offset' => 1008, 'result' => '2753cc83988afa3e1688a1d3b42c9a02'],
+                    ['offset' => 1024, 'result' => '93610d523d1d3f0062b3c2a3bbc7c7f0'],
+                    ['offset' => 1520, 'result' => '96c248610aadedfeaf8978c03de8205a'],
+                    ['offset' => 1536, 'result' => '0e317b3d1c73b9e9a4688f296d133a19'],
+                    ['offset' => 2032, 'result' => 'bdf0e6c3cca5b5b9d533b69c56ada120'],
+                    ['offset' => 2048, 'result' => '88a218b6e2ece1e6246d44c759d19b10'],
+                    ['offset' => 3056, 'result' => '6866397e95c140534f94263421006e40'],
+                    ['offset' => 3072, 'result' => '32cb0a1e9542c6b3b8b398abc3b0f1d5'],
+                    ['offset' => 4080, 'result' => '29a0b8aed54a132324c62e423f54b4c8'],
+                    ['offset' => 4096, 'result' => '3cb0f3b5020a98b82af9fe154484a168'],
+                ],
+            ],
+            [
                 'key' => pack('H*', '0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20'), // 256-bit key
-                'output' => array(
-                    array('offset' =>    0, 'result' => 'eaa6bd25880bf93d3f5d1e4ca2611d91'),
-                    array('offset' =>   16, 'result' => 'cfa45c9f7e714b54bdfa80027cb14380'),
-                    array('offset' =>  240, 'result' => '114ae344ded71b35f2e60febad727fd8'),
-                    array('offset' =>  256, 'result' => '02e1e7056b0f623900496422943e97b6'),
-                    array('offset' =>  496, 'result' => '91cb93c787964e10d9527d999c6f936b'),
-                    array('offset' =>  512, 'result' => '49b18b42f8e8367cbeb5ef104ba1c7cd'),
-                    array('offset' =>  752, 'result' => '87084b3ba700bade955610672745b374'),
-                    array('offset' =>  768, 'result' => 'e7a7b9e9ec540d5ff43bdb12792d1b35'),
-                    array('offset' => 1008, 'result' => 'c799b596738f6b018c76c74b1759bd90'),
-                    array('offset' => 1024, 'result' => '7fec5bfd9f9b89ce6548309092d7e958'),
-                    array('offset' => 1520, 'result' => '40f250b26d1f096a4afd4c340a588815'),
-                    array('offset' => 1536, 'result' => '3e34135c79db010200767651cf263073'),
-                    array('offset' => 2032, 'result' => 'f656abccf88dd827027b2ce917d464ec'),
-                    array('offset' => 2048, 'result' => '18b62503bfbc077fbabb98f20d98ab34'),
-                    array('offset' => 3056, 'result' => '8aed95ee5b0dcbfbef4eb21d3a3f52f9'),
-                    array('offset' => 3072, 'result' => '625a1ab00ee39a5327346bddb01a9c18'),
-                    array('offset' => 4080, 'result' => 'a13a7c79c7e119b5ab0296ab28c300b9'),
-                    array('offset' => 4096, 'result' => 'f3e4c0a2e02d1d01f7f0a74618af2b48')
-                )
-            )
-        );
+                'output' => [
+                    ['offset' =>    0, 'result' => 'eaa6bd25880bf93d3f5d1e4ca2611d91'],
+                    ['offset' =>   16, 'result' => 'cfa45c9f7e714b54bdfa80027cb14380'],
+                    ['offset' =>  240, 'result' => '114ae344ded71b35f2e60febad727fd8'],
+                    ['offset' =>  256, 'result' => '02e1e7056b0f623900496422943e97b6'],
+                    ['offset' =>  496, 'result' => '91cb93c787964e10d9527d999c6f936b'],
+                    ['offset' =>  512, 'result' => '49b18b42f8e8367cbeb5ef104ba1c7cd'],
+                    ['offset' =>  752, 'result' => '87084b3ba700bade955610672745b374'],
+                    ['offset' =>  768, 'result' => 'e7a7b9e9ec540d5ff43bdb12792d1b35'],
+                    ['offset' => 1008, 'result' => 'c799b596738f6b018c76c74b1759bd90'],
+                    ['offset' => 1024, 'result' => '7fec5bfd9f9b89ce6548309092d7e958'],
+                    ['offset' => 1520, 'result' => '40f250b26d1f096a4afd4c340a588815'],
+                    ['offset' => 1536, 'result' => '3e34135c79db010200767651cf263073'],
+                    ['offset' => 2032, 'result' => 'f656abccf88dd827027b2ce917d464ec'],
+                    ['offset' => 2048, 'result' => '18b62503bfbc077fbabb98f20d98ab34'],
+                    ['offset' => 3056, 'result' => '8aed95ee5b0dcbfbef4eb21d3a3f52f9'],
+                    ['offset' => 3072, 'result' => '625a1ab00ee39a5327346bddb01a9c18'],
+                    ['offset' => 4080, 'result' => 'a13a7c79c7e119b5ab0296ab28c300b9'],
+                    ['offset' => 4096, 'result' => 'f3e4c0a2e02d1d01f7f0a74618af2b48'],
+                ],
+            ],
+        ];
 
-        $result = array();
+        $result = [];
 
-        foreach ($engines as $engine => $engineName) {
+        foreach ($engines as $engine) {
             foreach ($tests as $test) {
                 foreach ($test['output'] as $output) {
-                    $result[] = array($engine, $engineName, $test['key'], $output['offset'], $output['result']);
+                    $result[] = [$engine, $test['key'], $output['offset'], $output['result']];
                 }
             }
         }
@@ -198,15 +204,47 @@ public function engineVectors()
     /**
      * @dataProvider engineVectors
      */
-    public function testVectors($engine, $engineName, $key, $offset, $expected)
+    public function testVectors($engine, $key, $offset, $expected): void
     {
         $rc4 = new RC4();
         $rc4->setPreferredEngine($engine);
         $rc4->setKey($key);
         if ($rc4->getEngine() != $engine) {
-            self::markTestSkipped('Unable to initialize ' . $engineName . ' engine for ' . (strlen($key) * 8) . '-bit key');
+            self::markTestSkipped('Unable to initialize ' . $engine . ' engine for ' . (strlen($key) * 8) . '-bit key');
         }
         $result = $rc4->encrypt(str_repeat("\0", $offset + 16));
-        $this->assertEquals(bin2hex(substr($result, -16)), $expected, "Failed asserting that key $key yielded expected output at offset $offset in $engineName engine");
+        $this->assertEquals(bin2hex(substr($result, -16)), $expected, "Failed asserting that key $key yielded expected output at offset $offset in $engine engine");
+    }
+
+    public function testKeySizes(): void
+    {
+        $objects = $engines = [];
+        $temp = new RC4(RC4::MODE_CTR);
+        $temp->setPreferredEngine('internal');
+        $objects[] = $temp;
+        $engines[] = 'internal';
+
+        if ($temp->isValidEngine('openssl')) {
+            $temp = new RC4(RC4::MODE_CTR);
+            $temp->setPreferredEngine('openssl');
+            $objects[] = $temp;
+            $engines[] = 'OpenSSL';
+        }
+
+        if (count($objects) < 2) {
+            self::markTestSkipped('Unable to initialize two or more engines');
+        }
+
+        $plaintext = str_repeat('.', 100);
+
+        for ($keyLen = 5; $keyLen <= 256; $keyLen++) {
+            $key = Random::string($keyLen);
+            $objects[0]->setKey($key);
+            $ref = $objects[0]->encrypt($plaintext);
+            for ($i = 1; $i < count($objects); $i++) {
+                $objects[$i]->setKey($key);
+                $this->assertEquals($ref, $objects[$i]->encrypt($plaintext), "Failed asserting that {$engines[$i]} yields the same output as the internal engine with a key size of $keyLen");
+            }
+        }
     }
 }
diff --git a/tests/Unit/Crypt/RSA/CreateKeyTest.php b/tests/Unit/Crypt/RSA/CreateKeyTest.php
index 4b9a89fd9..9cdae7ae3 100644
--- a/tests/Unit/Crypt/RSA/CreateKeyTest.php
+++ b/tests/Unit/Crypt/RSA/CreateKeyTest.php
@@ -1,34 +1,84 @@
 <?php
+
 /**
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\Crypt\RSA;
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt\RSA;
+
+use phpseclib3\Crypt\RSA;
+use phpseclib3\Crypt\RSA\Formats\Keys\PKCS1;
+use phpseclib3\Crypt\RSA\Formats\Keys\PKCS8;
+use phpseclib3\Crypt\RSA\PrivateKey;
+use phpseclib3\Crypt\RSA\PublicKey;
+use phpseclib3\Tests\PhpseclibTestCase;
 
-class Unit_Crypt_RSA_CreateKeyTest extends PhpseclibTestCase
+class CreateKeyTest extends PhpseclibTestCase
 {
-    public function testCreateKey()
+    public function testCreateKey(): array
     {
-        extract(RSA::createKey(512));
-        $this->assertInstanceOf('\phpseclib\Crypt\RSA', $privatekey);
-        $this->assertInstanceOf('\phpseclib\Crypt\RSA', $publickey);
+        $privatekey = RSA::createKey(768);
+        $publickey = $privatekey->getPublicKey();
+        $this->assertInstanceOf(PrivateKey::class, $privatekey);
+        $this->assertInstanceOf(PublicKey::class, $publickey);
         $this->assertNotEmpty("$privatekey");
         $this->assertNotEmpty("$publickey");
+        $this->assertSame($privatekey->getLength(), 768);
+        $this->assertSame($publickey->getLength(), 768);
 
-        return array($publickey, $privatekey);
+        return [$publickey, $privatekey];
     }
 
     /**
      * @depends testCreateKey
      */
-    public function testEncryptDecrypt($args)
+    public function testEncryptDecrypt($args): void
     {
-        list($publickey, $privatekey) = $args;
+        [$publickey, $privatekey] = $args;
         $ciphertext = $publickey->encrypt('zzz');
-        $this->assertInternalType('string', $ciphertext);
+        $this->assertIsString($ciphertext);
         $plaintext = $privatekey->decrypt($ciphertext);
         $this->assertSame($plaintext, 'zzz');
     }
+
+    public function testMultiPrime(): void
+    {
+        RSA::useInternalEngine();
+        RSA::setSmallestPrime(256);
+        $privatekey = RSA::createKey(1024);
+        $publickey = $privatekey->getPublicKey();
+        $this->assertInstanceOf(PrivateKey::class, $privatekey);
+        $this->assertInstanceOf(PublicKey::class, $publickey);
+        $this->assertNotEmpty($privatekey->toString('PKCS1'));
+        $this->assertNotEmpty($publickey->toString('PKCS1'));
+        $this->assertSame($privatekey->getLength(), 1024);
+        $this->assertSame($publickey->getLength(), 1024);
+        $r = PKCS1::load($privatekey->toString('PKCS1'));
+        $this->assertCount(4, $r['primes']);
+        // the last prime number could be slightly over. eg. 99 * 99 == 9801 but 10 * 10 = 100. the more numbers you're
+        // multiplying the less certain you are to have each of them multiply to an n-bit number
+        foreach (array_slice($r['primes'], 0, 3) as $i => $prime) {
+            $this->assertSame($prime->getLength(), 256);
+        }
+
+        $rsa = RSA::load($privatekey->toString('PKCS1'));
+        $signature = $rsa->sign('zzz');
+        $rsa = RSA::load($rsa->getPublicKey()->toString('PKCS1'));
+        $this->assertTrue($rsa->verify('zzz', $signature));
+
+        RSA::useBestEngine();
+    }
+
+    public function test3DESPKCS8Encryption(): void
+    {
+        $key = RSA::createKey(768)
+            ->withPassword('demo')
+            ->toString('PKCS8', ['encryptionAlgorithm' => 'pbeWithSHAAnd3-KeyTripleDES-CBC']);
+        $actual = PKCS8::extractEncryptionAlgorithm($key)['algorithm'];
+        $this->assertSame($actual, 'pbeWithSHAAnd3-KeyTripleDES-CBC');
+    }
 }
diff --git a/tests/Unit/Crypt/RSA/LoadKeyTest.php b/tests/Unit/Crypt/RSA/LoadKeyTest.php
index 85de2b3c5..909eb2043 100644
--- a/tests/Unit/Crypt/RSA/LoadKeyTest.php
+++ b/tests/Unit/Crypt/RSA/LoadKeyTest.php
@@ -1,30 +1,58 @@
 <?php
+
 /**
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2013 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\Crypt\RSA;
-use phpseclib\Crypt\RSA\PKCS1;
-use phpseclib\Crypt\RSA\PuTTY;
-use phpseclib\Math\BigInteger;
-
-class Unit_Crypt_RSA_LoadKeyTest extends PhpseclibTestCase
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt\RSA;
+
+use phpseclib3\Crypt\PublicKeyLoader;
+use phpseclib3\Crypt\RSA;
+use phpseclib3\Crypt\RSA\Formats\Keys\OpenSSH;
+use phpseclib3\Crypt\RSA\Formats\Keys\PKCS1;
+use phpseclib3\Crypt\RSA\Formats\Keys\PKCS8;
+use phpseclib3\Crypt\RSA\Formats\Keys\PSS;
+use phpseclib3\Crypt\RSA\Formats\Keys\PuTTY;
+use phpseclib3\Crypt\RSA\PrivateKey;
+use phpseclib3\Crypt\RSA\PublicKey;
+use phpseclib3\Exception\NoKeyLoadedException;
+use phpseclib3\Exception\UnsupportedFormatException;
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Tests\PhpseclibTestCase;
+
+class LoadKeyTest extends PhpseclibTestCase
 {
-    public function testBadKey()
+    public static function setUpBeforeClass(): void
     {
-        $rsa = new RSA();
+        PuTTY::setComment('phpseclib-generated-key');
+        OpenSSH::setComment('phpseclib-generated-key');
+    }
 
-        $key = 'zzzzzzzzzzzzzz';
+    public function testBadKey(): void
+    {
+        $this->expectException(NoKeyLoadedException::class);
 
-        $this->assertFalse($rsa->load($key));
+        $key = 'zzzzzzzzzzzzzz';
+        PublicKeyLoader::load($key);
     }
 
-    public function testPKCS1Key()
+    public function testLoadModulusAndExponent(): void
     {
-        $rsa = new RSA();
+        $rsa = PublicKeyLoader::load([
+            'e' => new BigInteger('123', 16),
+            'n' => new BigInteger('123', 16),
+        ]);
+
+        $this->assertInstanceOf(PublicKey::class, $rsa);
+        $this->assertIsString("$rsa");
+    }
 
+    public function testPKCS1Key(): void
+    {
         $key = '-----BEGIN RSA PRIVATE KEY-----
 MIICXAIBAAKBgQCqGKukO1De7zhZj6+H0qtjTkVxwTCpvKe4eCZ0FPqri0cb2JZfXJ/DgYSF6vUp
 wmJG8wVQZKjeGcjDOL5UlsuusFncCzWBQ7RKNUSesmQRMSGkVb1/3j+skZ6UtW+5u09lHNsj6tQ5
@@ -39,14 +67,14 @@ public function testPKCS1Key()
 37sJ5QsW+sJyoNde3xH8vdXhzU7eT82D6X/scw9RZz+/6rCJ4p0=
 -----END RSA PRIVATE KEY-----';
 
-        $this->assertTrue($rsa->load($key));
-        $this->assertInternalType('string', $rsa->getPrivateKey());
+        $rsa = PublicKeyLoader::load($key);
+
+        $this->assertInstanceOf(PrivateKey::class, $rsa);
+        $this->assertIsString("$rsa");
     }
 
-    public function testPKCS1SpacesKey()
+    public function testPKCS1SpacesKey(): void
     {
-        $rsa = new RSA();
-
         $key = '-----BEGIN RSA PRIVATE KEY-----
 MIICXAIBAAKBgQCqGKukO1De7zhZj6+H0qtjTkVxwTCpvKe4eCZ0FPqri0cb2JZfXJ/DgYSF6vUp
 wmJG8wVQZKjeGcjDOL5UlsuusFncCzWBQ7RKNUSesmQRMSGkVb1/3j+skZ6UtW+5u09lHNsj6tQ5
@@ -60,16 +88,16 @@ public function testPKCS1SpacesKey()
 U9VQQSQzY1oZMVX8i1m5WUTLPz2yLJIBQVdXqhMCQBGoiuSoSjafUhV7i1cEGpb88h5NBYZzWXGZ
 37sJ5QsW+sJyoNde3xH8vdXhzU7eT82D6X/scw9RZz+/6rCJ4p0=
 -----END RSA PRIVATE KEY-----';
-        $key = str_replace(array("\r", "\n", "\r\n"), ' ', $key);
+        $key = str_replace(["\r", "\n", "\r\n"], ' ', $key);
+
+        $rsa = PublicKeyLoader::load($key);
 
-        $this->assertTrue($rsa->load($key));
-        $this->assertInternalType('string', $rsa->getPrivateKey());
+        $this->assertInstanceOf(PrivateKey::class, $rsa);
+        $this->assertIsString("$rsa");
     }
 
-    public function testPKCS1NoHeaderKey()
+    public function testPKCS1NoHeaderKey(): void
     {
-        $rsa = new RSA();
-
         $key = 'MIICXAIBAAKBgQCqGKukO1De7zhZj6+H0qtjTkVxwTCpvKe4eCZ0FPqri0cb2JZfXJ/DgYSF6vUp
 wmJG8wVQZKjeGcjDOL5UlsuusFncCzWBQ7RKNUSesmQRMSGkVb1/3j+skZ6UtW+5u09lHNsj6tQ5
 1s1SPrCBkedbNf0Tp0GbMJDyR4e9T04ZZwIDAQABAoGAFijko56+qGyN8M0RVyaRAXz++xTqHBLh
@@ -82,14 +110,14 @@ public function testPKCS1NoHeaderKey()
 U9VQQSQzY1oZMVX8i1m5WUTLPz2yLJIBQVdXqhMCQBGoiuSoSjafUhV7i1cEGpb88h5NBYZzWXGZ
 37sJ5QsW+sJyoNde3xH8vdXhzU7eT82D6X/scw9RZz+/6rCJ4p0=';
 
-        $this->assertTrue($rsa->load($key));
-        $this->assertInternalType('string', $rsa->getPrivateKey());
+        $rsa = PublicKeyLoader::load($key);
+
+        $this->assertInstanceOf(PrivateKey::class, $rsa);
+        $this->assertIsString("$rsa");
     }
 
-    public function testPKCS1NoWhitespaceNoHeaderKey()
+    public function testPKCS1NoWhitespaceNoHeaderKey(): void
     {
-        $rsa = new RSA();
-
         $key = 'MIICXAIBAAKBgQCqGKukO1De7zhZj6+H0qtjTkVxwTCpvKe4eCZ0FPqri0cb2JZfXJ/DgYSF6vUp' .
                'wmJG8wVQZKjeGcjDOL5UlsuusFncCzWBQ7RKNUSesmQRMSGkVb1/3j+skZ6UtW+5u09lHNsj6tQ5' .
                '1s1SPrCBkedbNf0Tp0GbMJDyR4e9T04ZZwIDAQABAoGAFijko56+qGyN8M0RVyaRAXz++xTqHBLh' .
@@ -102,14 +130,14 @@ public function testPKCS1NoWhitespaceNoHeaderKey()
                'U9VQQSQzY1oZMVX8i1m5WUTLPz2yLJIBQVdXqhMCQBGoiuSoSjafUhV7i1cEGpb88h5NBYZzWXGZ' .
                '37sJ5QsW+sJyoNde3xH8vdXhzU7eT82D6X/scw9RZz+/6rCJ4p0=';
 
-        $this->assertTrue($rsa->load($key));
-        $this->assertInternalType('string', $rsa->getPrivateKey());
+        $rsa = PublicKeyLoader::load($key);
+
+        $this->assertInstanceOf(PrivateKey::class, $rsa);
+        $this->assertIsString("$rsa");
     }
 
-    public function testRawPKCS1Key()
+    public function testRawPKCS1Key(): void
     {
-        $rsa = new RSA();
-
         $key = 'MIICXAIBAAKBgQCqGKukO1De7zhZj6+H0qtjTkVxwTCpvKe4eCZ0FPqri0cb2JZfXJ/DgYSF6vUp' .
                'wmJG8wVQZKjeGcjDOL5UlsuusFncCzWBQ7RKNUSesmQRMSGkVb1/3j+skZ6UtW+5u09lHNsj6tQ5' .
                '1s1SPrCBkedbNf0Tp0GbMJDyR4e9T04ZZwIDAQABAoGAFijko56+qGyN8M0RVyaRAXz++xTqHBLh' .
@@ -123,15 +151,14 @@ public function testRawPKCS1Key()
                '37sJ5QsW+sJyoNde3xH8vdXhzU7eT82D6X/scw9RZz+/6rCJ4p0=';
         $key = base64_decode($key);
 
-        $this->assertTrue($rsa->load($key));
-        $this->assertInternalType('string', $rsa->getPrivateKey());
+        $rsa = PublicKeyLoader::load($key);
+
+        $this->assertInstanceOf(PrivateKey::class, $rsa);
+        $this->assertIsString("$rsa");
     }
 
-    public function testLoadPKCS8PrivateKey()
+    public function testLoadPKCS8PrivateKey(): void
     {
-        $rsa = new RSA();
-        $rsa->setPassword('password');
-
         $key = '-----BEGIN ENCRYPTED PRIVATE KEY-----
 MIIE6TAbBgkqhkiG9w0BBQMwDgQIcWWgZeQYPTcCAggABIIEyLoa5b3ktcPmy4VB
 hHkpHzVSEsKJPmQTUaQvUwIp6+hYZeuOk78EPehrYJ/QezwJRdyBoD51oOxqWCE2
@@ -162,14 +189,14 @@ public function testLoadPKCS8PrivateKey()
 xryZaRDVmtMuf/OZBQ==
 -----END ENCRYPTED PRIVATE KEY-----';
 
-        $this->assertTrue($rsa->load($key));
-        $this->assertInternalType('string', $rsa->getPrivateKey());
+        $rsa = PublicKeyLoader::load($key, 'password');
+
+        $this->assertInstanceOf(PrivateKey::class, $rsa);
+        $this->assertIsString("$rsa");
     }
 
-    public function testSavePKCS8PrivateKey()
+    public function testSavePKCS8PrivateKey(): void
     {
-        $rsa = new RSA();
-
         $key = '-----BEGIN RSA PRIVATE KEY-----
 MIICXAIBAAKBgQCqGKukO1De7zhZj6+H0qtjTkVxwTCpvKe4eCZ0FPqri0cb2JZfXJ/DgYSF6vUp
 wmJG8wVQZKjeGcjDOL5UlsuusFncCzWBQ7RKNUSesmQRMSGkVb1/3j+skZ6UtW+5u09lHNsj6tQ5
@@ -183,20 +210,19 @@ public function testSavePKCS8PrivateKey()
 U9VQQSQzY1oZMVX8i1m5WUTLPz2yLJIBQVdXqhMCQBGoiuSoSjafUhV7i1cEGpb88h5NBYZzWXGZ
 37sJ5QsW+sJyoNde3xH8vdXhzU7eT82D6X/scw9RZz+/6rCJ4p0=
 -----END RSA PRIVATE KEY-----';
-        $rsa->setPassword('password');
 
-        $this->assertTrue($rsa->load($key));
+        $rsa = PublicKeyLoader::load($key, 'password');
+
+        $this->assertInstanceOf(PrivateKey::class, $rsa);
 
-        $key = $rsa->getPrivateKey('PKCS8');
-        $this->assertInternalType('string', $key);
+        $key = (string) $rsa->withPassword('password');
+        $rsa = PublicKeyLoader::load($key, 'password');
 
-        $this->assertTrue($rsa->load($key));
+        $this->assertInstanceOf(PrivateKey::class, $rsa);
     }
 
-    public function testPubKey1()
+    public function testPubKey1(): void
     {
-        $rsa = new RSA();
-
         $key = '-----BEGIN RSA PUBLIC KEY-----
 MIIBCgKCAQEA61BjmfXGEvWmegnBGSuS+rU9soUg2FnODva32D1AqhwdziwHINFa
 D1MVlcrYG6XRKfkcxnaXGfFDWHLEvNBSEVCgJjtHAGZIm5GL/KA86KDp/CwDFMSw
@@ -206,15 +232,12 @@ public function testPubKey1()
 Ao8eayMp6FcvNucIpUndo1X8dKMv3Y26ZQIDAQAB
 -----END RSA PUBLIC KEY-----';
 
-        $this->assertTrue($rsa->load($key));
-        $this->assertInternalType('string', $rsa->getPublicKey());
-        $this->assertFalse($rsa->getPrivateKey());
+        $rsa = PublicKeyLoader::load($key);
+        $this->assertInstanceOf(PublicKey::class, $rsa);
     }
 
-    public function testPubKey2()
+    public function testPubKey2(): void
     {
-        $rsa = new RSA();
-
         $key = '-----BEGIN PUBLIC KEY-----
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA61BjmfXGEvWmegnBGSuS
 +rU9soUg2FnODva32D1AqhwdziwHINFaD1MVlcrYG6XRKfkcxnaXGfFDWHLEvNBS
@@ -225,45 +248,114 @@ public function testPubKey2()
 ZQIDAQAB
 -----END PUBLIC KEY-----';
 
-        $this->assertTrue($rsa->load($key));
-        $this->assertInternalType('string', $rsa->getPublicKey());
-        $this->assertFalse($rsa->getPrivateKey());
+        $rsa = PublicKeyLoader::load($key);
+        $this->assertInstanceOf(PublicKey::class, $rsa);
     }
 
-    public function testSSHPubKey()
+
+    public function testPubKeyPssWithoutParams(): void
     {
-        $rsa = new RSA();
+        // extracted from a SubjectPublicKeyInfo of a CSR created by OpenSSL
+        $key = '-----BEGIN PUBLIC KEY-----
+MIIBIDALBgkqhkiG9w0BAQoDggEPADCCAQoCggEBANHPPf5tjTmEHtQvzi6+rItj
+G3OUvh6Nihc9bXSu0xNFjl/9TdyIXstRUG/Lh07isHgZFEfXn4pmm/iZIQh09ACg
+TjEau8rpcLB0BS9dDgTh8hvgkbdxWR2UPxk34bFcdgIplckslAfB4+/ebL+ObvUa
+W3sZosTq3D6/qh0fujGZg/EKLJcNCHI27XMiAT5yWztSjHWwQm7LBwJ5uKlFLEDC
+Z/+LIV/vPEIMfE6lA/+OnLKwVFB540eXQPuWar1ARHXN8PpiCqJHanddYMA5l/Cw
+5R7kJ+CBoHzaPePXjB9V1bfzEBzBHb2ddiSjum+qtLWuH0Q7B8gPX9EjxIwuCzMC
+AwEAAQ==
+-----END PUBLIC KEY-----';
+        $key = str_replace(["\r", "\n", "\r\n"], ' ', $key);
+
+        $rsa = PublicKeyLoader::load($key);
 
+        $this->assertInstanceOf(PublicKey::class, $rsa);
+        $this->assertIsString("$rsa");
+    }
+
+    public function testPrivateKeyPssWithoutParams(): void
+    {
+        $key = '-----BEGIN PRIVATE KEY-----
+MIIEugIBADALBgkqhkiG9w0BAQoEggSmMIIEogIBAAKCAQEA0c89/m2NOYQe1C/O
+Lr6si2Mbc5S+Ho2KFz1tdK7TE0WOX/1N3Ihey1FQb8uHTuKweBkUR9efimab+Jkh
+CHT0AKBOMRq7yulwsHQFL10OBOHyG+CRt3FZHZQ/GTfhsVx2AimVySyUB8Hj795s
+v45u9RpbexmixOrcPr+qHR+6MZmD8Qoslw0IcjbtcyIBPnJbO1KMdbBCbssHAnm4
+qUUsQMJn/4shX+88Qgx8TqUD/46csrBUUHnjR5dA+5ZqvUBEdc3w+mIKokdqd11g
+wDmX8LDlHuQn4IGgfNo949eMH1XVt/MQHMEdvZ12JKO6b6q0ta4fRDsHyA9f0SPE
+jC4LMwIDAQABAoIBAFPuTMWAO7Obh92oNhn7CvlDr1KgWSHNy0UavLOl0ChwddEu
+erxTDWDWaZAfYkSLaL7SgYtv1ZG/FHvxfgZtCsNJXZ5FLISyt/LOpthYqGgJnxnJ
+z2EMBfNQP6Gt+ipCa67XxeTRYXJs/OsTFnvW1cpVPe1TxwpxTaQIdlvqOkjmgCci
+TRzH+Acj8unWDHAJpQkCOvmi+25sE0BMQYWnsfMSzm63Yk3SeZLIJKqoUdZhYMZU
+6FK2DMDNR4TZps7s50MFlZfUUJfzgb4Hb4miiKzLPhf4q7rxS4VzrvUQ/81ySCwi
+1LaSw5HoH1YMDT6rwcHMwHhzhu8X2CKlNIrri8ECgYEA7aiZAxmlY28LWcXHqqhZ
+Yky76vLy/mbs0TfAVK2pSqyFhaGZe5daAJSIrVcZEEgAwR6/ZLITTWBuGdsHw6vF
+GtSvkElLhopmQEs73kKqeBFLhpTqYXYVW0txi3jdWElie8fZa/Oa/sFLEeNsibQu
+fbVWWGakf9458FDuR0i2k+ECgYEA4gBu2u6xkJzqOzOjBg5tNhxmzcPyt4Ds3ryA
+e+C5hVCotd1EX6HZRPYjLEys0yUhiXDAn7ViEdtiXt9RYfpK+OKLGeTZ7pMCyZW+
+Yhc0i2XYqWSKUH3iNonp8B0JSkfEQBY2KlA7b5YZQZkr/Ml/WtoKeicHLBcdVxqa
+t7krQZMCgYBMU7GQxVPQs4E5u8N8k8ThRTO1KYHRIs08BGPIzl1oli/r0xKwFtPZ
+C9s5kJeEGxvi6jUd6fM5DpdNxoKf3TLYgyY/eMrA0wIz8/WuVErbdPKErp733izN
+vVUiLhcom6j9iBnUCdDlsL6jaB8burqTtQGeMpjyWDTTcaqVSk0ZAQKBgCqc1EoZ
+eYd/3rZc7R8mNzddsZCYorow5/izaDJzU+esJrNrzgmOFc5n7ofayTdip+knRlqW
+s7AUQn8K8mhb7ijxZjLysJjIRV1HC8epAnJKOMjvuRimM7H+3Qo2H1tPHtTKm1nt
+GNfYYFi7Dc0zHP0/YXxYwYRxs0mKLaP4mQxbAoGARHngPhGC0yM5KqxNrkHPVjLq
+CHQy+e9GTPXtDLC3D7HAYyyzKqy4mdBDzMeLqA3a+iT2PXjn4w5zOEW8GAcRYRtG
+3EyvclPmWtmCpU5xqD8ieFtQhMeW/XzJHjTXlcncz0PCkGVoQiuRvXWNAukNPg0D
+BocC2CO6SNi4Qjr3NlM=
+-----END PRIVATE KEY-----';
+
+        $key = str_replace(["\r", "\n", "\r\n"], ' ', $key);
+
+        $rsa = PublicKeyLoader::load($key);
+
+        $this->assertInstanceOf(PrivateKey::class, $rsa);
+        $this->assertIsString("$rsa");
+    }
+
+    public function testPubPrivateKey(): void
+    {
+        $key = '-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA61BjmfXGEvWmegnBGSuS+rU9soUg2FnODva32D1AqhwdziwHINFa
+D1MVlcrYG6XRKfkcxnaXGfFDWHLEvNBSEVCgJjtHAGZIm5GL/KA86KDp/CwDFMSw
+luowcXwDwoyinmeOY9eKyh6aY72xJh7noLBBq1N0bWi1e2i+83txOCg4yV2oVXhB
+o8pYEJ8LT3el6Smxol3C1oFMVdwPgc0vTl25XucMcG/ALE/KNY6pqC2AQ6R2ERlV
+gPiUWOPatVkt7+Bs3h5Ramxh7XjBOXeulmCpGSynXNcpZ/06+vofGi/2MlpQZNhH
+Ao8eayMp6FcvNucIpUndo1X8dKMv3Y26ZQIDAQAB
+-----END RSA PUBLIC KEY-----';
+
+        $rsa = PublicKeyLoader::load($key)->asPrivateKey();
+        $this->assertInstanceOf(PrivateKey::class, $rsa);
+        $this->assertIsString($rsa->sign('zzz'));
+    }
+
+    public function testSSHPubKey(): void
+    {
         $key = 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCqGKukO1De7zhZj6+H0qtjTkVxwTCpvKe4e' .
                'CZ0FPqri0cb2JZfXJ/DgYSF6vUpwmJG8wVQZKjeGcjDOL5UlsuusFncCzWBQ7RKNUSesmQRMS' .
                'GkVb1/3j+skZ6UtW+5u09lHNsj6tQ51s1SPrCBkedbNf0Tp0GbMJDyR4e9T04ZZw== ' .
                'phpseclib-generated-key';
 
-        $this->assertTrue($rsa->load($key));
-        $this->assertInternalType('string', $rsa->getPublicKey());
-        $this->assertFalse($rsa->getPrivateKey());
+        $rsa = PublicKeyLoader::load($key);
+        $this->assertInstanceOf(PublicKey::class, $rsa);
     }
 
-    public function testSSHPubKeyFingerprint()
+    public function testSSHPubKeyFingerprint(): void
     {
-        $rsa = new RSA();
-
-        $key = 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD9K+ebJRMN10kGanhi6kDz6EYFqZttZWZh0'.
-              'YoEbIbbere9N2Yvfc7oIoCTHYowhXND9WSJaIs1E4bx0085CZnofWaqf4NbZTzAh18iZup08ec'.
-              'COB5gJVS1efpgVSviDF2L7jxMsBVoOBfqsmA8m0RwDDVezyWvw4y+STSuVzu2jI8EfwN7ZFGC6'.
-              'Yo8m/Z94qIGzqPYGKJLuCeidB0TnUE0ZtzOJTiOc/WoTm/NOpCdfQZEJggd1MOTi+QUnqRu4Wu'.
-              'b6wYtY/q/WtUFr3nK+x0lgOtokhnJfRR/6fnmC1CztPnIT4BWK81VGKWONAxuhMyQ5XChyu6S9'.
+        $key = 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD9K+ebJRMN10kGanhi6kDz6EYFqZttZWZh0' .
+              'YoEbIbbere9N2Yvfc7oIoCTHYowhXND9WSJaIs1E4bx0085CZnofWaqf4NbZTzAh18iZup08ec' .
+              'COB5gJVS1efpgVSviDF2L7jxMsBVoOBfqsmA8m0RwDDVezyWvw4y+STSuVzu2jI8EfwN7ZFGC6' .
+              'Yo8m/Z94qIGzqPYGKJLuCeidB0TnUE0ZtzOJTiOc/WoTm/NOpCdfQZEJggd1MOTi+QUnqRu4Wu' .
+              'b6wYtY/q/WtUFr3nK+x0lgOtokhnJfRR/6fnmC1CztPnIT4BWK81VGKWONAxuhMyQ5XChyu6S9' .
               'mWG5tUlUI/5';
 
-        $this->assertTrue($rsa->load($key));
-        $this->assertSame($rsa->getPublicKeyFingerprint('md5'), 'bd:2c:2f:31:b9:ef:b8:f8:ad:fc:40:a6:94:4f:28:82');
-        $this->assertSame($rsa->getPublicKeyFingerprint('sha256'), 'N9sV2uSNZEe8TITODku0pRI27l+Zk0IY0TrRTw3ozwM');
+        $rsa = PublicKeyLoader::load($key, 'password');
+        $this->assertInstanceOf(PublicKey::class, $rsa);
+        $this->assertSame($rsa->getFingerprint('md5'), 'bd:2c:2f:31:b9:ef:b8:f8:ad:fc:40:a6:94:4f:28:82');
+        $this->assertSame($rsa->getFingerprint('sha256'), 'N9sV2uSNZEe8TITODku0pRI27l+Zk0IY0TrRTw3ozwM');
     }
 
-    public function testSetPrivate()
+    public function testSetPrivate(): void
     {
-        $rsa = new RSA();
-
         $key = '-----BEGIN RSA PUBLIC KEY-----
 MIIBCgKCAQEA61BjmfXGEvWmegnBGSuS+rU9soUg2FnODva32D1AqhwdziwHINFa
 D1MVlcrYG6XRKfkcxnaXGfFDWHLEvNBSEVCgJjtHAGZIm5GL/KA86KDp/CwDFMSw
@@ -273,29 +365,28 @@ public function testSetPrivate()
 Ao8eayMp6FcvNucIpUndo1X8dKMv3Y26ZQIDAQAB
 -----END RSA PUBLIC KEY-----';
 
-        $this->assertTrue($rsa->load($key));
-        $this->assertTrue($rsa->setPrivateKey());
+        $rsa = PublicKeyLoader::load($key);
+        $this->assertInstanceOf(PublicKey::class, $rsa);
+        $rsa = $rsa->asPrivateKey();
+        $this->assertInstanceOf(PrivateKey::class, $rsa);
         $this->assertGreaterThanOrEqual(1, strlen("$rsa"));
-        $this->assertFalse($rsa->getPublicKey());
     }
 
     /**
      * make phpseclib generated XML keys be unsigned. this may need to be reverted
      * if it is later learned that XML keys are, in fact, supposed to be signed
+     *
      * @group github468
      */
-    public function testUnsignedXML()
+    public function testUnsignedXML(): void
     {
-        $rsa = new RSA();
-
         $key = '<RSAKeyValue>
   <Modulus>v5OxcEgxPUfa701NpxnScCmlRkbwSGBiTWobHkIWZEB+AlRTHaVoZg/D8l6YzR7VdQidG6gF+nuUMjY75dBXgY/XcyVq0Hccf1jTfgARuNuq4GGG3hnCJVi2QsOgcf9R7TeXn+p1RKIhjQoWCiEQeEBTotNbJhcabNcPGSEJw+s=</Modulus>
   <Exponent>AQAB</Exponent>
 </RSAKeyValue>';
 
-        $rsa->load($key);
-        $rsa->setPublicKey();
-        $newkey = $rsa->getPublicKey('XML');
+        $rsa = PublicKeyLoader::load($key);
+        $newkey = $rsa->toString('XML');
 
         $this->assertSame(strtolower(preg_replace('#\s#', '', $key)), strtolower(preg_replace('#\s#', '', $newkey)));
     }
@@ -303,10 +394,8 @@ public function testUnsignedXML()
     /**
      * @group github468
      */
-    public function testSignedPKCS1()
+    public function testSignedPKCS1(): void
     {
-        $rsa = new RSA();
-
         $key = '-----BEGIN PUBLIC KEY-----
 MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC/k7FwSDE9R9rvTU2nGdJwKaVG
 RvBIYGJNahseQhZkQH4CVFMdpWhmD8PyXpjNHtV1CJ0bqAX6e5QyNjvl0FeBj9dz
@@ -314,9 +403,8 @@ public function testSignedPKCS1()
 01smFxps1w8ZIQnD6wIDAQAB
 -----END PUBLIC KEY-----';
 
-        $rsa->load($key);
-        $rsa->setPublicKey();
-        $newkey = $rsa->getPublicKey();
+        $rsa = PublicKeyLoader::load($key);
+        $newkey = "$rsa";
 
         $this->assertSame(preg_replace('#\s#', '', $key), preg_replace('#\s#', '', $newkey));
     }
@@ -324,10 +412,8 @@ public function testSignedPKCS1()
     /**
      * @group github861
      */
-    public function testPKCS8Only()
+    public function testPKCS8Only(): void
     {
-        $rsa = new RSA();
-
         $key = '-----BEGIN PRIVATE KEY-----
 MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAKB0yPMAbUHKqJxP
 5sjG9AOrQSAYNDc34NsnZ1tsi7fZ9lHlBaKZ6gjm2U9q+/qCKv2BuGINxWo2CMJp
@@ -345,15 +431,13 @@ public function testPKCS8Only()
 Z2sKniRCcDT1ZP4=
 -----END PRIVATE KEY-----';
 
-        $result = $rsa->load($key, 'PKCS8');
+        $rsa = RSA::load($key);
 
-        $this->assertTrue($result);
+        $this->assertInstanceOf(PrivateKey::class, $rsa);
     }
 
-    public function testPKCS1EncryptionChange()
+    public function testPKCS1EncryptionChange(): void
     {
-        $rsa = new RSA();
-
         $key = 'PuTTY-User-Key-File-2: ssh-rsa
 Encryption: none
 Comment: phpseclib-generated-key
@@ -374,42 +458,24 @@ public function testPKCS1EncryptionChange()
 Private-MAC: 03e2cb74e1d67652fbad063d2ed0478f31bdf256
 ';
         $key = preg_replace('#(?<!\r)\n#', "\r\n", $key);
-        $this->assertTrue($rsa->load($key));
+        $rsa = PublicKeyLoader::load($key);
+        $this->assertInstanceOf(PrivateKey::class, $rsa);
 
         PKCS1::setEncryptionAlgorithm('AES-256-CBC');
-        $rsa->setPassword('demo');
+        $encryptedKey = $rsa->withPassword('demo')->toString('PKCS1');
 
-        $encryptedKey = (string) $rsa;
+        $this->assertMatchesRegularExpression('#AES-256-CBC#', $encryptedKey);
 
-        $this->assertRegExp('#AES-256-CBC#', $encryptedKey);
+        $rsa = PublicKeyLoader::load($key, 'demo');
+        $this->assertInstanceOf(PrivateKey::class, $rsa);
 
-        $rsa = new RSA();
-        $rsa->setPassword('demo');
-        $this->assertTrue($rsa->load($encryptedKey));
-        $rsa->setPassword();
-        $rsa->setPrivateKeyFormat('PuTTY');
-        $key2 = (string) $rsa;
+        OpenSSH::setComment('ecdsa-key-20181105');
+        $key2 = $rsa->withPassword()->toString('PuTTY');
 
         $this->assertSame($key, $key2);
     }
 
-    public function testRawKey()
-    {
-        $rsa = new RSA();
-
-        $key = array(
-            'e' => new BigInteger('10001', 16),
-            'n' => new BigInteger('aa18aba43b50deef38598faf87d2ab634e4571c130a9bca7b878267414faab8b471bd8965f5c9fc3' .
-                              '818485eaf529c26246f3055064a8de19c8c338be5496cbaeb059dc0b358143b44a35449eb2641131' .
-                              '21a455bd7fde3fac919e94b56fb9bb4f651cdb23ead439d6cd523eb08191e75b35fd13a7419b3090' .
-                              'f24787bd4f4e1967', 16)
-        );
-        $this->assertTrue($rsa->load($key));
-        $rsa->setPublicKeyFormat('raw');
-        $this->assertEmpty("$rsa");
-    }
-
-    public function testRawComment()
+    public function testRawComment(): void
     {
         $key = 'PuTTY-User-Key-File-2: ssh-rsa
 Encryption: aes256-cbc
@@ -429,16 +495,13 @@ public function testRawComment()
 EOpSeghXSs7IilJu8I6/sB1w5dakdeBSFkIynrlFXkO0uUw+QJJWjxY8SypzgIuP
 DzduF6XsQrCyo6dnIpGQCQ==
 Private-MAC: 35134b7434bf828b21404099861d455e660e8740';
+
         $raw = PuTTY::load($key, 'password');
         $this->assertArrayHasKey('comment', $raw);
         $this->assertEquals($raw['comment'], 'phpseclib-generated-key');
-
-        $rsa = new RSA();
-        $rsa->load($raw);
-        $this->assertGreaterThanOrEqual(1, strlen("$rsa"));
     }
 
-    public function testPrivateMSBlob()
+    public function testPrivateMSBlob(): void
     {
         $key = 'BwIAAACkAABSU0EyAAQAAAEAAQAnh6FFs6kYe/gmb9dzqsQKmtjFE9mxNAe9mEU3OwOEEfyI' .
                'wkAx0/8dwh12fuP4wzNbdZAq4mmqCE6Lo8wTNNIJVNYEhKq5chHg1+hPDgfETFgtEO54JZSg' .
@@ -454,16 +517,14 @@ public function testPrivateMSBlob()
 
         $plaintext = 'zzz';
 
-        $privKey = new RSA();
-        $privKey->load($key);
-
+        $privKey = PublicKeyLoader::load($key);
+        $this->assertSame($key, $privKey->toString('MSBLOB'));
+        $this->assertInstanceOf(PrivateKey::class, $privKey);
         $this->assertSame($privKey->getLoadedFormat(), 'MSBLOB');
-
         $this->assertGreaterThanOrEqual(1, strlen("$privKey"));
 
-        $pubKey = new RSA();
-        $pubKey->load($privKey->getPublicKey('msblob'));
-
+        $pubKey = PublicKeyLoader::load($privKey->getPublicKey()->toString('msblob'));
+        $this->assertInstanceOf(PublicKey::class, $pubKey);
         $this->assertGreaterThanOrEqual(1, strlen("$pubKey"));
 
         $ciphertext = $pubKey->encrypt($plaintext);
@@ -471,19 +532,18 @@ public function testPrivateMSBlob()
         $this->assertSame($privKey->decrypt($ciphertext), $plaintext);
     }
 
-    public function testNakedOpenSSHKey()
+    public function testNakedOpenSSHKey(): void
     {
         $key = 'AAAAB3NzaC1yc2EAAAABIwAAAIEA/NcGSQFZ0ZgN1EbDusV6LLwLnQjs05ljKcVVP7Z6aKIJUyhUDHE30uJa5XfwPPBsZ3L3Q7S0yycVcuuHjdauugmpn9xx+gyoYs7UiV5G5rvxNcA/Tc+MofGhAMiTmNicorNAs5mv6fRoVbkpIONRXPz6WK0kjx/X04EV42Vm9Qk=';
 
-        $rsa = new RSA();
-        $rsa->load($key);
-
+        $rsa = PublicKeyLoader::load($key);
+        $this->assertInstanceOf(PublicKey::class, $rsa);
         $this->assertSame($rsa->getLoadedFormat(), 'OpenSSH');
 
         $this->assertGreaterThanOrEqual(1, strlen("$rsa"));
     }
 
-    public function testPuttyPublicKey()
+    public function testPuttyPublicKey(): void
     {
         $key = '---- BEGIN SSH2 PUBLIC KEY ----
 Comment: "rsa-key-20151023"
@@ -493,11 +553,894 @@ public function testPuttyPublicKey()
 ILaEujU=
 ---- END SSH2 PUBLIC KEY ----';
 
-        $rsa = new RSA();
-        $rsa->load($key);
-
+        $rsa = PublicKeyLoader::load($key);
+        $this->assertInstanceOf(PublicKey::class, $rsa);
         $this->assertSame($rsa->getLoadedFormat(), 'PuTTY');
 
         $this->assertGreaterThanOrEqual(1, strlen("$rsa"));
     }
+
+    /**
+     * @group github980
+     */
+    public function testZeroComponents(): void
+    {
+        $key = '-----BEGIN RSA PRIVATE KEY-----
+MIGaAgEAAkEAt5yrcHAAjhglnCEn6yecMWPeUXcMyo0+itXrLlkpcKIIyqPw546b
+GThhlb1ppX1ySX/OUA4jSakHekNP5eWPawIBAAJAW6/aVD05qbsZHMvZuS2Aa5Fp
+NNj0BDlf38hOtkhDzz/hkYb+EBYLLvldhgsD0OvRNy8yhz7EjaUqLCB0juIN4QIB
+AAIBAAIBAAIBAAIBAA==
+-----END RSA PRIVATE KEY-----';
+
+        $rsa = PublicKeyLoader::load($key)
+            ->withHash('md5')
+            ->withMGFHash('md5')
+            ->withPadding(RSA::SIGNATURE_PKCS1);
+
+        self::assertSame(
+            'oW0X9GlHa1qyC3Xj2gyzf5VwzLksmIB60icLdrneWA1kTW9RvkfskB4XLs8IVxYy+O8Tm/fJTIPpdNtRB7sfeQ==',
+            base64_encode($rsa->sign('zzzz'))
+        );
+    }
+
+    public function pkcs8tester($key, $pass): void
+    {
+        $rsa = PublicKeyLoader::load($key, $pass);
+        $r = PKCS8::load($key, $pass);
+        PKCS8::setEncryptionAlgorithm($r['meta']['algorithm']);
+        if (isset($r['meta']['cipher'])) {
+            PKCS8::setEncryptionScheme($r['meta']['cipher']);
+        }
+        if (isset($r['meta']['prf'])) {
+            PKCS8::setPRF($r['meta']['prf']);
+        }
+        $newkey = "$rsa";
+
+        $r2 = PKCS8::load($newkey, $pass);
+        $this->assertSame($r['meta']['algorithm'], $r2['meta']['algorithm']);
+        if (isset($r['meta']['cipher']) || isset($r2['meta']['cipher'])) {
+            $this->assertSame($r['meta']['cipher'], $r2['meta']['cipher']);
+        }
+        if (isset($r['meta']['prf']) || isset($r2['meta']['prf'])) {
+            $this->assertSame($r['meta']['prf'], $r2['meta']['prf']);
+        }
+
+        $rsa2 = PublicKeyLoader::load($newkey, $pass);
+
+        // comparing $key to $newkey won't work since phpseclib randomly generates IV's and salt's
+        // so we'll strip the encryption
+
+        $rsa = $rsa->withPassword();
+        $rsa2 = $rsa2->withPassword();
+        $this->assertSame("$rsa", "$rsa2");
+    }
+
+    public function testPKCS8AES256CBC(): void
+    {
+        // openssl pkcs8 -in private.pem -topk8 -v2 aes-256-cbc -v2prf hmacWithSHA256 -out enckey.pem
+
+        // EncryptionAlgorithm: id-PBES2
+        // EncryptionScheme:    aes256-CBC-PAD
+        // PRF:                 id-hmacWithSHA256 (default)
+
+        $key = '-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIIU53ox17kUkCAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBATi8ZER9juR41S2c35WXTQBIIE
+0K98r5dQq/OxbwA2CH0ENs9Jw2qjvW0uGkH8DdO8XvCJohMrIU8FABxw/50Af5Ew
+Nq4FJIYz90LjZzlI7kf97TDMZKw2K3AleymwmfMcKer5pZ6jqdxLGXFztdj3Fm/S
+P+NcVjEZFSEH1MNDEPhiPSIUAf1yQcLwKAzHH0JTnZBOFSBbGxTZLYfvD2angVNL
+xTivLYJGdr1cUrAuZQcM3JGQEvCA5qAC7oRhdVgGyJrl8xXY3mVlaXMsW8A+Q7xj
+NyH7lJUFEF3YPMbpWr8zblCQYgGByM++yOfYQXno50AgWdYjPO88pPzKcCe4x6WV
+qKlvqTYZqb1HgZurTd3BS/e6GWRgnRt8W87nuNcyJasud92Z0FhSGwIirlE89gUW
+EinbY8m6+sL9VZZ5+t66TROtpj1Ohj8t3W+01oLDCtdSTGwLuq9XUsEyuYZSqUN9
+0F43U8pOykNbChi1S8vfFdwf7U1R+hgoF0MRNDwh3hRfSS0zPUnCGb6hDZrOZB9C
+e3xbfXiujVlfhRc7r2qbZHAwqNLcccC98oLfbEIUdBXn6M7GfFIwiuNiS48rehp0
+dA9+CiWJBq+7b/lRdcgQJxjwUpxtMXr/812Bky4dDoMDs32cmMghH2sgUvht0imy
+ZhA3IvSCAV1wVoQLqUuPXLMskcKsNCTbL9AYEpJm612dm43btXec2vtjCc4ajpCg
+wICLE2V1jwzWw0girrT/IMt8QUd3fkJZkEAbmFHwuZptFnreRCidZjfQqYhWfyqJ
+nGW+cc7G1bGwxt32fC5eu23hBTJERmRlvkhC+v2WKhYXcKyOKQn5/I4eaEZauDn3
+wmg3f4h/PPuQgqv/vspOai9a5HhPRNyeIjXsk3hxHepEgV+kVSU50BpchSSzBuhK
+71F3nOMTyJ/XXxaZrLLtpo3CcXmI0/JuNG7pjDS++Vx/BQFs8xxDfxRs0Um7RlT1
+piGZGDn9zHNpbspHkAeoQmlplbmjtCClojhfBj4HbXTtlYmDgwKHul4YIni6kgCr
+G+WduGXLeyxmH976vvJasD4wyttL2CZTHLR7Elp+yl0xjXMlj/iP4WYozJAmGifq
+xjLWMsZ0gaBtAoOFrvcgOueE7+E+NdbIHzU4u5FTbz0DLCvrsZeKwpOPEsMw0LVG
+T6rNsBzMY3XyBtV1FdXwmuOcWha62Ezr/RRrfvRPRImy/xVVKOrOQ/KbyELkjroh
+UAEPs7s+89Ovc7P30IfS0Xzlhz2aSRflZarOIqu1JtjTYZ0XWLTWoQT2fjZdnMDV
+qFrbTPdXezqTAAzk3rnkkghgamTVQ7Y8D+BIGHIc4+oVT2jxzSjBQC7szmudanGQ
+hfGLyO+vwLg4r1lanzSULtqfwTZMarjYGxLqpQp8cIjJfzvLI3psRDFyuWCdIbEs
+y3VKgoNsa+PmyimGSa7x2cw6ayTx9wlOhPzaBwqMhHxr4qJwS2ohDONeRfnPr34+
+oVD7mnCBLB14qiZcpQv+qPGvd/Q/tA5SBNbZhPuWtjqvy7/K+1FQX6xvx1kl7p9W
+l0Q99rwqECl8y+CiKEXdItkCTA/vgxblSt465Mbdic7cbcP6wAMSGmpryrmZomm/
+mKVKf5kPx2aR2W2KAcgw3TJIu1QX7N+l3kFrf9Owtz1a
+-----END ENCRYPTED PRIVATE KEY-----';
+        $pass = 'asdf';
+
+        $this->pkcs8tester($key, $pass);
+    }
+
+    public function testPKCS8RC2CBC(): void
+    {
+        // openssl pkcs8 -in private.pem -topk8 -v2 rc2 -out enckey.pem
+
+        // EncryptionAlgorithm: id-PBES2
+        // EncryptionScheme:    rc2CBC
+        // PRF:                 id-hmacWithSHA1
+
+        $key = '-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFFjBIBgkqhkiG9w0BBQ0wOzAeBgkqhkiG9w0BBQwwEQQI/V5Qw9+hKt4CAggA
+AgEQMBkGCCqGSIb3DQMCMA0CAToECPxrtS4U+IIBBIIEyKQyYpJ8tfWXVvitxaPq
++gtrVVWd/ukjwZ+jQY3g/ZjZNWQPq5XbuoP5F3u5g4V+RoXzAIkdwyiveEv+XssV
+DJVHfNiL6VcdxhFJ1rmt2uq9vFW/x9UHDqAWsnytn46NFRWUqgKzkYWMDqU71IC/
+wyq7UzjTtqdLzaCxkTWYst1o+Iu7VXapFVcscPYyGshLVyZ0x/etc/09LOC4bIpk
+3Qzf+f+adrNxW0mbD3SyDfVadvS8mApsd7bJR320iEKd4CmW0sNAzKkm2ya2aUIi
+Hrk3DEgr4rPmpn3BVfZ6pg+yRu+MOxBhl+8yfA+E8kXfe/F7BiMkJQcJTOfLRLfH
+TXipyb4f8oa+gmwwWK0jfCuxoxiOTA1CBCjZoTvdSuFYVTdblysQO3BivvSQgbmD
+oHntb7HEoZ6yB49u/LrrowUQNH+XihBcototyLCmC5K+x8N5cZsp+yaLJekDHlQs
+ATVMeKCbPjYaS4g48lDyC1VbtNtJc/zN5gOUB0PM80iB02iZegYyeW5+WWzY+Lgu
+lpWLH7PdpqL5KtoH6SJKD6Szl8dKJLYzpHI2esckpp9YsDtX2z/VkUFKTd0PeeNh
+WefX0q8A47NBeBLFEZqmzPrL6IyaPnnPCUsvqk6MEA1DgsmY3DFd8nEYhzJIAwoy
+Rw1mCqwL0uukQPqFGByU9YRHyhJd5aAPyF1xSLfUQUJb9xn+wyN57xoamFePPWMi
+UXdESZWX+rjA0ChfEtL9AzXcfO9PBS1p/2JkVxUt/UPfI9SgQn92kLo0LRi/iRLk
+H4zjnkaDy65ZY15bzyK+EvJ+VZ+P24QI7X12f1m+rkssMekHWHf5/SitUpW26ZFe
+M6vXyz3RlXxow+0WcsPob19n/vbgeJQPTfMY0zPS0iCRIggC/liWMEOzP/R1jCYi
+q8TEaUi1Ztx3Gp4Y8Vcf33a/YsxKoUsQlFFtyE6KE3ZEI03E6cMiX21nWULKrk9l
++8Tq4T1a8I4goVa+e4CYBYwMAY9fdfUJ/p1EnrG6Ynj06a2Zx0IK/dF5w0b/5TeL
+PMyafb4FHkpkyYYFlktQdKIqGjjtmKUr56/7vumVHUyItf5nSuM8lLps8to2MLkE
+MAolD+X4FIGs/1Z5NlUb5AlNVNRY1c7tf+YSXI21PlkBpaRSAvN9/2fmGnxWSvAa
+BEGR0JA4zMPrCSpxrBQpOrZPh/cD9YXNu+N9P4dtf57smCviKTJg8eMl9NYu4vtc
+FygdqPKuhJM2WI5Qdrqjbf4NQ1mngSxXNKrcNmC/m60JPNKHC7dM2ynbN8QyZqEE
+EzSdL0Z3YQGnuwr+4zKHHsNnO4nRJfUowWks4Gvi2HIyy3DBVqqyEPxDDGEpcqs+
+8GNKTGBg1PCVg+I9Xjxio4tBuwLDo6Y8Ef8SphN/0DC9svaQRfEOY3/9WB+fDnrq
+SUSNZNWetkCd247WHwl+JvJDXCuzGJ2+JG5DXuEdCq2EhEVNUWPuotXTPvI+0wsP
+Kq23uvzS53ZArQnxlqgwyXQ06jzc+J4AiNtl3uIw8D6LrRyaDsOsKQCEh7qjkqTc
+khzefbnNRDL5PIJnTfM7vSQ4nUzdAxs/7YzX6GMx1DaCtBANbUVUoIE+3oKdqpGV
+9AmO2phYWCBefw==
+-----END ENCRYPTED PRIVATE KEY-----';
+        $pass = 'asdf';
+
+        $this->pkcs8tester($key, $pass);
+    }
+
+    public function testPKCS83DES(): void
+    {
+        // openssl pkcs8 -in private.pem -topk8 -v1 PBE-SHA1-3DES -out enckey.pem
+
+        // EncryptionAlgorithm: pbeWithSHAAnd3-KeyTripleDES-CBC
+
+        $key = '-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIE6jAcBgoqhkiG9w0BDAEDMA4ECHwurC0qxNK7AgIIAASCBMjRJefQ1oLo/pml
+Zw1qTE2NMgSNdP6z3vEap0qMMs/EXO37GDuHGla/yvvBIZbBXPVoQwd7K9QfU1NP
+JCBtNBTD9Pl7a4fJIlrf2dN5SCP8lu+nFa5ZyCiBvUtxfdROnhXfkhs0kqOowLaq
+1mw+Di9FPSA3ZkdJTPpAyMNPMlYpQII2ex+j6NmRB8t7O121o6ynbmDj0Rh87dv9
+VtRhO9sonTy160Mv2HPMLMliXMwFUvpEH9XNE+K6V6DnoMc7I9jmEnqLAzmjsKv/
+AOwuX8t8cPboeGOu++/0h3879+OVcnkXGMW0aAT+3sX4oMgEVREHDwkn2IGsrIuV
+SerUKg8WSoyhRNb9j7uJAlvU6bCrivcOujjNasdWKG47ojeiySFUkKu9JBohQ+vI
+mrlkqZv+FMwEKgApPhCKbQYqLuKl/kp6lNBXmhcusuxsGCnaw7/Wa+Y6p+Gz6UL5
+caFpDm6FX+Snvi5/6sUpMKL9LPAAZZVRpKj9JWcidEoXa5rINIMtKyVpl+GEQmac
+9lCdFq+5zO2r94af9AKRUIqTquyCkcy2s2mzNq2IIv2atibnb2HQex0/EhLFxMC/
+UZbl61YaSBxrH52LY4SNOUy+ppCsP4z0ojTdci9Yc3BnMqzSPD3FMQPmGpWWRGOq
+Jdj2/B76Q7rYZjIdrh6UbSROrgTNgmbeASxfDSHHmmcZyIUtMzBC45bmz3ra/FO0
+eb+6srXOmdIG368/xRdo9o1R/cNw9BHgGu5R/Bx+AxhK8DuhL7rMYLVn3Ukl2qrt
+0koCtDbPxq2YgF8VYXz4WNRCmLuUroty99WVOM7BvM3XyfSP5iLynoRr8B7Rju5K
+t5o/OJUrNqSNjtzYd3PZEXqi7ShWkYp5BACzBfSxkGfL6bBMfoM8Yd3dBLrplRu8
+WpVbJSA3DbJwAyGhKP3dQmmhBH9nJEppSK0iQPCruAyyZJT6kEmPhcNuYq8CyWe4
++l9Hs5qIHMrkEq1BcLYiQFBLVLXR6eHf3J8fAMmz8I74TWNM2u3FZUcDoIwqHmHG
+zDwYZ9h1tkijvyvbH5RkMWRb7WAB2b9Q9ZsPR0naQbqHmO73Uypu/pfugx+cmOPr
+AiYOQHnwSCDcaTHJnO33L7KhgA+RfIRoigJXgeYzlWmjW/U6SRK8RTvda4lxPsOo
+/bXTZOoUA8qTDKT02n20h0Ab6kLDApSigGQlYI8Jhfre/PGFWfrLxPpy4ED53sPg
+xY1d6tIa18yQCAznC3k6Q9OK02bGaFTcGnTPg88PBgyUFuqljKGrG9rpm4uTPzwa
+1vzKv05oYjK9xyzy6LkIPYHyp6R2tedVO34pa52LNCO3/DaLnwiDfMRW5SFu0J0E
+P7/viLPTwwR6zdAAlt8hsT6apBYlLzVqGRy9nbN60ZS3Q8lIe6xR47koWAJvnHuS
+uBx9xP3JWcs+Cnis85wODY1qxXa0Yx58kUVmoyyiBOWHcwsi82YtgwAAjhR8K1wy
+gRJR72XIKmdZ/RINp7f2dN7xswy8iU2m3vBxgc1AH2/8knlGLebNS7/RJwW1KXsb
+pp/6vHRPSla5cxzsF9NmYHmSAUpk1t+Mo+YjjoT63bVC4xNzkXdft4l4QyUQQXU2
+aENeUJKn2r8X3Tpz92U=
+-----END ENCRYPTED PRIVATE KEY-----
+';
+        $pass = 'asdf';
+
+        $this->pkcs8tester($key, $pass);
+    }
+
+    public function testPKCS82DES(): void
+    {
+        // openssl pkcs8 -in private.pem -topk8 -v1 PBE-SHA1-2DES -out enckey.pem
+
+        // EncryptionAlgorithm: pbeWithSHAAnd2-KeyTripleDES-CBC
+
+        $key = '-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIE6jAcBgoqhkiG9w0BDAEEMA4ECGT21lf3Tl4dAgIIAASCBMgJmnyaQktoSk8u
+JyUAaB4ZgGWW22BX1xRA7en0sNj4PhBxj1DEXGKNUBx3k6u6Cd7JUupxGfeag5aw
+fi0bWNgEw7YSITmZKaKO5Ee4shQrEDucaH6KEGYV6YspNys5dD817hmd4Yc31q2e
+Ig5k3rIpP72Yy9Si0FXmKDE8/GmCYckdIQVUCGZD9nLugvqEC0adludfMAwzCHUY
+68jeyKiPJGTFSmE0wPD5EaWknn3U0eRcmKwZPtFpWEAEv5GTm1h6Y5q+P2X2Qsia
+Neoa4jjnSEww85zbno/k0KdoRIuSEM8qOHdNuU6XNTCGKxEkgBLkY+vjRjOCi+K4
+fzJSAPxaYATGX+W8EWegz3yhwiFujjDPkO9nfeoyks/saFbP9uT8aesZUn4/rIw0
+KyW7lYW0TUyBxfIXg1DEsKcmSrrb0WrFLN/MnjO8Y1bAY63KgKgpFZk+7H/7eCmD
+2Egj6o2LXTEPkxwYyeR41k64LM5RFF5qs4wS0Gfo1oTc6lSbuZNFHSgsXkb+CXFL
+JZ3CuaYFY5Ldfm+1HsrZ9s3GmNAnog6WABXIcz9aULUyJfLr+oZaQR7TC5KpM5Xy
+dyztlsN43D9UZKdz93zW2V3LxbzbOWTrcd9dB1GwrPvWIy/0/dqFOvpcr9k/4S1T
+AJ6pja4x19EQLj2DUvO7JQEy2Rlam+SI/ARQTc0W0dJ8x7FboHZDxUQCRDih5Qw3
+s/xoGflLUYYtAR5hfgjbWuvG3Told4IYlBn2vvVu7UxXQekUOaZLePqucAP3sTDC
+pK7JK+OT223FNU5NieGS4hh+jxZQnLuuyxWQaTCJM9isYPqJYsWT9X+c44ixOgLJ
+unYtg+8Lck3On6wiDUPWTLCGJvjb53NhPSovTjNBW2Q7YszXXjeO5svwwxtKHabx
+vCDsG0zdNdwIgupqynbtcuUhsmIsJKBu5c+9i8P21rNF0DZjOkv8mThRA6YQLce8
+mLTcnpLsvCGNehVEStD6pr+CtGsQEEtH3bPc2ZBrpxtz1EHmrI7H3kX1gjbD7bsT
+XWzaxsId+8pmqnAcMRzU3mRv4Fe+387X2irG4OxR/6cFMk3+yfpKJLSsNh6HAVRX
+xzYwVz2WP7RM0KuLh7auAcI1mHk+0xAvDi7s3ggy3SzLzQq9p+EEFVGVSYuVFLbi
+TtlY6HQ3b1Z6KgntoPj79YuOmri6/8w7nBkKt09faYLUf9wZWHLL9/LjZqoJxPfl
+lX5Ss4+MDV1aG9aJoTT53d8Gn8ApWK+XFToFg2InYZzZqBnKP8DHPG8D2Gh/MZlA
+Yt4hPDNLf733zm1zJTWo0TF6+4AwZp7XUKTg+pM1CZJDOTbJlEA+cXY3BxOq10bl
+JPJmV/JFINqSeBLN8V2Ong8Q0Dt4uabSmlOUz19SXpimBrO8ztxaqigMFIKMbLXX
+uIVAoxG7KLPuv44yK3Fjsg6OtwZnrWqea02b1qwFFrIKoqmQ8FNFBMYqcHU2IkSq
+gJqSylfqcre5Y1DOSlcjGa7aP4C8AyB5qOG7LZ/CLAePKqgAHtMd/K40Zgku36Ir
+9OAcUXy/H5PFJIleEyjvLLBE0VWs0TVBXi/FiIqwvAYNOFqXl/gtRcZ0kVex/QeN
+rcONqwmUGJOjrfhUyJA=
+-----END ENCRYPTED PRIVATE KEY-----
+';
+        $pass = 'asdf';
+
+        $this->pkcs8tester($key, $pass);
+    }
+
+    public function testPKCS8RC2(): void
+    {
+        // openssl pkcs8 -in private.pem -topk8 -v1 PBE-SHA1-RC2-128 -out enckey.pem
+
+        // EncryptionAlgorithm: pbeWithSHAAnd128BitRC2-CBC
+
+        $key = '-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIE6jAcBgoqhkiG9w0BDAEFMA4ECAdC2l5rzAQeAgIIAASCBMjuEQDNkvSX6ylp
+WsgQZUSvPdNpdlG084oLmhTV0z4pZeLB0YCyKCM7GMVQ0tsprRW0ky86ulbY3W5Q
+86WNHXYtVIFXEmIjN1syRG5Pq3RZ4Ba6wf36Gc/1713p6GjcPxLZ+JOw1xBEm1rh
+1nI9b43PzbKmczs+6IvRO5b9MjKNkBeNzH9kh4b3zsEW/IFgYaz8zip/zRu4hCSW
+ORhnRYFvbI22E84g4/SB1WS34nR/flyZBXT4P87s7bwXEOsXAGnEeVF38znV3awD
+V8rry2e1drRmlhfNhvDroQrkv7O9X2ee91I9gahPKpXtAlGXBgRb8qjVHeI8Ea3K
+Ty2zcWnjdE7/jt6pO07+B+FlHNdKySlFdKTHEmJ1x+O5Ui4JaGjI2UML0yGHoYFU
+wGH/1DYJ4+R9d97BYJ/yp9+JAQAjpG7UUt3jFgNx0CAbP7d438l06z2EE87EqIEa
+3Y0ZG1Q5PWE60hPJsvUELdgzcUiKkVCxhOPhwmbSlQpEYXZRBWv0RAJzey6yPMQ+
+L/TkMDpgTNUk9x+n3ehnRuA/tlthxXN/ViDthPO7ovSVCsKsUq6lXotO+3hHLGs0
+u8ZyVKHNEqGso7PfAFsjcJq2C46mQNME4HPOWm5J+TFf/vvwqdYKCiF3arV0hUtW
+x9lyPR2PvZM1ik9jXi6lc5hPegcwmx9/j5yc4/3rQNiwe4dtUpL5JLKAxecKBLgr
+atyVnAs69JYaaUT9aKRDzYzCRjo0jIQ9/lgJl2DqVRF9aYnknrVWRIjyKbfKjw7N
+w0yfXlVRw46YuJ72PSHpr7HcfzL1EWzmKcAEPDH/UCpIaoeNTwxeEQSltOM0D0Su
+ZzyAQP8sWSXSwdtD5YD7iiUjDN4UMDuIwAEMLN9231/RjvKuLAys0oNRQfHkkiCo
+9rt/VUP8be98UTyKu7Bx7JUEW6VVnYM+Y274MLQk6TcjZyXgbKwhHFJyAjcBAFQp
+5kkYES0kk+57HeBImcB0a5qBor/uAnlsCV690roUlBtkVhBOkTjVi7w/uZsSjIWr
+MBndNHTFqqnkbm8xOOoSH6vS32c1KE8FrGpmkPGc6wziX9Ja/MkuLDXrBIlnP4Yj
+aCf0sVMSR1/LoHIGGaGXmTzs0VTR8Z5EyW5uvvCy6dWCWnTKEWmTTS+zqW1RYVBZ
+n/P2ovj2Kl4rhQuSpfOE9xBFWsgPAD6T2FJzfvu0/D3Sw5pI/RT4NnQ77oJSs+jN
+lV33FeceRoJqjcP6YMAiRX4RmkTeD5Hgy0YRLrfQ4PKwAQG82uIj3yqXWveexwb0
+Cpm5XxzgCMWGBRvIvM+yByf0SP7fIWYHbzsEWJkN5btF3tMc6i12q7AJ0/UFMQLt
+KNiMg+dLWP18cySU8OysXqPq1JKHDU1NMg2Xf9o2c35eOktLfcO9axS4oAAz4bGN
+hTB8rk+MWnHfSlWvMPMzlJyndXv/WxfojujLogDTOHd4/q4KyoOwJY3H44eeW79u
+sS7pDbjKMl8A15BLMLx01DaOYk7EiHFnGIpY2V2+2Xm7vQu9+8fHSf8whuCRVmBY
+Drhy2HTF1veKrQ6IrIyQicmzTtW6moSnNg69SpuzKTegYyCRsSHDIL3WxMoopVwr
+Pu3ed6UvXDfotj3v8rE=
+-----END ENCRYPTED PRIVATE KEY-----';
+        $pass = 'asdf';
+
+        $this->pkcs8tester($key, $pass);
+    }
+
+    public function testPKCS8RC240(): void
+    {
+        // openssl pkcs8 -in private.pem -topk8 -v1 PBE-SHA1-RC2-40 -out enckey.pem
+
+        // EncryptionAlgorithm: pbeWithSHAAnd40BitRC2-CBC
+
+        $key = '-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIE6jAcBgoqhkiG9w0BDAEGMA4ECHzZ2FqUJyiCAgIIAASCBMiKVNJiU/1UCaoq
+V6VSX33gL8CjQqhzDEUlXhHoSYx7IWAJIx7C1DDgeLDfJ//cCMlBPbIOr6knohFQ
+KegbsulIYm2DXUQvEoivh02F4An2RLkP0JSMl5CmYTbiu/nJic2jdin+vaKWhRA8
+Kznk5wEuhz4t6Oo4Hp3k3+0sd6YqLbmdcFCiYSXE52WN271VvUXqwz3TosUgOUVH
+YNzlER1xzNBFgcUyrfiyA+t5NaSDfpYncD64zXFz2KgkjcpfPBBMRnQ2I4mperbe
+3uUt8ZFCVeRiROWtx9WQgCVDDWztlrYzfEo/lFtNKjdseiYDj1/1gG6S2x5/S5dP
+LzEndNYiVEB2q9XrocrdKVumr7EqNe7C/AMNxuyfAoU2QV5SRyDDSRa1muYwHBa7
+x2XIThMS2tQLdN9bjJGcT653DKoq0Qwf1uMAOdHuqBLNXOpZw8PG8d3xmVHCyB4u
+rr5E48L2DmD0TwY3YBjfb3KCw/r/CvT1/cWkCpO90aNmSS4JMuOBiFlKaERMvXcw
+Ffo0ErZWwlgDN40hQO7xySxI3Paz6/QbxXunVnFQkTclkcQG63K6nWO9fMtgxRaZ
+ZGsv/jdWUZ6fBvOvW09zLvF2ZXKhTbfwU47C+2TefvENVz4rTAJcGgtF1wiFv1Lt
+0XT2FeJ6/jVGhk6745cHgOhsxqamOTuQ/y948ViMmR037INHouazD8dWHkjOY45d
+hy0DjRGIiig94/r+b7YZn81QUkk0HddyH4zi18f5Lx+ExiLDKaLqLv57PQ3ZCeBy
+v6Hoq/5tpZWCdXkLIAHx/a7ltiJQlyRUr8QcKPcGfr/qvIcYsUocHZ3iwkhxCnZ9
+77E2f/Owf8VaS3x4g5V6RYNlkhuqVixLq/3QyphykcqDK2g4PnWfq8prGY97jHXN
++LZdwwV8LJkkoxCG1aehPlvtpGYGS75aeU1iFbqfke+gF2JG4LJZQsl1dAoL8R+X
+ZdILuN+182CpwwptK4QmCvSWXk/ZJtYK9e6OtE1keLM4oQW122fxwyVkEnnAR2/f
+Qc2U3WLk/UZSuhcHExxreWP4kiN8cYgSpw+k2uk7Xuw2kelu6hv6UzB4EtL8Xy4O
+kK7y6EjCkRJVqQoZ3vVny5408edc7Kh6bz0P5G4LIaCpvrcCYOJv2f57/lr8dMM6
+XcoZ0YIXATdUzKzhXKNFiib7SzBwFRRD+jMwzLnNeUhss8IUVl5LYwD6sOWbhdep
+LtUO2eXa74i6pa7sz1PLLWDZQ64f9fVPX7EEBy2LBVP3iLqLd2x/OHw+s7pTPT0G
+EgRpW0+IYBZGQjGN9s1VXXyhTm3RL03KeYls7aHmmcVqDqvozarqplN/kAhSGPmD
+N99FlSrIfihCEZlXO4iP2LRkJaFy11mU0ZvIMkDJ51fNO8PWypca4Rgi4azMCaiR
+HW/dtSBH2N8St0G80c2gUKXRmmJWFqebUIk4000VrpDcZlg0INC2unY0NwRFDe2a
+55/NR7TO9GdhWYDWsZedRatUFul5DWznncIfrXAD3T32gUR3I9zc62OFVsH2Dve3
+oMZUabvnj3g1sQqiRgJyIe5aVZljgXMh0cdWjcUi34vOVBU8yOU921/jSinJWyH7
+GxyNlS3BiKQ22CLvbjc=
+-----END ENCRYPTED PRIVATE KEY-----';
+        $pass = 'asdf';
+
+        $this->pkcs8tester($key, $pass);
+    }
+
+    public function testPKCS8RC4(): void
+    {
+        // openssl pkcs8 -in private.pem -topk8 -v1 PBE-SHA1-RC4-128 -out enckey.pem
+
+        // EncryptionAlgorithm: pbeWithSHAAnd128BitRC4
+
+        $key = '-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIE5DAcBgoqhkiG9w0BDAEBMA4ECKQOMmQxsqe0AgIIAASCBMJ86iav9sz/nsgC
+KrPC1m7fPDuJF1BCPd6Yu+b+D4++4htITNBujK+Ur0xgQnfs7+Et8/cz521KR1zp
+kalr56rqvPu9X45l86f/PYv6D+3660jxAadk1bZ9Y7nXzjXsFlZljEi/oLYSAKwh
+rn88ZNBM7hwoEtEZJXOK7yZlcpfLuNyRJhfxRp893yeG3SHDN+SAKzqbjrGtPnJY
+2X0Y/KidhYAYLi3onhxkq6I9aEI54oBZUiKLHhRD5/ASx8EeSPK2Ydj20PfDIRIk
+t75Tlqn5eLC124xdO0rm/vrczIrzo+JaqLq8dO0T7PGrR7hv9OyFwM6ssfzl2MyT
+Si4Yv3gBk6dUQ4lySj6XfscjEPwnUSjO3SMwAV0uBoBxDyeKg+58sT0e4Ow7k+6U
+SFoqa2m+gBAjXzL8SaGfvjfy0ViBtgLycGrK80dp7k0L5pJAZou7WCPWlP+5+kIl
+IprSGD1luOm1olQBSaQO+GkhQlMg4jK7cMKM2bRWyT2ibq8KZujlhWlcqXbbaqSh
+nJdadTfAsaCf3/hK1fiFwwSyFbiPjIE1H+WS+JMcg826S7FzoZ3BzcEVbiHRsBXy
+PS95ZM3v/HWOejEO44NEqnrwjyqBlSJXOK2WLOUWWlf6t8pdQEjA1xUfJARXqv16
+rQEXq2ZTGBOGeorwKLeUNgMQS7SfVP56Mmi23A3QQk7JNPXfkcrQscHu3mzesYKA
++ckJwDsyjnTwYWFXfDxfReKVA17YSV160oKCPhO7jIeiHO8azw7RKaaIaueKe5QU
+boKWPAKeEfsDrSxtEYxy6hQ/45LYB+gUlAauaFlT4d0qMWQzt05Zs4ugUtx8SuI3
+hWB80fi8XEJajti/3JIg0+cDEmv9XtYQXpaFKR/gTHl1ReSscY/rNyiUc7t1dBsn
+kAwMhk/7p/0MZdEpG0e3qQ9Fs2pELlShzORobM0HWd41d2BkW54W/TJ9ERJhMU9Q
+NJ5KZDukkCdTIgvnPKJ/50byYVGtt8VBXDzMQsm5ex9yDkEmBLtc14z7UaGd7FCK
+xmbcVfkf+h5GPuJqXiZv9RsOfV0eVXlNx7jQ8Pq3FM5EiL8Wtj1XB3+cpFkPREoC
+lA9enCZNdjXPB4SSz4kF+UwWdaNS77SGXDq4NQRT/cu4mce+1VPjepEc1WzLw5m+
+aaHtJJCdLhaUJmYfaPGz4kg2CSdFCDjzDLOQCOwGtqAY6667ZOFb2VCukQR2aSfK
+XJF4Br7UsKhtlZvRDZGLSdxS/6IPe3KgzInP+27kLpv5UcolD3GfuS9WZhfa7tlB
+37n5nyGJCgVHufWRrYdKPI32Dn4R312/k+6X9zR1G4FlYzbuA+g2Q5CX8n5e/9jm
+1WjCv8ppB3p3BjIv8iEAyfPShwe4uk2ohry+nY/pq7qYl3E7Y6vS1MOmRJT5jvBA
+oCWQITjRu/d0xocYp6agkMEBgkyiqzLEW8PV2bziRZVGsYvC/4ky1MVERFO9jiSk
+3L6Xllp1yB+Mw9y12bUhDAZNAqpkNtL0CJbLKh6fQ7x6l4d0t/QqpuKXPvF5l0wr
++Fb131STrh7fkiTT1glrra1UhJzz/KVOR+TG32GOSI0hOTqu4/gDQ/vUV0gh0SJw
+OvndKFWbSnE=
+-----END ENCRYPTED PRIVATE KEY-----';
+        $pass = 'asdf';
+
+        $this->pkcs8tester($key, $pass);
+    }
+
+    public function testPKCS8RC440(): void
+    {
+        // openssl pkcs8 -in private.pem -topk8 -v1 PBE-SHA1-RC4-40 -out enckey.pem
+
+        // EncryptionAlgorithm: pbeWithSHAAnd40BitRC4
+
+        $key = '-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIE5DAcBgoqhkiG9w0BDAECMA4ECNrUHnZnezluAgIIAASCBMKm0lEML1hIdzcu
+pglVZSwG8JyigX3xgHwnN4oAz6HYTNeatkV3xqGP23DP84e9En7mQTRxuQ9Tk8sN
+NoEK2VsjYmrJtsbyTH21M0vPlAvFv/sIgxVYcF7jv58jHhLNnibPtDeMXZDjd4uq
+vdppAGRxIr5z8XZ8ruAlsAB/xzcz1bIK8CwWH9NBOWLDe195/OYoUrgf9h+U2s8e
+1rbq+U/woJZHD7+3RuPmtWTtrneY/NVTiU03OUUleys88eCSqZrQzR0faNxdVzTg
+mhSrtkqwho9xxUFY6KqLOTF4BQufD+ZSNt9LN3EaFdvGcI1QWWDH11ne98oz3GUa
+GCGhaADTOAAOdvXyv+6YRfj1VvtisUeiGjttFmaUHGOmHCCYoyVkbhsRq4QnbbCv
+641ogRbuISBHwr+mzqjwTZXC5Laxsrn5EnCZ309vohq7l+g3M1Y9nzR8hOsiqTFu
+7PPj1jYM8znYkVx/me+xnpB/d3Ot86K6NszbTaWk9cHr4qfkF+pu2kUYQ/26CUBE
+y7DxYmhXnOBRGUTvQebrMoSK8hOaw0uWEQtYp3gLOS1hituL965m2qRbP/ysDP85
+DAorOSbKDEMHYy7UP3xh743FErEOoY83GtugnJgjrTlJ/5NyS1KFr5QUsQD/N/Zw
+bIkjdFT5mjWVaotHzpNc1IigpAPbNpe4J1E1E2nB8YE5ckSEVseUJ+ypgWSvJxmU
+G68YvidODClnBekff8sRDCNN4dekQgnNEMbAWgHRWtMERvXS/9xfJZiqiq+7WvIE
+Xvu1Qq5zG3+mESNX9AVLngv5btD2m6QFEqOLG9JKQWp61J3c2lG/kdtWBjsXiWoi
+zvkA4u9ZxUzX3s3T2aHozg9O4+0ti947l7wSIxbxLYA0d1M7cQoeKAuRnpwzfCZ9
+gpQ9VG9acDhU9LCxcZBHfuKROeI7D7wL//MJp/ue26uhOZY7Z0gbFIfjeSPW+HD0
+fRGA849/1aKIsRarKg2YleqsXO04E3J/lpTt1gjy3aGE25Arq6qo+4DRsUIIWeS+
+QwzdDeqy1zs8BIPxa51U/jvbqxCvqXsMw4la0txkSwymMvc6U+QpJgm2KqSDCs8W
++QYIz4SYlADLgl+MVDGd9IB/PN8AIZ0Lr7QqKKBIrfyegO/gjCkHCdNIh1Q/Bzbf
+rq8AYwbxHnp2Jn2MAzw9s13ncENpZqCDHkhmd89hJc1B4f8rv5KhDsIVb85XQJek
+pdpqugcYjxohSBEa9yzp0JDRa97Btir7D4+9HG2NUullFgXvbqKvlKPj+ORUDxJd
+DMGC2Uov1koiVBvvahtmr8eTBNdA48cA7l/c5t8UsGbjrwpqLZLTJ1FHjnVKybuu
+soPwPAxr3WBE4Ien7WqPj+GTeLWMb9//kpi5grguv3Db6rdH2Y4PT9Fi4UBxd+6N
+LqB1rPkt4AQtQwda1ccixYXIFfWSJ6+XEyp6/wsW05DZAiu3R4o/T9Z59KPGlbf0
+aaEAW+FZ9jYa6sDBlMwCN2TEmnBFkytJYe8+B5UxkEAIn3g/Vr9R4t4YDCSE2ugs
+q6YJC1bQ8jHojcWTs47zcefCXhOkKOg3oxzYIQe9Ikdmf70JxIo+bS92O2vrkV0p
+OFLPBrLe4Hw=
+-----END ENCRYPTED PRIVATE KEY-----';
+        $pass = 'asdf';
+
+        $this->pkcs8tester($key, $pass);
+    }
+
+    public function testXMLDeclaration(): void
+    {
+        $key = '<?xml version="1.0" encoding="utf-8"?>
+<RSAKeyValue>
+  <Modulus>AKoYq6Q7UN7vOFmPr4fSq2NORXHBMKm8p7h4JnQU+quLRxvYll9cn8OBhIXq9SnCYkbzBVBkqN4ZyMM4vlSWy66wWdwLNYFDtEo1RJ6yZBExIaRVvX/eP6yRnpS1b7m7T2Uc2yPq1DnWzVI+sIGR51s1/ROnQZswkPJHh71PThln</Modulus>
+  <Exponent>AQAB</Exponent>
+  <P>AN4DDp+IhBca6QEjh4xlm3iexzLajXYrJid6vdWmh4T42nar5nem8Ax39o3ND9b1Zoj41F9zFQmuZ8/AgabreKU=</P>
+  <Q>AMQi+R0G9m0K+AcqK3DFpv4RD9jGc0Tle98heNYT7EQvZuuiq4XjvRz0ybqN//bOafrKhsTpRS9DQ7eEpKLI4Bs=</Q>
+  <DP>FklyR1uZ/wPJjj611cdBcztlPdqoxssQGnh85BzCj/u3WqBpE2vjvyyvyI5kX6zk7S0ljKtt2jny2+00VsBerQ==</DP>
+  <DQ>AJGC1Mg5Oydo5NwD6BiROrPxGo2bpTbu/fhrT8ebHkTz2eplU9VQQSQzY1oZMVX8i1m5WUTLPz2yLJIBQVdXqhM=</DQ>
+  <InverseQ>EaiK5KhKNp9SFXuLVwQalvzyHk0FhnNZcZnfuwnlCxb6wnKg117fEfy91eHNTt5PzYPpf+xzD1FnP7/qsIninQ==</InverseQ>
+  <D>Fijko56+qGyN8M0RVyaRAXz++xTqHBLh3tx4VgMtrQ+WEgCjhoTwo23KMBAuJGSYnRmoBZM3lMfTKevIkAidPExvYCdm5dYq3XToLkkLv5L2pIIVOFMDG+KESnAFV7l2c+cnzRMW0+b6f8mR1CJzZuxVLL6Q02fvLi55/mbSYxE=</D>
+</RSAKeyValue>';
+
+        $rsa = PublicKeyLoader::load($key);
+        $this->assertInstanceOf(PrivateKey::class, $rsa);
+        $this->assertInstanceOf(PublicKey::class, $rsa->getPublicKey());
+    }
+
+    public function testPSS(): void
+    {
+        $key = '-----BEGIN PRIVATE KEY-----
+MIIE7QIBADA9BgkqhkiG9w0BAQowMKANMAsGCWCGSAFlAwQCAaEaMBgGCSqGSIb3
+DQEBCDALBglghkgBZQMEAgOiAwIBBQSCBKcwggSjAgEAAoIBAQD6L3Z2XUPH7vRU
+1Xl5aLpW2jH/uhqOitRV2/1QAEQk6VasI2TjJefP6SmL+te71gE4PVTMpm0LoluR
+IzvQYgeLwDFUzLsn2r/H3lKlS/K0KL890aNPSNuHwKVYQsBd2OuSQQZ04xM1E0VN
+xELcW4Vc63FTyGzR4okQ2MGHQfxP/FoNNfaIxjyb7ly9feGNR3pIRcL2CEMfyZkq
+rEE3SxNoGTHMTbIhMGchWTrX1V+VykSgy9+KmD0AD8SwP3nFH3BNLeoLDhkU2L6L
+p9XYijx3RAvPeYRlMAyOpylRxXM5Z1oBmzaClDVE8mtJkMPpZshGbVwxbzrph8VA
+FBf3FzYFAgMBAAECggEAMu3Igq3Xp3KIQGC4erOMAzQlq3YaA9xU/ylqNofnV1A8
+uYv29Jp5xwQi1gD5O56D3wv1IDfcyNqDI1d1zKS3/oXgRO/sRV+tXKVwU3/TZ0NI
+MvBi+zfMoKThw8bK3A/VXI9qHg8/kLVcjUkfhzYGPvUau8B4Dn28AzbspnkTQMCq
+FpuC41a8UzOX7rvEKPTLp87fwI1u48ycDKVK0ZKjJMQQl3SbYaVIKZa4ctav/9wC
+e5LAnap55S0L13FdUHbGJKzUqIk61NgCr8Wo16AYCOULzTTNVE24jl2Dc1H+sk61
+b1FC/TxW9iWZx9givR1VgjG5fULbxwA/Mve7SYtfIQKBgQD+a/y8pxIPgBXb90Z4
+poCqRsgJVPmu6sQ8STb0WibtyD/IKECooGOpI16A/884kNyXkfcIwK6txnnPYbmv
+KlNHgSUnhEeavrHfeUmyyrQaTAs3I0iuL4stOSRHHPDD72PRSkPky6NMErX4F4Vv
+Y6jkFhwsNJetxf2qInJn5WZ6LQKBgQD7vL+KE0HHLZ3DVaP7pRMOx9FvkhrtmqLZ
+fSuMUweKqnAFHnkEPZFuyFRMoPL3cHaVLPkGmX8vK/GL/QECKPeDyE/jEFzGQV+L
+n4PeraS1jzu77uYzWcuKdabFQN939iZ2gV5MUB7Jt4zfURf26fH1UHku7rs/Mik3
+jLfE9elKOQKBgDzhFi8GQ1oWKiTifKhuHyefnEovXTev0ZkjY9UApYQMgMaiayZu
+iqp0Xi68B5ffggl60gP0J1hJv+gR2F7D3/2iN4PHMWMj8mgpG6t+ua35OE3PUZrs
+oX8Gx1mE4U/hPp9cB/b9i2uupoBhEHrg/A7oA4HIa+sXD2XgrEOULvtZAoGBAJ73
+RRkDKhGGG87jAMeDKXK2+elzoO+UK+wdX+ef8u48zLpe0Nq9ql4DwUAWjvd0HF39
+ZVAmlCsMm97jqMRdbFfaoZ/okD1dwOEhnRt8GbvRNE5sARBCTwcjXmnHmpZdaVKC
+RTL5kUeeUiYfRnvUpcdcxvm9JZ81pNOAV/fXtjb5AoGAUVm4enVSfvPupBsjydU4
+EHvU0Y0I2IH1FrnVF8TI/9Kpdu2W5bJN5XShb7j2CICIKTr7wVwn/a7VXscQKIVb
+XCy8+Rnt/jddXFeFEu9zHWyJX9W4fGIkyE4zfRPmTkVK4S599SUQkHdgClzAOMZU
+IBgv3a3Lyb+IQtT75LE1yjE=
+-----END PRIVATE KEY-----';
+
+        $rsa = PublicKeyLoader::load($key);
+        $this->assertInstanceOf(PrivateKey::class, $rsa);
+        $this->assertInstanceOf(PublicKey::class, $rsa->getPublicKey());
+
+        $r = PSS::load($key);
+
+        $key = $rsa->toString('PSS');
+        $r2 = PSS::load($key);
+
+        $this->assertSame($r['hash'], $r2['hash']);
+        $this->assertSame($r['MGFHash'], $r2['MGFHash']);
+        $this->assertSame($r['saltLength'], $r2['saltLength']);
+    }
+
+    public function testOpenSSHPrivate(): void
+    {
+        $key = '-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABlwAAAAdzc2gtcn
+NhAAAAAwEAAQAAAYEA0vP034Ay2qMBEjZVcWHCzkhD0tUgHgUyLuUtrPKEZU06wQ/Wchki
+QXbD0dgAxlZoQ/ZR0N3W4Y0qZCKguJrGftsjyyciKcjmPQXVvleLFH0FDuQTjvJKMiE4Q0
+pCWHabD9kllLWVOYJ/iwBanBpUn4/dAQaGFjLQjRLIARTI6NZGAxmIaBb+cI8sc+qzB0Wf
+bMGM0+8AO5yeaZnRJtdGAh9AHDOHT+V6rubdYVsoYBIHdlAnzcv+ESUhQYYJOyW/q2od6L
+8IF5+WVPQiz8nNe3znjRck+T/KSY6X8fS/VyfmQDjkmSMUk3j3uB61qNzUdRNmTKgTTrMf
+JY5bM+jDcUocH5OpXhYONJ4dpP1QDqFge4+ZaCn5Mz89BjhkJUeOMWlaB8Kqvz7BzilCmD
++qv4TossTqcZIGsgdEIG7HSt9lVsz0medt/69+YmkuhikSfZ0RAAO+JUZ5gXTGwFm0BFpJ
+WNLxJeOsgA6WQmUQGRK3rY1wg2LMNK4u0Vyo/LvLAAAFiB5Yhp8eWIafAAAAB3NzaC1yc2
+EAAAGBANLz9N+AMtqjARI2VXFhws5IQ9LVIB4FMi7lLazyhGVNOsEP1nIZIkF2w9HYAMZW
+aEP2UdDd1uGNKmQioLiaxn7bI8snIinI5j0F1b5XixR9BQ7kE47ySjIhOENKQlh2mw/ZJZ
+S1lTmCf4sAWpwaVJ+P3QEGhhYy0I0SyAEUyOjWRgMZiGgW/nCPLHPqswdFn2zBjNPvADuc
+nmmZ0SbXRgIfQBwzh0/leq7m3WFbKGASB3ZQJ83L/hElIUGGCTslv6tqHei/CBefllT0Is
+/JzXt8540XJPk/ykmOl/H0v1cn5kA45JkjFJN497getajc1HUTZkyoE06zHyWOWzPow3FK
+HB+TqV4WDjSeHaT9UA6hYHuPmWgp+TM/PQY4ZCVHjjFpWgfCqr8+wc4pQpg/qr+E6LLE6n
+GSBrIHRCBux0rfZVbM9Jnnbf+vfmJpLoYpEn2dEQADviVGeYF0xsBZtARaSVjS8SXjrIAO
+lkJlEBkSt62NcINizDSuLtFcqPy7ywAAAAMBAAEAAAGBALG4v8tv6OgTvfpG9jMAhqtdbG
+56CYXhIMcrYxC6fFoP93jhS+xySk7WrODkVrrB3zOqmIEb9EWvtVAJcFg2ZRZIrt4fSQPk
+8jvk549ll5GaRiGmeufKLkIPhKQEMuLugXKXobaoSGDcFXHYyX2MHVEUVb/gbCTViKfhc8
+idZynqI6/G2gm/nXrc1DmQOGXe/RIV+fwu9YZDS55x7SgI4z00cMGRk+T20yX47/duYhSV
++91saCxUOObe3iaisrI2+LzNJx5AbGJS5fWohc1psvkXW5buysOUgKiPOoaoYmMaE4wW2j
+rJLEjHD1iiM1ZhlTRJWI5qKn9q8ehE7ovUBGKkVl/htR3VroTjSzpEfgQXGi2G7lavhF0m
+acExXJ8ALLQRduBA4lJNTdXh/I4LfI4bliu/oWCaGTp0aJgWEN+Mz3DpSqMhPKIJ4YswCd
+vNRAZ2a0vKJIqbzVD42aZhud8FUMy5bkKtTpCKVYQphwOVF3mgdvtmkRGSoljDyre10QAA
+AMARVhG4dCOJD02/oM3OVxP1eR6dHvtvJXC7zDyuq0R9MCrJl1PlNFQalV3fcSc1e7Kq1w
+iMsauVCN+2+QHNl99c2LMbfj0YKtWk6vLqOZnWtkvRol5T1xNHQ+aAh2Wbn5CMOLYVLoJS
+3ceZp0x4KINj2soqrpP3GKwgQ0uuQZkbo1G7er/8oswOeFRCu9psjzF1cYxKTZL+pRAbJl
+dO/UzciVgiKW2mkLA1E2ktuvlNtIfuhh61vczs9uNJioLb8s4AAADBAO7nzGt+98HyPJ6b
+/PRIopYtZVWkCu6qoI9JK2Ohq2mgu09+ZfsTas5ro356P2uuKI/5U2TAKafSaOM3r71jIh
+eZhvMynMUPb0EAJVVJv1pcm9xn+/Qk9ZE9ThnMdvVReGJcGBH0wLleVXNQ6LloazFE9Bpu
+r6DsF8nOjhs2isonhCpsPfHH5Msw3RUA3ZoiY1HPb2/kZ9ovAdbOGHeJjpl3ONHqSc5qZI
+zSVLiqzewARwPGvWqna4vuDV67N5te8wAAAMEA4gwhzND1exC3Qx0TWmV7DwdxkeTPk3Qb
+jtOtyLV4f3LWgd2kom5+uB+oKHrZPvtPKxtu361gTKqPSaDFyTezvsq5RdfGEp3g82n3J3
+r14GFuIepTGRZkU2i8dyEWk5V/RFMCwWhJZsAqdqM91TcOU4R6cnwRgH91qGHLrPRaK2NR
+SGEfpUzSl3qTM8KC7tcGi1QucKzOoeyTICMJLwXKUtmbU+aO2cl/YGsSRmKzSP9qeFKVKd
+Vyaqr/WTPzxdXJAAAADHJvb3RAdmFncmFudAECAwQFBg==
+-----END OPENSSH PRIVATE KEY-----';
+
+        $key = PublicKeyLoader::load($key);
+
+        $key2 = PublicKeyLoader::load($key->toString('OpenSSH'));
+        $this->assertInstanceOf(PrivateKey::class, $key2);
+
+        $sig = $key->sign('zzz');
+
+        $key = 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDS8/TfgDLaowESNlVxYcLOSEPS1SAeBTIu5S2s8oRlTTrBD9ZyGSJBdsPR2ADGVmhD9lHQ3dbhjSpkIqC4msZ+2yPLJyIpyOY9BdW+V4sUfQUO5BOO8koyIThDSkJYdpsP2SWUtZU5gn+LAFqcGlSfj90BBoYWMtCNEsgBFMjo1kYDGYhoFv5wjyxz6rMHRZ9swYzT7wA7nJ5pmdEm10YCH0AcM4dP5Xqu5t1hWyhgEgd2UCfNy/4RJSFBhgk7Jb+rah3ovwgXn5ZU9CLPyc17fOeNFyT5P8pJjpfx9L9XJ+ZAOOSZIxSTePe4HrWo3NR1E2ZMqBNOsx8ljlsz6MNxShwfk6leFg40nh2k/VAOoWB7j5loKfkzPz0GOGQlR44xaVoHwqq/PsHOKUKYP6q/hOiyxOpxkgayB0QgbsdK32VWzPSZ523/r35iaS6GKRJ9nREAA74lRnmBdMbAWbQEWklY0vEl46yADpZCZRAZEretjXCDYsw0ri7RXKj8u8s= root@vagrant';
+        $key = PublicKeyLoader::load($key);
+
+        $this->assertTrue($key->verify('zzz', $sig));
+    }
+
+    public function testPuTTYPublic(): void
+    {
+        $orig = '---- BEGIN SSH2 PUBLIC KEY ----
+Comment: "phpseclib-generated-key"
+AAAAB3NzaC1yc2EAAAADAQABAAAAQQCo9+BpMRYQ/dL3DS2CyJxRF+j6ctbT3/Qp
+84+KeFhnii7NT7fELilKUSnxS30WAvQCCo2yU1orfgqr41mM70MB
+---- END SSH2 PUBLIC KEY ----';
+
+        $orig = preg_replace('#(?<!\r)\n#', "\r\n", $orig);
+        $key = PublicKeyLoader::load($orig);
+
+        $this->assertSame($orig, $key->toString('PuTTY'));
+
+        $key = '---- BEGIN SSH2 PUBLIC KEY ----
+Subject: me
+Comment: 1024-bit rsa, created by me@example.com Mon Jan 15 \
+08:31:24 2001
+AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
+596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
+soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0=
+---- END SSH2 PUBLIC KEY ----';
+        $key = PublicKeyLoader::load($key);
+        $this->assertInstanceOf(PublicKey::class, $key);
+
+        $key = '---- BEGIN SSH2 PUBLIC KEY ----
+Comment: "1024-bit RSA, converted from OpenSSH by me@example.com"
+x-command: /home/me/bin/lock-in-guest.sh
+AAAAB3NzaC1yc2EAAAABIwAAAIEA1on8gxCGJJWSRT4uOrR13mUaUk0hRf4RzxSZ1zRb
+YYFw8pfGesIFoEuVth4HKyF8k1y4mRUnYHP1XNMNMJl1JcEArC2asV8sHf6zSPVffozZ
+5TT4SfsUu/iKy9lUcCfXzwre4WWZSXXcPff+EHtWshahu3WzBdnGxm5Xoi89zcE=
+---- END SSH2 PUBLIC KEY ----';
+        $key = PublicKeyLoader::load($key);
+        $this->assertInstanceOf(PublicKey::class, $key);
+    }
+
+    public function testSavePasswordXML(): void
+    {
+        $this->expectException(UnsupportedFormatException::class);
+
+        $key = '-----BEGIN RSA PRIVATE KEY-----
+MIIBOgIBAAJBAKj34GkxFhD90vcNLYLInFEX6Ppy1tPf9Cnzj4p4WGeKLs1Pt8Qu
+KUpRKfFLfRYC9AIKjbJTWit+CqvjWYzvQwECAwEAAQJAIJLixBy2qpFoS4DSmoEm
+o3qGy0t6z09AIJtH+5OeRV1be+N4cDYJKffGzDa88vQENZiRm0GRq6a+HPGQMd2k
+TQIhAKMSvzIBnni7ot/OSie2TmJLY4SwTQAevXysE2RbFDYdAiEBCUEaRQnMnbp7
+9mxDXDf6AU0cN/RPBjb9qSHDcWZHGzUCIG2Es59z8ugGrDY+pxLQnwfotadxd+Uy
+v/Ow5T0q5gIJAiEAyS4RaI9YG8EWx/2w0T67ZUVAw8eOMB6BIUg0Xcu+3okCIBOs
+/5OiPgoTdSy7bcF9IGpSE8ZgGKzgYQVZeN97YE00
+-----END RSA PRIVATE KEY-----';
+        $key = PublicKeyLoader::load($key);
+        $key->withPassword('demo')->toString('XML');
+    }
+
+    public function testPublicAsPrivatePKCS1(): void
+    {
+        $key = '-----BEGIN RSA PRIVATE KEY-----
+MIGJAoGBANOV2sOh8KgK9ENJMCzkIQ+UogWU7GP4JMpGxT6aEoxE3O5zUo2D1asv
+RrnqAxlf1zz+1dnRDU8EYbt+DJMLJ5pBeDbBuQzzV690+f7eporcZombSN2JoPAM
+n9dyFZYXxil/cgFG/PDMnuXy1Wcl8hb8iwQag4Y7ohiLXVTJa/0BAgMBAAE=
+-----END RSA PRIVATE KEY-----';
+        $key = PublicKeyLoader::load($key);
+        $result = $key->toString('PKCS1');
+        $this->assertIsString($result);
+    }
+
+    /**
+     * @group github1579
+     */
+    public function testNakedPKCS1PublicKey(): void
+    {
+        $key = '3082020a0282020100d595c09fbc635612b3ef6a0067d74cb76fa9af62a9272400c2a896f1335b920b88a9accaffe915e38542d296c1a559a586223521da8977030888a8d076910f59489a3a4a10bf950bf2b83278810e4c3bfc027b6b6cb75736cfaabaa83de15c619b8e9f65a60f4cfeba11fb5bf5e93abff68468695948b1843e2e09504281651475f7eff1c30fcb17026f13f04109fc930e489c14a1ef80ec51be6bb73f1679d258c2db535b04f4be82790ac01b4b0e9cb68a9bb5afab4363b5f33ff143ef13d1b2a292a72881d68d765a6c1fc981da0a2644ed284607d19f39802b3967bf9308da1f6515b59a2b0a1c57c14d661a62672f3b9453f931b62c446267d912c0987b7fb4c4fe085e3573ddfd9761ec2c035fa560c6c98343e9d448667b724a919780be2fd8666115d8a75b29e6c1e216cd73a693192f551f72fdf9eac0bb5bda83b11b5159151419249915e6006e6018bc1cda20960d4f1c7df7d401afd322656b4f0810348b8d20d506b08dd8752a0a721efa750b785fb2cb40930d33dd70bd8ad83883470851bd664c648da3f102545f1c54fa803cea5ba3edb51c3b894bd8fbd48d4ed97c251b3eed1d4e636d487a711d3859946acc14f808d777bcc3c5594ac2cd7dcf278ef4e7d3badea740f757a0669f213dadf46e9ff0eeb10720af086ce29e27e0ca2a639f4f3c5825ea5e2774bb3e722ce40e7cf6e2075857797c13d2d50203010001';
+        $key = PublicKeyLoader::load(hex2bin($key));
+        $this->assertInstanceOf(PublicKey::class, $key);
+    }
+
+    /**
+     * @group github1711
+     */
+    public function testRawPrivateKey(): void
+    {
+        $key = RSA::createKey(512);
+        $str1 = "$key";
+        $key = unserialize($key->toString('Raw'));
+        $key = [
+            'e' => $key['e'],
+            'n' => $key['n'],
+            'd' => $key['d'],
+            'p' => $key['primes'][1],
+            'q' => $key['primes'][2],
+        ];
+        $key = PublicKeyLoader::loadPrivateKey($key);
+        $str2 = "$key";
+
+        $this->assertSame($str1, $str2);
+    }
+
+    public function testPuTTYV3NoPW(): void
+    {
+        $key = 'PuTTY-User-Key-File-3: ssh-rsa
+Encryption: none
+Comment: rsa-key-20220216
+Public-Lines: 6
+AAAAB3NzaC1yc2EAAAADAQABAAABAQCJ39DLYw81oZmBMeRze+Plu0p8+kJezer4
+mRpltRoqpZ0yRnyb5k0FtXrDeYL9IyCceOTsse/qks3CtVWQ2q7C2tqyezmk8mDf
+aKXqnaSG3hHZo7vJcy76J7NNB6Mz2BxF9RGvb+sylEKdWOJdgmYC6dzyvpg/0qs6
+yNPQGA5QOOzy2AstxnsujDl16I0GGsjw7ybc5844Hq4VhIQaft2Yd35UqGt5G1hs
+nIZu1cLO/F+8xs+0xEY04FvJRNAoJGlVc8oPx7slU7vF5m22AmBqrhkljbid72OR
+oXpI+4c7zc0dYZBIMoAEIJKTbliQE1WV0lYiXkS9RY3UjUyPLho9
+Private-Lines: 14
+AAABAQCI4IliEeMcpGVILOcXe2yCO1E1CCLyCc53pU/en0/t/OM18WJuR9I5k7Tf
+8XeIpeIPVbo3/mMn5zydS/c5ytDrI+kwfkN5LSPdSABIDt8zAa6I+hNJaK+/q8BG
+/gkZRDi1fxpiqGLAoQ4NNhvtJ7Lsu44d8/gkjJpvzsbx9Z/oJVK8ID10Wiiz9R7u
+WPCOJbrETGU1LaY4N0hwhbqD28xtX4ypBh+HQ9umCqOMopeqVhebMolAZ62K5V+N
+SbdN1JFk2FPQxMv3v4ApDW48AcJ1dNgO6euncaySLaQv3tnxYVjKVaf3JO0ALzoq
+zsR2uj5bJUvhSapj9uWdDJTurGzFAAAAgQDY5t/F2Ruoa5wtF/XTiIxFpb//xQ+2
+JhQOWd1fZZ+oMclqNS5E45E11TWnKthgr5NN4UB6TH4rtUETjsypD3w2PYZamTD1
+QzeoOS0xRxjKfQu08ApDV94mx9LfX6Xi2IqTW0pC+IbBx8AUnK7J7scva8TYn7Qu
+1QLSY4/tn3BBBwAAAIEAorolHJnR+w5FajTc8VeqN5E9bfc39Mr+2lQcqtARJGAM
+2jLhN3ZWGIboG3Ttqcbfuicv/WzFe+gGRA8awvMS4v2C5/knZl4Vq859KCP7JOeW
+63+5mLw5OKZOzWkguMu8+IfkUtIMv1JFuCU2eRL5elUthKlK6WFcMejuygNTrZsA
+AACARP7yi23FNxAqHcgbx5MlrLYbMSjxp5yT+1XeNVTSpM/dvDVsy+8ETi/c1870
+UfAzuIHQl2fu6NdtPBQUoqWKgBRtp46J/BoWF3Ty6klz+FAP2of4gojYvqa87H+6
+dW7G8+QXxXM704cxjbBQAApItfVw3upWPrYP9FDy7xvtYRY=
+Private-MAC: 7979eb6f604fb3e0bd191295479517f641598649167835402c6cbfde6cbf21ef';
+
+        $key = PublicKeyLoader::load($key);
+        $this->assertInstanceOf(PrivateKey::class, $key);
+    }
+
+    public function testPuTTYV3PW(): void
+    {
+        if (!function_exists('sodium_crypto_pwhash')) {
+            self::markTestSkipped('sodium_crypto_pwhash() function is not available.');
+        }
+
+        $key = 'PuTTY-User-Key-File-3: ssh-rsa
+Encryption: aes256-cbc
+Comment: rsa-key-20220216
+Public-Lines: 6
+AAAAB3NzaC1yc2EAAAADAQABAAABAQCJ39DLYw81oZmBMeRze+Plu0p8+kJezer4
+mRpltRoqpZ0yRnyb5k0FtXrDeYL9IyCceOTsse/qks3CtVWQ2q7C2tqyezmk8mDf
+aKXqnaSG3hHZo7vJcy76J7NNB6Mz2BxF9RGvb+sylEKdWOJdgmYC6dzyvpg/0qs6
+yNPQGA5QOOzy2AstxnsujDl16I0GGsjw7ybc5844Hq4VhIQaft2Yd35UqGt5G1hs
+nIZu1cLO/F+8xs+0xEY04FvJRNAoJGlVc8oPx7slU7vF5m22AmBqrhkljbid72OR
+oXpI+4c7zc0dYZBIMoAEIJKTbliQE1WV0lYiXkS9RY3UjUyPLho9
+Key-Derivation: Argon2id
+Argon2-Memory: 8192
+Argon2-Passes: 13
+Argon2-Parallelism: 1
+Argon2-Salt: d9bfa07d14a450a26ada4eb5d30c4dae
+Private-Lines: 14
+L3TUmo97jnxJVYIScxzPIaq19/yNQ5HDQKGSTz4vqUrQR3wXQEyhzxlN2mm5zZtT
+pst7K61P0awtjs4kHUfsKxXh/upv7ndS9u9G7cnnBfP5mjs0wAE2VaghbP4UXprH
+/MQC9Dr13Iuydv5Oih+PLpkvM3DbY5t+nrIWy/29yDLYe/QjLvy346Gz3pnLmCfb
+hbEFfjefdppa+6QZ+qU6ai/NMAM/Q5OxjRlIo1brrKJNvMrbzP7irZ4+Ao2Or/hX
+nb2ZZLY0eUotD8iFuOk2EjjqP9iakag1OHdvdy6EcPzkIObN5YeZGz9/hRDFr9Ml
+xNxdaw5c1BhqU5pm0B0HUDqW5kmYTiugUKQiGr0+1ckliUt6jsb7YImnqJIgL7PS
+vKcqNvz95u4on77gHPl2JdsXxuz6jOkDwc9jvsJCtIMJ8qhAVXGS7WaH2aF9ty7B
+4E+f2yIbsRr0RFCZoTTjTmhtYsVd7DYo0Jftya3Sh/lVO1MLo1z8em0MFJdR683N
+tRDA2lbRPOdKYaiKdyp5bAsl4fqPR1e2GR9ybalPn/XSFDRtDfdMr7hyQboBR7uC
+X3nYsh5OiXakUSr2ST41pP27s8F48590M6xWb9LGFJA+JqmAZ5rxPTxFYjkz27y9
+Yvlq6lvM+XsUREPrxhWrHya4Jyp4WtyVtJXDg626hoZBSEtcOY/mbPfwVFnoU9vz
+V8TI/YU837mUceEJlEQEbT+bFJfh0W5jzAYx2xX6uPnDkodBMK2p6QS3ZKib0NJ7
+W+jQr9TT40H0agZhtAmPKaLGxtgdpUps1CDPV+8Y/pBf28CsI2DjFaOYopZXcW9s
+vCIjXopt4wAKbXiLyb5JXzFfB7CVron48NHB7wzuwvnUoYa/4dbjeEos+1y72xoP
+Private-MAC: d26baf87446604974287b682ed9e0c00ce54e460e1cb719953a81291147b3c59
+';
+
+        $key = PublicKeyLoader::load($key, 'demo');
+        $this->assertInstanceOf(PrivateKey::class, $key);
+    }
+
+    public function testOpenSSHEncrypted(): void
+    {
+        if (PHP_INT_SIZE == 4) {
+            self::markTestSkipped('32-bit integers slow OpenSSH encrypted keys down too much');
+        }
+
+        $key = '-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABBN2Ff3Kw
+SIOWyzRiboPRIhAAAAEAAAAAEAAAGXAAAAB3NzaC1yc2EAAAADAQABAAABgQCpxMxDEG0S
+gf8oVUPcoPq34BQtj0WIgSGKa/y+aeNN4c38KdlluTKx53B3MWPCwCIBynfxx/IeFb8mmV
+7ojIinKp4nocR0LxWA1+B0A0lQmVOfKhUNScillxxRSNQJTi4UjKyBmj1bU9w7Fp7beNzz
+NKcHW9t3iBYZFnzGuatcTWLdkzyBitOemD3duOzI5a9CR7c/MbJdVzC2G4BFCdzRtjYOG5
+w2wuofrac4I3fI6NK9d+mePPxKJIwYDyQk5pmG89p7T7M7JdSpQSwiN2ZrkinGfxUJLKsf
+4o29rjHSfd/r18rDor2vzpfaQcuR/NFRsPWE1iOx3bPns2bRWt5QYWF5eRZAb2HwSF0w+r
+/tKqVkomYALV31K3W8fLw0bMepvyHTrRiSKvwkOTNw58Gr+DQplSpbFJuCKaktrMb3pf/t
+jXeAItJnSdBeUAnKNUKv2oxldpT74y1yEpvZPa8nsnHVtB+Xc5Hy1Lr0PMf7FBOXLTpMu5
+YNd8myLKhX57sAAAWQV9Znl6fgfCTtrMupyop0n9obvDLTTFMf7FY5NlLc+qxpz9qJ+hgD
+l+18OFgGqV85F1OY4wdfVXzkEIYMUWw9F1zDwUOW8Yfpk/IIQiqHSL4zfwXS/e4mG9Sfou
+7fzOPflmzCjWZGnVaxmYs2ybdbLEu0sRMWAKbXgWTf/H4jg8qGKxPFJT669RZEUZk3hIGG
+CcIdmkOHgMXw+XdX61GE/5/jBPv9GIyTQXLHSsUG4rlF2saBj4QLVBOf6oW7TiVjXvvCm7
+jnHFTSS3Kx5yB47GEIzAIRRJEnuPdOR1mJdASX2as96hMw7y4leQnzyJgQ1slIz8na8Z2P
+9aR7MYOlaX6/gDNRh2BQlOAxai30iieNSQi2qfuVC3SbpHXf9+yOTva8wfb55WYtm9UQ3R
+YxI6HrwjfnD/8EjiXmhbJfLlKfzkM6KDBSEUkOIWxgJBkBhkuXdacv5iSV3dCMnHk3kXOv
+2b/B7e7Uc9x6Xva8cXcp//y12rpYXdTXTVYEGnmDVz9U1ITOjI9umAAYNmZgEPoabNb6r4
+3cARBPz42hQ4LmILr0JCj5P/0cRzdMrZEumwvXkP3/BuGkj9AjFh2r9WhZ/yCaXVGxzS/b
+bySXy1LMgQRbWLwbDOmGqsPn74KpiRgO/IhtXzlOt5+RumqFS7JI8N/qUlMwFcAhO9EsCQ
+UBKWN4enVg2Y8vL/mCuFMW9SQR3pNfBL7uqdOFsdtalPC4vzMyUpkd3dUVpkJ2RYc1bEfh
+oumUZr0aM+CSscOVwHt8VwKqZ/wBV3ZtL4KL+uy2ko0Ig0ZuBHeK65m2JWETtKJR/sk+DN
+bK8MABP+FVXxHaL5UeLQAo9K80UukSwypJgRV4EyvK8fIMoNh8SDlqMi48E1xyucpC1yQX
+k+5MuzJL7WbTCudyHOtWcrlGlI6aXE3846fAoejSxp0R57GJZ8i3oocI+hzYT6HvNnsiHq
+Nm5hrEC/wNz0U0w/VniXocHwHYbp8VOb3fMfkXPi9eYJqv+WgEHm50D/3ve8Bhsxp5BYaF
+va8Wf3Tsy35Bbqx5Z9pF6ZptHHL5D1a5K8o+GfRzsxXzXOKjRz5Sgt/qDZuSJ3HhrdONGF
+3oHO+/Brbzfs3hbgJKpzhlXLAxxWsD9qdJKSTdfOXSvu+vDrHPp/V1LSBEWD/ZwIQdEMwK
+MZ17sLZqzp1PHOQQPx+ugnCt5OPokG6LR281qQAy0y3OefnYn62DsLMt3DLnbJvr2jtlWi
+GA1sAcQqQlWetiD0AszwkhuEhmUxySoGqKFRiKccgLK6DEgRSFLWGS8MiZenFwR+cJ+73L
+4WeApHfZeATEY5groZDix+yq3cHT5wY49GHlHPbaikythWMHAJ4FNGsF1tAM06sRUQfsEM
+1jXnpuzr+TLNCfP457Ffvf+zuIpQJXjYOgXAzKO2eVXmYygYWGqFGOFeFkM1FN2UXdGAKU
+ObHAmXAXUAqXAgjk4fjETG1YSnqolakKIIw2Jn+FdNnuvfgzMwdvz1Do3x84h+SIoVgqvE
+A2mgZNWUzFF+0B/1e2a/G6gxsAUXgfuMYe8zycNvhxygINHYgeBRCb4/qJxKBcq3QV1Pip
+jGpgScZvefpYEMHqbVy6hsFDIQotzqR0lIg+d4WaxxhsNWVQPXUf/2NtwZjeCJQdlrgi48
+MXKJ4PNjqCej6QXswbw7PDwx3jI2HFt/tX/V6PActZtIrpMaekMit87bIr4wAcXNTsuTo3
+4zejkH1MMkZA+LRKwhsqcOKzyzSyOvI50IVfF92ViXb1P/7zwdvMSqEghvLooHpcRLDmZB
+8t9cFMOs5N2CzmXxKrCVD1Ex45f36/jGmxI5qcKdkulVcuY3yWQra3onzfkCEODGCW5FeG
+LrIZULwMa4nI4Y+RkFftEponSYw=
+-----END OPENSSH PRIVATE KEY-----
+';
+
+        $key = PublicKeyLoader::load($key, 'test');
+        $this->assertInstanceOf(PrivateKey::class, $key);
+    }
+
+    public function testJWK(): void
+    {
+        // keys are from https://datatracker.ietf.org/doc/html/rfc7517#appendix-A
+
+        $plaintext = 'zzz';
+
+        $key = '     {"keys":
+       [
+         {"kty":"RSA",
+          "n":"0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4
+     cbbfAAtVT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMst
+     n64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf0h4QyQ5v-65YGjQR0_FDW2Q
+     vzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbIS
+     D08qNLyrdkt-bFTWhAI4vMQFh6WeZu0fM4lFd2NcRwr3XPksINHaQ-G_xBniIqbw
+     0Ls1jF44-csFCur-kEgU8awapJzKnqDKgw",
+          "e":"AQAB",
+          "d":"X4cTteJY_gn4FYPsXB8rdXix5vwsg1FLN5E3EaG6RJoVH-HLLKD9
+     M7dx5oo7GURknchnrRweUkC7hT5fJLM0WbFAKNLWY2vv7B6NqXSzUvxT0_YSfqij
+     wp3RTzlBaCxWp4doFk5N2o8Gy_nHNKroADIkJ46pRUohsXywbReAdYaMwFs9tv8d
+     _cPVY3i07a3t8MN6TNwm0dSawm9v47UiCl3Sk5ZiG7xojPLu4sbg1U2jx4IBTNBz
+     nbJSzFHK66jT8bgkuqsk0GjskDJk19Z4qwjwbsnn4j2WBii3RL-Us2lGVkY8fkFz
+     me1z0HbIkfz0Y6mqnOYtqc0X4jfcKoAC8Q",
+          "p":"83i-7IvMGXoMXCskv73TKr8637FiO7Z27zv8oj6pbWUQyLPQBQxtPV
+     nwD20R-60eTDmD2ujnMt5PoqMrm8RfmNhVWDtjjMmCMjOpSXicFHj7XOuVIYQyqV
+     WlWEh6dN36GVZYk93N8Bc9vY41xy8B9RzzOGVQzXvNEvn7O0nVbfs",
+          "q":"3dfOR9cuYq-0S-mkFLzgItgMEfFzB2q3hWehMuG0oCuqnb3vobLyum
+     qjVZQO1dIrdwgTnCdpYzBcOfW5r370AFXjiWft_NGEiovonizhKpo9VVS78TzFgx
+     kIdrecRezsZ-1kYd_s1qDbxtkDEgfAITAG9LUnADun4vIcb6yelxk",
+          "dp":"G4sPXkc6Ya9y8oJW9_ILj4xuppu0lzi_H7VTkS8xj5SdX3coE0oim
+     YwxIi2emTAue0UOa5dpgFGyBJ4c8tQ2VF402XRugKDTP8akYhFo5tAA77Qe_Nmtu
+     YZc3C3m3I24G2GvR5sSDxUyAN2zq8Lfn9EUms6rY3Ob8YeiKkTiBj0",
+          "dq":"s9lAH9fggBsoFR8Oac2R_E2gw282rT2kGOAhvIllETE1efrA6huUU
+     vMfBcMpn8lqeW6vzznYY5SSQF7pMdC_agI3nG8Ibp1BUb0JUiraRNqUfLhcQb_d9
+     GF4Dh7e74WbRsobRonujTYN1xCaP6TO61jvWrX-L18txXw494Q_cgk",
+          "qi":"GyM_p6JrXySiz1toFgKbWV-JdI3jQ4ypu9rbMWx3rQJBfmt0FoYzg
+     UIZEVFEcOqwemRN81zoDAaa-Bk0KWNGDjJHZDdDmFhW3AN7lI-puxk_mHZGJ11rx
+     yR8O55XLSe3SPmRfKwZI6yU24ZxvQKFYItdldUKGzO6Ia6zTKhAVRU",
+          "alg":"RS256",
+          "kid":"2011-04-29"}
+       ]
+     }';
+
+        $keyWithoutWS = preg_replace('#\s#', '', $key);
+
+        $key = PublicKeyLoader::load($key);
+
+        $phpseclibKey = str_replace('=', '', $key->toString('JWK', [
+            'alg' => 'RS256',
+            'kid' => '2011-04-29',
+        ]));
+
+        $this->assertSame($keyWithoutWS, $phpseclibKey);
+
+        $sig = $key->sign($plaintext);
+
+        $key = '         {"kty":"RSA",
+          "n": "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx
+     4cbbfAAtVT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMs
+     tn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf0h4QyQ5v-65YGjQR0_FDW2
+     QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbI
+     SD08qNLyrdkt-bFTWhAI4vMQFh6WeZu0fM4lFd2NcRwr3XPksINHaQ-G_xBniIqb
+     w0Ls1jF44-csFCur-kEgU8awapJzKnqDKgw",
+          "e":"AQAB",
+          "alg":"RS256",
+          "kid":"2011-04-29"}';
+
+        $keyWithoutWS = preg_replace('#\s#', '', $key);
+        $keyWithoutWS = '{"keys":[' . $keyWithoutWS . ']}';
+
+        $key = PublicKeyLoader::load($key);
+
+        $phpseclibKey = str_replace('=', '', $key->toString('JWK', [
+            'alg' => 'RS256',
+            'kid' => '2011-04-29',
+        ]));
+
+        $this->assertSame($keyWithoutWS, $phpseclibKey);
+
+        $this->assertTrue($key->verify($plaintext, $sig));
+    }
+
+    /**
+     * @group github1958
+     */
+    public function testPKCS8RC2MD5CBC(): void
+    {
+        // openssl pkcs8 -in private.pem -topk8 -v1 PBE-MD5-RC2-64 -out enckey.pem
+
+        // EncryptionAlgorithm: pbeWithMD5AndRC2-CBC
+
+        $key = '-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIICETAbBgkqhkiG9w0BBQYwDgQI7qAHhVoX0XcCAggABIIB8Cnn5w+b41WxKfIj
+9Fn+SnPeozCfVXALVst33Cx5yaIWeufHrRnRFTM5XyzcwmpsB6WDgEfRfkoocb9a
+E9iLIv/vAu+Ak6Olexc+e6KCkNrA5QkqBjiGVar52zIYPdFK1ZLJRprZae/h5XTN
+71zkuKryZM/XlR2wVmV54N+Sh0aQRDPF9NbURnijQ7AyEbxHVIEbOPFMnoEwoQnF
+43ZR0NGJuqNoiixBVqd7NImwXQB+1yn1Xl6dcOD80m/Tz09QvjczuULcNgZjPAQc
+wakFABHqCWAzGdta/pum7aKmfeUwlvBfu7GFQAercIao3xkYzRjLhRBQ3f4FYut/
+D4p4R12oTOCP5xdvFpHitdvmjRD2jdRUSAhE/SOIP1JniejFxqJs7ORiHktjgcBc
+2+7tVEpcuugcF7mZrMSlOqd00/+xFchOqjHvqXMmHvvKwUTWBwgUaXY19vcEPslj
+nWOpCG6zlvOQceM+8T07V3A+uuh3BTRtWjIk8Fc1wwwyjfwH6mkhDgR5n8EiBmDn
+eHjBR3QaVdcFLmCKlxn4Ke5l/56e6DeWKsLKsGbWzUO3F76WEpl7rIQTRNlHZ+0U
+ShOAPu7NCjiC91Ukn2LojPHcg48D6oECpe/PQqg6nFUiXWjex7QdNRu83RMcN58Y
+NIRifWY=
+-----END ENCRYPTED PRIVATE KEY-----';
+        $pass = 'password';
+
+        $this->pkcs8tester($key, $pass);
+    }
+
+    /**
+     * @group github1958
+     */
+    public function testPKCS8DES(): void
+    {
+        // openssl pkcs8 -in private.pem -topk8 -v2 des -out enckey.pem
+
+        // EncryptionAlgorithm: id-PBES2
+        // EncryptionScheme: desCBC
+
+        $key = '-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIICQTBLBgkqhkiG9w0BBQ0wPjApBgkqhkiG9w0BBQwwHAQIx5iE4vTZRSQCAggA
+MAwGCCqGSIb3DQIJBQAwEQYFKw4DAgcECO73En/5bVgbBIIB8IvIeLsS5iL1Ntdo
+s4DDTTk2Ea46F6eFmKuiu/UWJAFLZb7ZU4kGx+2GfDbnsR47swU/xNDQD6qxEgpF
+AT4QDgLldreY4BcFgTrRSShn8IO8yRNYCVslhngPtVv4OjcMxtJKPSsApJOY9JAC
+z4ew5oycLO8buDtAukCAEHWEK/su9piSDP5KCGniYySZ+eg49sw/AOGaueLEOYmt
+wqmock/VIcp8qwLpOBWxfMjfcTEjyMcm3tKm5UoYfmnO7h9mk1O2NCnVu3zNvFE0
+/P/KwcFJU2OIHVJlrTsiCY0CwG7nco8X9DbhpXtwX+80WkZ5jn1C+lgaO80ZvqgV
+KiI1biFJ1FymINw8bTgPfYPHBkoDUA9nHcHlP7vLJu3gTrhLxoit2yEEeK6+G8M5
+lgdlcnbf5nb5e9ygpY/JANd33F4f4+P0sgBPPzRNmNG50obvxYJLGQ1QVT6Jmn5f
+FEchPJS+w3RLIdfi+FCnfnmuHCrHm5iBEiJ545TCiQyIosamuUQKyxoGZxy1kGlE
+Rue+5+0riuyBCL4M+wNOANjqt48ReFo+1pVw3GJVl7XfOTOh1VN8pAxPFNZTMhb3
+xr7sn6L7NLdA32N8yqGbo6MeEof4gJ6fq1PkJG+EPkVzIo0VJ5lnxMZYlCwKCdME
+vtpiPBM=
+-----END ENCRYPTED PRIVATE KEY----';
+        $pass = 'password';
+
+        $this->pkcs8tester($key, $pass);
+    }
+
+    /**
+     * @group github1994
+     */
+    public function testCloseNumbers(): void
+    {
+        $rsa = PublicKeyLoader::load([
+            // Modulus
+            'n' => new BigInteger('5BDD6AFB1E1AFB50D1B2989F70B549B8D44AE3712B444F2C5D862C46C99526E998B79BF0B4F1461524E39D263F3130B9E08F3B17C2070785EFB0EDEC1E75C6C2B8185FA9596886D5DAF8B68E92FCF5F1B33E7CD772845555B086D2A2466B6398A04DFE1C727BB020g1ED2BF3F03D2826F89616D0846C18B1D87064616FAD394462', 16),
+
+            // Exponent
+            'e' => new BigInteger('6FE4F5D0AFCC16E8A5CC68955D4EF28255A546D06F34DD103540B9A7D202AEC96353072DB65D9C360E9030F413971142EE6A28974767CCF3ABFA4E7ADDAEAD81D3F8AE5FF1B8241CA9EF51C10941FFFA74482A636CBD909D29CF7A0346653D3C286EA1F392F4968AEF1489EC4B4BCEA4F248F3931B1C9BE2808DBD33B049731A', 16),
+        ])
+            ->withPadding(RSA::SIGNATURE_PKCS1)
+            ->withHash('md5')
+            ->asPrivateKey();
+
+        $sig = bin2hex($rsa->sign('toto'));
+        $expected = '4370b3fd5dd318c0c3be8989574fbf4ededc805c6f225ada84f8d882d327b7b300f899878204ff99efdf03b17c26518b8941d602abd16dbdac637c5ae61814cb689da266fe07bc978d417fe6742f650bc35ee79dd2431912fc19e36012e61fcb7cdfd506ca3c5b80';
+        $this->assertSame($expected, $sig);
+    }
 }
diff --git a/tests/Unit/Crypt/RSA/ModeTest.php b/tests/Unit/Crypt/RSA/ModeTest.php
index 16a99b044..b91a24cd6 100644
--- a/tests/Unit/Crypt/RSA/ModeTest.php
+++ b/tests/Unit/Crypt/RSA/ModeTest.php
@@ -1,21 +1,27 @@
 <?php
+
 /**
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2013 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\Crypt\RSA;
-use phpseclib\Math\BigInteger;
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt\RSA;
+
+use phpseclib3\Crypt\PublicKeyLoader;
+use phpseclib3\Crypt\RSA;
+use phpseclib3\Crypt\RSA\Formats\Keys\PKCS8;
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Tests\PhpseclibTestCase;
 
-class Unit_Crypt_RSA_ModeTest extends PhpseclibTestCase
+class ModeTest extends PhpseclibTestCase
 {
-    public function testEncryptionModeNone()
+    public function testEncryptionModeNone(): void
     {
         $plaintext = 'a';
 
-        $rsa = new RSA();
-
         $privatekey = '-----BEGIN RSA PRIVATE KEY-----
 MIICXAIBAAKBgQCqGKukO1De7zhZj6+H0qtjTkVxwTCpvKe4eCZ0FPqri0cb2JZfXJ/DgYSF6vUp
 wmJG8wVQZKjeGcjDOL5UlsuusFncCzWBQ7RKNUSesmQRMSGkVb1/3j+skZ6UtW+5u09lHNsj6tQ5
@@ -29,10 +35,10 @@ public function testEncryptionModeNone()
 U9VQQSQzY1oZMVX8i1m5WUTLPz2yLJIBQVdXqhMCQBGoiuSoSjafUhV7i1cEGpb88h5NBYZzWXGZ
 37sJ5QsW+sJyoNde3xH8vdXhzU7eT82D6X/scw9RZz+/6rCJ4p0=
 -----END RSA PRIVATE KEY-----';
-        $rsa->load($privatekey);
-        $rsa->load($rsa->getPublicKey());
+        $rsa = PublicKeyLoader::load($privatekey);
+        $rsa = $rsa->getPublicKey()
+            ->withPadding(RSA::ENCRYPTION_NONE);
 
-        $rsa->setEncryptionMode(RSA::ENCRYPTION_NONE);
         $expected = '105b92f59a87a8ad4da52c128b8c99491790ef5a54770119e0819060032fb9e772ed6772828329567f3d7e9472154c1530f8156ba7fd732f52ca1c06' .
             '5a3f5ed8a96c442e4662e0464c97f133aed31262170201993085a589565d67cc9e727e0d087e3b225c8965203b271e38a499c92fc0d6502297eca712' .
             '4d04bd467f6f1e7c';
@@ -41,22 +47,24 @@ public function testEncryptionModeNone()
 
         $this->assertEquals($result, $expected);
 
-        $rsa->load($privatekey);
+        $rsa = PublicKeyLoader::load($privatekey)
+            ->withPadding(RSA::ENCRYPTION_NONE);
         $this->assertEquals(trim($rsa->decrypt($result), "\0"), $plaintext);
     }
 
     /**
      * @group github768
      */
-    public function testPSSSigs()
+    public function testPSSSigs(): void
     {
-        $rsa = new RSA();
-        $rsa->load('-----BEGIN PUBLIC KEY-----
+        $rsa = PublicKeyLoader::load('-----BEGIN PUBLIC KEY-----
 MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqGKukO1De7zhZj6+H0qtjTkVx
 wTCpvKe4eCZ0FPqri0cb2JZfXJ/DgYSF6vUpwmJG8wVQZKjeGcjDOL5UlsuusFnc
 CzWBQ7RKNUSesmQRMSGkVb1/3j+skZ6UtW+5u09lHNsj6tQ51s1SPrCBkedbNf0T
 p0GbMJDyR4e9T04ZZwIDAQAB
------END PUBLIC KEY-----');
+-----END PUBLIC KEY-----')
+            ->withHash('sha1')
+            ->withMGFHash('sha1');
 
         $sig = pack('H*', '1bd29a1d704a906cd7f726370ce1c63d8fb7b9a620871a05f3141a311c0d6e75fefb5d36dfb50d3ea2d37cd67992471419bfadd35da6e13b494' .
             '058ddc9b568d4cfea13ddc3c62b86a6256f5f296980d1131d3eaec6089069a3de79983f73eae20198a18721338b4a66e9cfe80e4f8e4fcef7a5bead5cbb' .
@@ -65,17 +73,200 @@ public function testPSSSigs()
         $this->assertTrue($rsa->verify('zzzz', $sig));
     }
 
-    /**
-     * @expectedException \LengthException
-     */
-    public function testSmallModulo()
+    public function testSmallModulo(): void
     {
+        $this->expectException('LengthException');
+
         $plaintext = 'x';
-        $n = new BigInteger(base64_decode('272435F22706FA96DE26E980D22DFF67'), 256);
-        $e = new BigInteger(base64_decode('158753FF2AF4D1E5BBAB574D5AE6B54D'), 256);
 
-        $rsa = new RSA();
-        $rsa->load(array('n' => $n, 'e' => $e));
+        $key = PKCS8::savePublicKey(
+            new BigInteger(base64_decode('272435F22706FA96DE26E980D22DFF67'), 256), // n
+            new BigInteger(base64_decode('158753FF2AF4D1E5BBAB574D5AE6B54D'), 256)  // e
+        );
+        $rsa = PublicKeyLoader::load($key);
+
         $rsa->encrypt($plaintext);
     }
+
+    public function testPKCS1LooseVerify(): void
+    {
+        $rsa = PublicKeyLoader::load('-----BEGIN RSA PUBLIC KEY-----
+MIGJAoGBAMuqkz8ij+ESAaNvgocVGmapjlrIldmhRo4h2NX4e6IXiCLTSxASQtY4
+iqRnmyxqQSfaan2okTfQ6sP95bl8Qz8lgneW3ClC6RXG/wpJgsx7TXQ2kodlcKBF
+m4k72G75QXhZ+I40ZG7cjBf1/9egakR0a0X0MpeOrKCzMBLv9+mpAgMBAAE=
+-----END RSA PUBLIC KEY-----')
+            ->withPadding(RSA::SIGNATURE_RELAXED_PKCS1);
+
+        $message = base64_decode('MYIBLjAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0xNDA1MTUxNDM4MzRaMC8GCSqGSIb3DQEJBDEiBCBLzLIBGdOf0L2WRrIY' .
+            '9KTwiHnReBW48S9C7LNRaPp5mDCBwgYLKoZIhvcNAQkQAi8xgbIwga8wgawwgakEIJDB9ZGwihf+TaiwrHQNkNHkqbN8Nuws0e77QNObkvFZMIGEMHCkbjBs' .
+            'MQswCQYDVQQGEwJJVDEYMBYGA1UECgwPQXJ1YmFQRUMgUy5wLkEuMSEwHwYDVQQLDBhDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eUMxIDAeBgNVBAMMF0FydWJh' .
+            'UEVDIFMucC5BLiBORyBDQSAzAhAv4L3QcFssQNLDYN/Vu40R');
+
+        $sig = base64_decode('XDSZWw6IcUj8ICxRJf04HzF8stzoiFAZSR2a0Rw3ziZxTOT0/NVUYJO5+9TaaREXEgxuCLpgmA+6W2SWrrGoxbbNfaI90ZoKeOAws4IX+9RfiWuooibjKcvt' .
+            'GJYVVOCcjvQYxUUNbQ4EjCUonk3h7ECXfCCmWqbeq2LsyXeeYGE=');
+
+        $this->assertTrue($rsa->verify($message, $sig));
+    }
+
+    public function testZeroLengthSalt(): void
+    {
+        $plaintext = 'a';
+
+        $rsa = PublicKeyLoader::load('-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQCqGKukO1De7zhZj6+H0qtjTkVxwTCpvKe4eCZ0FPqri0cb2JZfXJ/DgYSF6vUp
+wmJG8wVQZKjeGcjDOL5UlsuusFncCzWBQ7RKNUSesmQRMSGkVb1/3j+skZ6UtW+5u09lHNsj6tQ5
+1s1SPrCBkedbNf0Tp0GbMJDyR4e9T04ZZwIDAQABAoGAFijko56+qGyN8M0RVyaRAXz++xTqHBLh
+3tx4VgMtrQ+WEgCjhoTwo23KMBAuJGSYnRmoBZM3lMfTKevIkAidPExvYCdm5dYq3XToLkkLv5L2
+pIIVOFMDG+KESnAFV7l2c+cnzRMW0+b6f8mR1CJzZuxVLL6Q02fvLi55/mbSYxECQQDeAw6fiIQX
+GukBI4eMZZt4nscy2o12KyYner3VpoeE+Np2q+Z3pvAMd/aNzQ/W9WaI+NRfcxUJrmfPwIGm63il
+AkEAxCL5HQb2bQr4ByorcMWm/hEP2MZzROV73yF41hPsRC9m66KrheO9HPTJuo3/9s5p+sqGxOlF
+L0NDt4SkosjgGwJAFklyR1uZ/wPJjj611cdBcztlPdqoxssQGnh85BzCj/u3WqBpE2vjvyyvyI5k
+X6zk7S0ljKtt2jny2+00VsBerQJBAJGC1Mg5Oydo5NwD6BiROrPxGo2bpTbu/fhrT8ebHkTz2epl
+U9VQQSQzY1oZMVX8i1m5WUTLPz2yLJIBQVdXqhMCQBGoiuSoSjafUhV7i1cEGpb88h5NBYZzWXGZ
+37sJ5QsW+sJyoNde3xH8vdXhzU7eT82D6X/scw9RZz+/6rCJ4p0=
+-----END RSA PRIVATE KEY-----')
+            ->withSaltLength(0)
+            ->withHash('sha1')
+            ->withMGFHash('sha1');
+
+        // Check we generate the correct signature.
+        $sig = pack('H*', '0ddfc93548e21d015c0a289a640b3b79aecfdfae045f583c5925b91cc5c399bba181616ad6ae20d9662d966f0eb2fddb550f4733268e34d640f4c9dadcaf25b3c82c42130a5081c6ebad7883331c65b25b6a37ffa7c4233a468dae56180787e2718ed87c48d8d50b72f5850e4a40963b4f36710be250ecef6fe0bb91249261a3');
+        $this->assertEquals($sig, $rsa->sign($plaintext));
+
+        // Check we can verify the signature correctly.
+        $rsa = $rsa->getPublicKey();
+        $this->assertTrue($rsa->verify($plaintext, $sig));
+    }
+
+    /**
+     * @group github1423
+     */
+    public function testPSSSigsWithNonPowerOf2Key(): void
+    {
+        $pub = <<<HERE
+            -----BEGIN PUBLIC KEY-----
+            MF0wDQYJKoZIhvcNAQEBBQADTAAwSQJCAmdYuOvii3I6ya3q/zSeZFoJprgF9fIq
+            k12yS6pCS3c+1wZ9cYFVtgfpSL4XpylLe9EnRT2GRVYCqUkR4AUeTuvnAgMBAAE=
+            -----END PUBLIC KEY-----
+            HERE;
+
+        $rsa = PublicKeyLoader::load($pub)
+            ->withHash('sha256')
+            ->withSaltLength(32)
+            ->withMGFHash('sha256');
+
+        $sig = base64_decode(strtr('Ad022bD-UCmWpBNMtsYJjG0FVxML-FFlN4IKrByP8rwjVzV_D-YqSjc_oW6LrooV7jbtEF5803YLn8lllyzDnw00', '-_', '+/'));
+
+        $payload = 'eyJraWQiOiJ0RkMyVUloRnBUTV9FYTNxY09kX01xUVQxY0JCbTlrRkxTRGZlSmhzUkc4IiwiYWxnIjoiUFMyNTYifQ.eyJhcHAiOiJhY2NvdW50cG9ydGFsIiwic3ViIjoiNTliOGM4YzA5NTVhNDA5MDg2MGRmYmM3ZGQwMjVjZWEiLCJjbGlkIjoiZTQ5ZTA2N2JiMTFjNDcyMmEzNGIyYjNiOGE2YTYzNTUiLCJhbSI6InBhc3N3b3JkIiwicCI6ImVOcDFrRUZQd3pBTWhmXC9QdEVOYU5kQkc2bUZDNHNpbENNNXU0aTNXMHFSS0hFVDU5V1JzcXpZRUp4XC84M3ZQbkIxcUg3Rm5CZVNabEtNME9saGVZVUVWTXlHOEVUOEZnWDI4dkdqWG4wWkcrV2hSK01rWVBicGZacHI2U3E0N0RFYjBLYkRFT21CSUZuOTZKN1ZDaWg1Q2p4dWNRZDJmdHJlMCt2cSthZFFObUluK0poWEl0UlBvQ0xya1wvZ05VV3N3T09vSVwva0Q5ZVk4c05jRHFPUzNkanFWb3RPU21oRUo5b0hZZmFqZmpSRzFGSWpGRFwvOExtT2pKbVF3d0tBMnQ0aXJBQ2NncHo0dzBuN3BtXC84YXV2T0dFM2twVFZ2d0IzdzlQZk1YZnJJUTBhejRsaEtIdVBUMU42XC9sb1FJPSIsImlhaSI6IjU5YjhjOGMwOTU1YTQwOTA4NjBkZmJjN2RkMDI1Y2VhIiwiY2xzdmMiOiJhY2NvdW50cG9ydGFsIiwibHB2IjoxNTQ3Njc1NDM4LCJ0IjoicyIsImljIjp0cnVlLCJleHAiOjE1NDc3MDQyMzgsImlhdCI6MTU0NzY3NTQzOCwianRpIjoiZTE0N2UzM2UzNzVhNDkyNWJjMzdjZTRjMDIwMmJjNDYifQ';
+        $this->assertTrue($rsa->verify($payload, $sig));
+    }
+
+    public function testHash(): void
+    {
+        $pub = <<<HERE
+            -----BEGIN PUBLIC KEY-----
+            MF0wDQYJKoZIhvcNAQEBBQADTAAwSQJCAmdYuOvii3I6ya3q/zSeZFoJprgF9fIq
+            k12yS6pCS3c+1wZ9cYFVtgfpSL4XpylLe9EnRT2GRVYCqUkR4AUeTuvnAgMBAAE=
+            -----END PUBLIC KEY-----
+            HERE;
+
+        $rsa = PublicKeyLoader::load($pub)
+            ->withHash('sha1')
+            ->withSaltLength(5)
+            ->withMGFHash('sha512');
+
+        $this->assertEquals('sha1', $rsa->getHash());
+        $this->assertSame(5, $rsa->getSaltLength());
+        $this->assertEquals('sha512', $rsa->getMGFHash());
+
+        $rsa = $rsa
+            ->withHash('sha512')
+            ->withSaltLength(6)
+            ->withMGFHash('sha1');
+
+        $this->assertEquals('sha512', $rsa->getHash());
+        $this->assertSame(6, $rsa->getSaltLength());
+        $this->assertEquals('sha1', $rsa->getMGFHash());
+    }
+
+    public function testPKCS1SigWithoutNull(): void
+    {
+        $rsa = PublicKeyLoader::load([
+            'n' => new BigInteger(
+                'E932AC92252F585B3A80A4DD76A897C8B7652952FE788F6EC8DD640587A1EE5647670A8AD' .
+                '4C2BE0F9FA6E49C605ADF77B5174230AF7BD50E5D6D6D6D28CCF0A886A514CC72E51D209CC7' .
+                '72A52EF419F6A953F3135929588EBE9B351FCA61CED78F346FE00DBB6306E5C2A4C6DFC3779' .
+                'AF85AB417371CF34D8387B9B30AE46D7A5FF5A655B8D8455F1B94AE736989D60A6F2FD5CADB' .
+                'FFBD504C5A756A2E6BB5CECC13BCA7503F6DF8B52ACE5C410997E98809DB4DC30D943DE4E81' .
+                '2A47553DCE54844A78E36401D13F77DC650619FED88D8B3926E3D8E319C80C744779AC5D6AB' .
+                'E252896950917476ECE5E8FC27D5F053D6018D91B502C4787558A002B9283DA7',
+                16
+            ),
+            'e' => new BigInteger('3'),
+        ]);
+
+        $message = 'hello world!';
+        $signature = pack('H*', 'a0073057133ff3758e7e111b4d7441f1d8cbe4b2dd5ee4316a14264290dee5ed7f175716639bd9bb43a14e4f9fcb9e84dedd35e2205caac04828b2c053f68176d971ea88534dd2eeec903043c3469fc69c206b2a8694fd262488441ed8852280c3d4994e9d42bd1d575c7024095f1a20665925c2175e089c0d731471f6cc145404edf5559fd2276e45e448086f71c78d0cc6628fad394a34e51e8c10bc39bfe09ed2f5f742cc68bee899d0a41e4c75b7b80afd1c321d89ccd9fe8197c44624d91cc935dfa48de3c201099b5b417be748aef29248527e8bbb173cab76b48478d4177b338fe1f1244e64d7d23f07add560d5ad50b68d6649a49d7bc3db686daaa7');
+
+        $rsa = $rsa->withPadding(RSA::SIGNATURE_PKCS1);
+        //$rsa = $rsa->withHash('sha256');
+        $this->assertTrue($rsa->verify($message, $signature));
+    }
+
+    /**
+     * @group github1669
+     */
+    public function testOAEPWithLabel(): void
+    {
+        $publicKey = PublicKeyLoader::load('-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnkFHQbt801+kMnxn0VmMVljp8
+XdsbLEziLul3MwwckBDHwW6UDvYjN7vzJ/OM2RTxTbzilDcXJ37Zqz4qlDvXwSNm
+gIe+3dpuuRQRrJuJP6FD8zDTkRmg3QWOIIPBTzCqOtJKgWjFwMMxfCOBFEv6Ldn5
+Ac0i9ARl0/aNTWjvGwIDAQAB
+-----END PUBLIC KEY-----');
+
+        $privateKey = PublicKeyLoader::load('-----BEGIN PRIVATE KEY-----
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKeQUdBu3zTX6Qyf
+GfRWYxWWOnxd2xssTOIu6XczDByQEMfBbpQO9iM3u/Mn84zZFPFNvOKUNxcnftmr
+PiqUO9fBI2aAh77d2m65FBGsm4k/oUPzMNORGaDdBY4gg8FPMKo60kqBaMXAwzF8
+I4EUS/ot2fkBzSL0BGXT9o1NaO8bAgMBAAECgYAO2OPW8ywF86ervaFAHDN1YzVV
+db+HXdqGJB/9tuE42q8R9BrHNbgrkLGvrveOoGGRrBCzhuyGubIsuVat0SqoI6qE
+nB9uahaIBfF5FZ7+bNW5OfkgerUUYP1S1MGFxUqINnUY1YHITmo6pUKHsiJtP7si
+hnCT6uEx8LqVNf1quQJBANs+VCZVUDq6eMy3E/u03HiAB8cyqLVMVQ4cLyoiWmFl
+nEFzZwMd20ZMjtcxICiizW3dlDvyxWYKH93irL0JyM0CQQDDp/VFsh83vKICVvM9
+IZHwE/Z8vZA3eTkGbWmgnr6qaxqge3FU02kUvIHHlvLmXYIt30lTq0Rn+Lz+TGV/
+jDeHAkBHYSaSiGojhLx5og1+gKbbEIv3vbWRuTVj76cnZ6HXXfaelIzwRdMzMw+6
+XgMjV8XcRCzTy7ma/Cbd3cPxk/LtAkEAwkehMVexz/KrHI+icG1JMI9iDnNdJPhm
+O4+hdzCqOyanBfwNiSF0Encslze4ci8f+NTjRwWlo2hGomzRzFk7OQJAPPd/o0az
+kg9nF+JxLiz7hF+/6MLVZgIfw04u05ANtOSVVQP4UTmJ/tNAe3OBUQVlRQAJ1m3j
+zUlir0ACPypC1Q==
+-----END PRIVATE KEY-----');
+
+        $data = 'The quick brown fox jumps over the lazy dog';
+
+        $ciphertext = $publicKey->withLabel('whatever')->encrypt($data);
+
+        try {
+            $this->assertFalse($privateKey->decrypt($ciphertext));
+            $this->fail('Ciphertext should not have decrypted');
+        } catch (\Exception $e) {
+        }
+
+        $decrypted = $privateKey->withLabel('whatever')->decrypt($ciphertext);
+
+        $this->assertSame($data, $decrypted);
+    }
+
+    public function testSettingOnePadding(): void
+    {
+        $pub = '-----BEGIN PUBLIC KEY-----
+MF0wDQYJKoZIhvcNAQEBBQADTAAwSQJCAmdYuOvii3I6ya3q/zSeZFoJprgF9fIq
+k12yS6pCS3c+1wZ9cYFVtgfpSL4XpylLe9EnRT2GRVYCqUkR4AUeTuvnAgMBAAE=
+-----END PUBLIC KEY-----';
+
+        $rsa = PublicKeyLoader::load($pub);
+        $this->assertTrue((bool) ($rsa->getPadding() & RSA::SIGNATURE_PSS));
+        $rsa = $rsa->withPadding(RSA::ENCRYPTION_NONE);
+        $this->assertTrue((bool) ($rsa->getPadding() & RSA::SIGNATURE_PSS));
+    }
 }
diff --git a/tests/Unit/Crypt/RandomTest.php b/tests/Unit/Crypt/RandomTest.php
index d531117cd..d1fad3c9c 100644
--- a/tests/Unit/Crypt/RandomTest.php
+++ b/tests/Unit/Crypt/RandomTest.php
@@ -1,25 +1,31 @@
 <?php
+
 /**
  * @author    Andreas Fischer <bantu@phpbb.com>
  * @copyright 2014 Andreas Fischer
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\Crypt\Random;
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt;
+
+use phpseclib3\Crypt\Random;
+use phpseclib3\Tests\PhpseclibTestCase;
 
-class Unit_Crypt_RandomTest extends PhpseclibTestCase
+class RandomTest extends PhpseclibTestCase
 {
-    public function stringLengthData()
+    public static function stringLengthData(): array
     {
-        return array_map(array($this, 'wrap'), array(
+        return array_map(fn($x) => [$x], [
             1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 17, 19, 20, 23, 29, 31, 37,
             41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 111, 128, 1000,
-            1024, 10000, 12345, 100000, 123456
-        ));
+            1024, 10000, 12345, 100000, 123456,
+        ]);
     }
 
     /** @dataProvider stringLengthData */
-    public function testStringLength($length)
+    public function testStringLength($length): void
     {
         $this->assertSame(
             $length,
@@ -32,9 +38,9 @@ public function testStringLength($length)
      * Takes a set of random values of length 128 bits and asserts all taken
      * values are unique.
      */
-    public function testStringUniqueness()
+    public function testStringUniqueness(): void
     {
-        $values = array();
+        $values = [];
         for ($i = 0; $i < 10000; ++$i) {
             $rand = Random::string(16);
             $this->assertSame(16, strlen($rand));
@@ -46,10 +52,4 @@ public function testStringUniqueness()
             $values[$rand] = true;
         }
     }
-
-    protected function wrap($x)
-    {
-        // array() is not a function, but $this->wrap() is.
-        return array($x);
-    }
 }
diff --git a/tests/Unit/Crypt/Salsa20Test.php b/tests/Unit/Crypt/Salsa20Test.php
new file mode 100644
index 000000000..9de1729ff
--- /dev/null
+++ b/tests/Unit/Crypt/Salsa20Test.php
@@ -0,0 +1,164 @@
+<?php
+
+/**
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2014 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt;
+
+use phpseclib3\Crypt\Salsa20;
+use phpseclib3\Tests\PhpseclibTestCase;
+
+class Salsa20Test extends PhpseclibTestCase
+{
+    public static function engineVectors(): array
+    {
+        $engines = [
+            'PHP',
+        ];
+        // tests from http://www.ecrypt.eu.org/stream/svn/viewcvs.cgi/ecrypt/trunk/submissions/salsa20/full/verified.test-vectors?logsort=rev&rev=210&view=markup
+        // more specifically, it's vector # 0 in each set
+        $tests = [
+            // key size: 128 bits
+            // set 1
+            [
+                'key' => '80000000000000000000000000000000',
+                'iv' => '0000000000000000',
+                'result' => '4DFA5E481DA23EA09A31022050859936' .
+                            'DA52FCEE218005164F267CB65F5CFD7F' .
+                            '2B4F97E0FF16924A52DF269515110A07' .
+                            'F9E460BC65EF95DA58F740B7D1DBB0AA',
+            ],
+            // set 2
+            [
+                'key' => '00000000000000000000000000000000',
+                'iv' => '0000000000000000',
+                'result' => '6513ADAECFEB124C1CBE6BDAEF690B4F' .
+                            'FB00B0FCACE33CE806792BB414801998' .
+                            '34BFB1CFDD095802C6E95E251002989A' .
+                            'C22AE588D32AE79320D9BD7732E00338',
+            ],
+            // set 3
+            [
+                'key' => '000102030405060708090A0B0C0D0E0F',
+                'iv' => '0000000000000000',
+                'result' => '2DD5C3F7BA2B20F76802410C68868889' .
+                            '5AD8C1BD4EA6C9B140FB9B90E21049BF' .
+                            '583F527970EBC1A4C4C5AF117A5940D9' .
+                            '2B98895B1902F02BF6E9BEF8D6B4CCBE',
+            ],
+            // set 4
+            [
+                'key' => '0053A6F94C9FF24598EB3E91E4378ADD',
+                'iv' => '0000000000000000',
+                'result' => 'BE4EF3D2FAC6C4C3D822CE67436A407C' .
+                            'C237981D31A65190B51053D13A19C89F' .
+                            'C90ACB45C8684058733EDD259869C58E' .
+                            'EF760862BEFBBCA0F6E675FD1FA25C27',
+            ],
+            // set 5
+            [
+                'key' => '00000000000000000000000000000000',
+                'iv' => '8000000000000000',
+                'result' => 'B66C1E4446DD9557E578E223B0B76801' .
+                            '7B23B267BB0234AE4626BF443F219776' .
+                            '436FB19FD0E8866FCD0DE9A9538F4A09' .
+                            'CA9AC0732E30BCF98E4F13E4B9E201D9',
+            ],
+            // set 6
+            [
+                'key' => '0053A6F94C9FF24598EB3E91E4378ADD',
+                'iv' => '0D74DB42A91077DE',
+                'result' => '05E1E7BEB697D999656BF37C1B978806' .
+                            '735D0B903A6007BD329927EFBE1B0E2A' .
+                            '8137C1AE291493AA83A821755BEE0B06' .
+                            'CD14855A67E46703EBF8F3114B584CBA',
+            ],
+            // key size: 256 bits
+            // set 1
+            [
+                'key' => '8000000000000000000000000000000000000000000000000000000000000000',
+                'iv' => '0000000000000000',
+                'result' => 'E3BE8FDD8BECA2E3EA8EF9475B29A6E7' .
+                            '003951E1097A5C38D23B7A5FAD9F6844' .
+                            'B22C97559E2723C7CBBD3FE4FC8D9A07' .
+                            '44652A83E72A9C461876AF4D7EF1A117',
+            ],
+            // set 2
+            [
+                'key' => '0000000000000000000000000000000000000000000000000000000000000000',
+                'iv' => '0000000000000000',
+                'result' => '9A97F65B9B4C721B960A672145FCA8D4' .
+                            'E32E67F9111EA979CE9C4826806AEEE6' .
+                            '3DE9C0DA2BD7F91EBCB2639BF989C625' .
+                            '1B29BF38D39A9BDCE7C55F4B2AC12A39',
+            ],
+            // set 3
+            [
+                'key' => '000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F',
+                'iv' => '0000000000000000',
+                'result' => 'B580F7671C76E5F7441AF87C146D6B51' .
+                            '3910DC8B4146EF1B3211CF12AF4A4B49' .
+                            'E5C874B3EF4F85E7D7ED539FFEBA73EB' .
+                            '73E0CCA74FBD306D8AA716C7783E89AF',
+            ],
+            // set 4
+            [
+                'key' => '0053A6F94C9FF24598EB3E91E4378ADD3083D6297CCF2275C81B6EC11467BA0D',
+                'iv' => '0000000000000000',
+                'result' => 'F9D2DC274BB55AEFC2A0D9F8A982830F' .
+                            '6916122BC0A6870F991C6ED8D00D2F85' .
+                            '94E3151DE4C5A19A9A06FBC191C87BF0' .
+                            '39ADF971314BAF6D02337080F2DAE5CE',
+            ],
+            // set 5
+            [
+                'key' => '0000000000000000000000000000000000000000000000000000000000000000',
+                'iv' => '8000000000000000',
+                'result' => '2ABA3DC45B4947007B14C851CD694456' .
+                            'B303AD59A465662803006705673D6C3E' .
+                            '29F1D3510DFC0405463C03414E0E07E3' .
+                            '59F1F1816C68B2434A19D3EEE0464873',
+            ],
+            // set 6
+            [
+                'key' => '0053A6F94C9FF24598EB3E91E4378ADD3083D6297CCF2275C81B6EC11467BA0D',
+                'iv' => '0D74DB42A91077DE',
+                'result' => 'F5FAD53F79F9DF58C4AEA0D0ED9A9601' .
+                            'F278112CA7180D565B420A48019670EA' .
+                            'F24CE493A86263F677B46ACE1924773D' .
+                            '2BB25571E1AA8593758FC382B1280B71',
+            ],
+        ];
+
+        $result = [];
+
+        foreach ($engines as $engine) {
+            foreach ($tests as $test) {
+                $result[] = [$engine, $test['key'], $test['iv'], $test['result']];
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @dataProvider engineVectors
+     */
+    public function testVectors($engine, $key, $iv, $expected): void
+    {
+        $cipher = new Salsa20();
+        $cipher->setPreferredEngine($engine);
+        $cipher->setKey(pack('H*', $key));
+        $cipher->setNonce(pack('H*', $iv));
+        if ($cipher->getEngine() != $engine) {
+            self::markTestSkipped('Unable to initialize ' . $engine . ' engine for ' . (strlen($key) * 8) . '-bit key');
+        }
+        $result = $cipher->encrypt(str_repeat("\0", 64));
+        $this->assertEquals(strtoupper(bin2hex($result)), $expected, "Failed asserting that key $key / $iv yielded expected output in $engine engine");
+    }
+}
diff --git a/tests/Unit/Crypt/TripleDESTest.php b/tests/Unit/Crypt/TripleDESTest.php
index e41c43865..c748dce0a 100644
--- a/tests/Unit/Crypt/TripleDESTest.php
+++ b/tests/Unit/Crypt/TripleDESTest.php
@@ -1,98 +1,103 @@
 <?php
+
 /**
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2014 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\Crypt\Base;
-use phpseclib\Crypt\TripleDES;
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt;
 
-class Unit_Crypt_TripleDESTest extends PhpseclibTestCase
+use phpseclib3\Crypt\TripleDES;
+use phpseclib3\Tests\PhpseclibTestCase;
+
+class TripleDESTest extends PhpseclibTestCase
 {
-    var $engines = array(
-        Base::ENGINE_INTERNAL => 'internal',
-        Base::ENGINE_MCRYPT => 'mcrypt',
-        Base::ENGINE_OPENSSL => 'OpenSSL',
-    );
+    public static $engines = [
+        'PHP',
+        'Eval',
+        'OpenSSL',
+    ];
 
-    public function engineVectors()
+    public static function engineVectors(): array
     {
         // tests from http://csrc.nist.gov/publications/nistpubs/800-20/800-20.pdf#page=273
-        $tests = array(
+        $tests = [
             // Table A.1
             // key, plaintext, ciphertext
-            array(str_repeat("\x01", 24), pack('H*', '8000000000000000'), pack('H*', '95F8A5E5DD31D900')),
-            array(str_repeat("\x01", 24), pack('H*', '4000000000000000'), pack('H*', 'DD7F121CA5015619')),
-            array(str_repeat("\x01", 24), pack('H*', '2000000000000000'), pack('H*', '2E8653104F3834EA')),
-            array(str_repeat("\x01", 24), pack('H*', '1000000000000000'), pack('H*', '4BD388FF6CD81D4F')),
-            array(str_repeat("\x01", 24), pack('H*', '0800000000000000'), pack('H*', '20B9E767B2FB1456')),
-            array(str_repeat("\x01", 24), pack('H*', '0400000000000000'), pack('H*', '55579380D77138EF')),
-            array(str_repeat("\x01", 24), pack('H*', '0200000000000000'), pack('H*', '6CC5DEFAAF04512F')),
-            array(str_repeat("\x01", 24), pack('H*', '0100000000000000'), pack('H*', '0D9F279BA5D87260')),
-            array(str_repeat("\x01", 24), pack('H*', '0080000000000000'), pack('H*', 'D9031B0271BD5A0A')),
-            array(str_repeat("\x01", 24), pack('H*', '0040000000000000'), pack('H*', '424250B37C3DD951')),
-            array(str_repeat("\x01", 24), pack('H*', '0020000000000000'), pack('H*', 'B8061B7ECD9A21E5')),
-            array(str_repeat("\x01", 24), pack('H*', '0010000000000000'), pack('H*', 'F15D0F286B65BD28')),
-            array(str_repeat("\x01", 24), pack('H*', '0008000000000000'), pack('H*', 'ADD0CC8D6E5DEBA1')),
-            array(str_repeat("\x01", 24), pack('H*', '0004000000000000'), pack('H*', 'E6D5F82752AD63D1')),
-            array(str_repeat("\x01", 24), pack('H*', '0002000000000000'), pack('H*', 'ECBFE3BD3F591A5E')),
-            array(str_repeat("\x01", 24), pack('H*', '0001000000000000'), pack('H*', 'F356834379D165CD')),
-            array(str_repeat("\x01", 24), pack('H*', '0000800000000000'), pack('H*', '2B9F982F20037FA9')),
-            array(str_repeat("\x01", 24), pack('H*', '0000400000000000'), pack('H*', '889DE068A16F0BE6')),
-            array(str_repeat("\x01", 24), pack('H*', '0000200000000000'), pack('H*', 'E19E275D846A1298')),
-            array(str_repeat("\x01", 24), pack('H*', '0000100000000000'), pack('H*', '329A8ED523D71AEC')),
-            array(str_repeat("\x01", 24), pack('H*', '0000080000000000'), pack('H*', 'E7FCE22557D23C97')),
-            array(str_repeat("\x01", 24), pack('H*', '0000040000000000'), pack('H*', '12A9F5817FF2D65D')),
-            array(str_repeat("\x01", 24), pack('H*', '0000020000000000'), pack('H*', 'A484C3AD38DC9C19')),
-            array(str_repeat("\x01", 24), pack('H*', '0000010000000000'), pack('H*', 'FBE00A8A1EF8AD72')),
-            array(str_repeat("\x01", 24), pack('H*', '0000008000000000'), pack('H*', '750D079407521363')),
-            array(str_repeat("\x01", 24), pack('H*', '0000004000000000'), pack('H*', '64FEED9C724C2FAF')),
-            array(str_repeat("\x01", 24), pack('H*', '0000002000000000'), pack('H*', 'F02B263B328E2B60')),
-            array(str_repeat("\x01", 24), pack('H*', '0000001000000000'), pack('H*', '9D64555A9A10B852')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000800000000'), pack('H*', 'D106FF0BED5255D7')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000400000000'), pack('H*', 'E1652C6B138C64A5')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000200000000'), pack('H*', 'E428581186EC8F46')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000100000000'), pack('H*', 'AEB5F5EDE22D1A36')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000080000000'), pack('H*', 'E943D7568AEC0C5C')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000040000000'), pack('H*', 'DF98C8276F54B04B')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000020000000'), pack('H*', 'B160E4680F6C696F')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000010000000'), pack('H*', 'FA0752B07D9C4AB8')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000008000000'), pack('H*', 'CA3A2B036DBC8502')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000004000000'), pack('H*', '5E0905517BB59BCF')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000002000000'), pack('H*', '814EEB3B91D90726')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000001000000'), pack('H*', '4D49DB1532919C9F')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000800000'), pack('H*', '25EB5FC3F8CF0621')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000400000'), pack('H*', 'AB6A20C0620D1C6F')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000200000'), pack('H*', '79E90DBC98F92CCA')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000100000'), pack('H*', '866ECEDD8072BB0E')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000080000'), pack('H*', '8B54536F2F3E64A8')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000040000'), pack('H*', 'EA51D3975595B86B')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000020000'), pack('H*', 'CAFFC6AC4542DE31')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000010000'), pack('H*', '8DD45A2DDF90796C')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000008000'), pack('H*', '1029D55E880EC2D0')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000004000'), pack('H*', '5D86CB23639DBEA9')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000002000'), pack('H*', '1D1CA853AE7C0C5F')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000001000'), pack('H*', 'CE332329248F3228')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000000800'), pack('H*', '8405D1ABE24FB942')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000000400'), pack('H*', 'E643D78090CA4207')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000000200'), pack('H*', '48221B9937748A23')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000000100'), pack('H*', 'DD7C0BBD61FAFD54')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000000080'), pack('H*', '2FBC291A570DB5C4')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000000040'), pack('H*', 'E07C30D7E4E26E12')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000000020'), pack('H*', '0953E2258E8E90A1')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000000010'), pack('H*', '5B711BC4CEEBF2EE')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000000008'), pack('H*', 'CC083F1E6D9E85F6')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000000004'), pack('H*', 'D2FD8867D50D2DFE')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000000002'), pack('H*', '06E7EA22CE92708F')),
-            array(str_repeat("\x01", 24), pack('H*', '0000000000000001'), pack('H*', '166B40B44ABA4BD6'))
-        );
-
-        $result = array();
-
-        foreach ($this->engines as $engine => $engineName) {
+            [str_repeat("\x01", 24), pack('H*', '8000000000000000'), pack('H*', '95F8A5E5DD31D900')],
+            [str_repeat("\x01", 24), pack('H*', '4000000000000000'), pack('H*', 'DD7F121CA5015619')],
+            [str_repeat("\x01", 24), pack('H*', '2000000000000000'), pack('H*', '2E8653104F3834EA')],
+            [str_repeat("\x01", 24), pack('H*', '1000000000000000'), pack('H*', '4BD388FF6CD81D4F')],
+            [str_repeat("\x01", 24), pack('H*', '0800000000000000'), pack('H*', '20B9E767B2FB1456')],
+            [str_repeat("\x01", 24), pack('H*', '0400000000000000'), pack('H*', '55579380D77138EF')],
+            [str_repeat("\x01", 24), pack('H*', '0200000000000000'), pack('H*', '6CC5DEFAAF04512F')],
+            [str_repeat("\x01", 24), pack('H*', '0100000000000000'), pack('H*', '0D9F279BA5D87260')],
+            [str_repeat("\x01", 24), pack('H*', '0080000000000000'), pack('H*', 'D9031B0271BD5A0A')],
+            [str_repeat("\x01", 24), pack('H*', '0040000000000000'), pack('H*', '424250B37C3DD951')],
+            [str_repeat("\x01", 24), pack('H*', '0020000000000000'), pack('H*', 'B8061B7ECD9A21E5')],
+            [str_repeat("\x01", 24), pack('H*', '0010000000000000'), pack('H*', 'F15D0F286B65BD28')],
+            [str_repeat("\x01", 24), pack('H*', '0008000000000000'), pack('H*', 'ADD0CC8D6E5DEBA1')],
+            [str_repeat("\x01", 24), pack('H*', '0004000000000000'), pack('H*', 'E6D5F82752AD63D1')],
+            [str_repeat("\x01", 24), pack('H*', '0002000000000000'), pack('H*', 'ECBFE3BD3F591A5E')],
+            [str_repeat("\x01", 24), pack('H*', '0001000000000000'), pack('H*', 'F356834379D165CD')],
+            [str_repeat("\x01", 24), pack('H*', '0000800000000000'), pack('H*', '2B9F982F20037FA9')],
+            [str_repeat("\x01", 24), pack('H*', '0000400000000000'), pack('H*', '889DE068A16F0BE6')],
+            [str_repeat("\x01", 24), pack('H*', '0000200000000000'), pack('H*', 'E19E275D846A1298')],
+            [str_repeat("\x01", 24), pack('H*', '0000100000000000'), pack('H*', '329A8ED523D71AEC')],
+            [str_repeat("\x01", 24), pack('H*', '0000080000000000'), pack('H*', 'E7FCE22557D23C97')],
+            [str_repeat("\x01", 24), pack('H*', '0000040000000000'), pack('H*', '12A9F5817FF2D65D')],
+            [str_repeat("\x01", 24), pack('H*', '0000020000000000'), pack('H*', 'A484C3AD38DC9C19')],
+            [str_repeat("\x01", 24), pack('H*', '0000010000000000'), pack('H*', 'FBE00A8A1EF8AD72')],
+            [str_repeat("\x01", 24), pack('H*', '0000008000000000'), pack('H*', '750D079407521363')],
+            [str_repeat("\x01", 24), pack('H*', '0000004000000000'), pack('H*', '64FEED9C724C2FAF')],
+            [str_repeat("\x01", 24), pack('H*', '0000002000000000'), pack('H*', 'F02B263B328E2B60')],
+            [str_repeat("\x01", 24), pack('H*', '0000001000000000'), pack('H*', '9D64555A9A10B852')],
+            [str_repeat("\x01", 24), pack('H*', '0000000800000000'), pack('H*', 'D106FF0BED5255D7')],
+            [str_repeat("\x01", 24), pack('H*', '0000000400000000'), pack('H*', 'E1652C6B138C64A5')],
+            [str_repeat("\x01", 24), pack('H*', '0000000200000000'), pack('H*', 'E428581186EC8F46')],
+            [str_repeat("\x01", 24), pack('H*', '0000000100000000'), pack('H*', 'AEB5F5EDE22D1A36')],
+            [str_repeat("\x01", 24), pack('H*', '0000000080000000'), pack('H*', 'E943D7568AEC0C5C')],
+            [str_repeat("\x01", 24), pack('H*', '0000000040000000'), pack('H*', 'DF98C8276F54B04B')],
+            [str_repeat("\x01", 24), pack('H*', '0000000020000000'), pack('H*', 'B160E4680F6C696F')],
+            [str_repeat("\x01", 24), pack('H*', '0000000010000000'), pack('H*', 'FA0752B07D9C4AB8')],
+            [str_repeat("\x01", 24), pack('H*', '0000000008000000'), pack('H*', 'CA3A2B036DBC8502')],
+            [str_repeat("\x01", 24), pack('H*', '0000000004000000'), pack('H*', '5E0905517BB59BCF')],
+            [str_repeat("\x01", 24), pack('H*', '0000000002000000'), pack('H*', '814EEB3B91D90726')],
+            [str_repeat("\x01", 24), pack('H*', '0000000001000000'), pack('H*', '4D49DB1532919C9F')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000800000'), pack('H*', '25EB5FC3F8CF0621')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000400000'), pack('H*', 'AB6A20C0620D1C6F')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000200000'), pack('H*', '79E90DBC98F92CCA')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000100000'), pack('H*', '866ECEDD8072BB0E')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000080000'), pack('H*', '8B54536F2F3E64A8')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000040000'), pack('H*', 'EA51D3975595B86B')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000020000'), pack('H*', 'CAFFC6AC4542DE31')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000010000'), pack('H*', '8DD45A2DDF90796C')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000008000'), pack('H*', '1029D55E880EC2D0')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000004000'), pack('H*', '5D86CB23639DBEA9')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000002000'), pack('H*', '1D1CA853AE7C0C5F')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000001000'), pack('H*', 'CE332329248F3228')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000000800'), pack('H*', '8405D1ABE24FB942')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000000400'), pack('H*', 'E643D78090CA4207')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000000200'), pack('H*', '48221B9937748A23')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000000100'), pack('H*', 'DD7C0BBD61FAFD54')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000000080'), pack('H*', '2FBC291A570DB5C4')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000000040'), pack('H*', 'E07C30D7E4E26E12')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000000020'), pack('H*', '0953E2258E8E90A1')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000000010'), pack('H*', '5B711BC4CEEBF2EE')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000000008'), pack('H*', 'CC083F1E6D9E85F6')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000000004'), pack('H*', 'D2FD8867D50D2DFE')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000000002'), pack('H*', '06E7EA22CE92708F')],
+            [str_repeat("\x01", 24), pack('H*', '0000000000000001'), pack('H*', '166B40B44ABA4BD6')],
+        ];
+
+        $result = [];
+
+        foreach (self::$engines as $engine) {
             foreach ($tests as $test) {
-                $result[] = array($engine, $engineName, $test[0], $test[1], $test[2]);
+                $result[] = [$engine, $test[0], $test[1], $test[2]];
             }
         }
 
@@ -102,48 +107,49 @@ public function engineVectors()
     /**
      * @dataProvider engineVectors
      */
-    public function testVectors($engine, $engineName, $key, $plaintext, $expected)
+    public function testVectors($engine, $key, $plaintext, $expected): void
     {
-        $des = new TripleDES();
+        $des = new TripleDES('cbc');
         if (!$des->isValidEngine($engine)) {
-            self::markTestSkipped('Unable to initialize ' . $engineName . ' engine');
+            self::markTestSkipped("Unable to initialize $engine engine");
         }
         $des->setPreferredEngine($engine);
         $des->setKey($key);
+        $des->setIV(str_repeat("\0", $des->getBlockLength() >> 3));
         $des->disablePadding();
         $result = $des->encrypt($plaintext);
         $plaintext = bin2hex($plaintext);
-        $this->assertEquals($result, $expected, "Failed asserting that $plaintext yielded expected output in $engineName engine");
+        $this->assertEquals($result, $expected, "Failed asserting that $plaintext yielded expected output in $engine engine");
     }
 
-    public function engineIVVectors()
+    public static function engineIVVectors(): array
     {
-        $engines = array(
-            Base::ENGINE_INTERNAL => 'internal',
-            Base::ENGINE_MCRYPT => 'mcrypt',
-            Base::ENGINE_OPENSSL => 'OpenSSL',
-        );
+        $engines = [
+            'PHP',
+            'Eval',
+            'OpenSSL',
+        ];
 
         // tests from http://csrc.nist.gov/groups/STM/cavp/documents/des/DESMMT.pdf
-        $tests = array(
+        $tests = [
             // key, iv, plaintext, ciphertext
-            array(
+            [
                 pack('H*', '627f460e08104a10' . '43cd265d5840eaf1' . '313edf97df2a8a8c'),
                 pack('H*', '8e29f75ea77e5475'),
                 pack('H*', '326a494cd33fe756'),
-                pack('H*', 'b22b8d66de970692')),
-            array(
+                pack('H*', 'b22b8d66de970692'), ],
+            [
                 pack('H*', '37ae5ebf46dff2dc' . '0754b94f31cbb385' . '5e7fd36dc870bfae'),
                 pack('H*', '3d1de3cc132e3b65'),
                 pack('H*', '84401f78fe6c10876d8ea23094ea5309'),
-                pack('H*', '7b1f7c7e3b1c948ebd04a75ffba7d2f5'))
-        );
+                pack('H*', '7b1f7c7e3b1c948ebd04a75ffba7d2f5'), ],
+        ];
 
-        $result = array();
+        $result = [];
 
-        foreach ($engines as $engine => $engineName) {
+        foreach ($engines as $engine) {
             foreach ($tests as $test) {
-                $result[] = array($engine, $engineName, $test[0], $test[1], $test[2], $test[3]);
+                $result[] = [$engine, $test[0], $test[1], $test[2], $test[3]];
             }
         }
 
@@ -153,11 +159,11 @@ public function engineIVVectors()
     /**
      * @dataProvider engineIVVectors
      */
-    public function testVectorsWithIV($engine, $engineName, $key, $iv, $plaintext, $expected)
+    public function testVectorsWithIV($engine, $key, $iv, $plaintext, $expected): void
     {
-        $des = new TripleDES();
+        $des = new TripleDES('cbc');
         if (!$des->isValidEngine($engine)) {
-            self::markTestSkipped('Unable to initialize ' . $engineName . ' engine');
+            self::markTestSkipped("Unable to initialize $engine engine");
         }
         $des->setPreferredEngine($engine);
         $des->setKey($key);
@@ -165,25 +171,67 @@ public function testVectorsWithIV($engine, $engineName, $key, $iv, $plaintext, $
         $des->disablePadding();
         $result = $des->encrypt($plaintext);
         $plaintext = bin2hex($plaintext);
-        $this->assertEquals($result, $expected, "Failed asserting that $plaintext yielded expected output in $engineName engine");
+        $this->assertEquals($result, $expected, "Failed asserting that $plaintext yielded expected output in $engine engine");
     }
 
-    public function testInnerChaining()
+    public function testInnerChaining(): void
     {
         // regular CBC returns
         //           e089b6d84708c6bc80be6c2da82bd19a79ffe11f02933ac1
         $expected = 'e089b6d84708c6bc6f04c8971121603d7be2861efae0f3f5';
 
-        $des = new TripleDES(TripleDES::MODE_3CBC);
+        $des = new TripleDES('3cbc');
         $des->setKey('abcdefghijklmnopqrstuvwx');
+        $des->setIV(str_repeat("\0", $des->getBlockLength() >> 3));
 
-        foreach ($this->engines as $engine => $engineName) {
+        foreach (self::$engines as $engine) {
             $des->setPreferredEngine($engine);
             if (!$des->isValidEngine($engine)) {
-                self::markTestSkipped('Unable to initialize ' . $engineName . ' engine');
+                self::markTestSkipped("Unable to initialize $engine engine");
             }
             $result = bin2hex($des->encrypt(str_repeat('a', 16)));
-            $this->assertEquals($result, $expected, "Failed asserting inner chainin worked correctly in $engineName engine");
+            $this->assertEquals($result, $expected, "Failed asserting inner chainin worked correctly in $engine engine");
         }
     }
+
+    /**
+     * @dataProvider provideForCorrectSelfUseInLambda
+     */
+    public function testCorrectSelfUseInLambda(string $key, string $expectedCiphertext): void
+    {
+        $td = new TripleDES('ecb');
+        $td->setPreferredEngine('Eval');
+        $td->setKey(base64_decode($key));
+        $ciphertext = $td->encrypt(str_repeat('a', 32));
+        self::assertSame($expectedCiphertext, base64_encode($ciphertext));
+    }
+
+    /**
+     * @return list<array{string, string}>
+     */
+    public static function provideForCorrectSelfUseInLambda(): array
+    {
+        return [
+            ['YWFhYWFhYWFhYWFhYWFhYWFhYWG9l9gm', 'fDSmC5bbLdx8NKYLltst3Hw0pguW2y3cfDSmC5bbLdxmhqEOIeS2ig=='],
+            ['YWFhYWFhYWFhYWFhYWFhYWFhYWFhiyIR', 'pRE2q3y7s6ylETarfLuzrKURNqt8u7OspRE2q3y7s6wn4E6gffbNJw=='],
+            ['YWFhYWFhYWFhYWFhYWFhYWFhYWFKOPlL', 'lnarcjmMu+OWdqtyOYy745Z2q3I5jLvjlnarcjmMu+NYSjvKzL2Osw=='],
+            ['YWFhYWFhYWFhYWFhYWFhYWFhYWEfGesQ', 'VxvHOxYoHAJXG8c7FigcAlcbxzsWKBwCVxvHOxYoHAKu2gQBvhV4Qw=='],
+            ['YWFhYWFhYWFhYWFhYWFhYWFhYWGeCuBh', 'dQZuvUeEemp1Bm69R4R6anUGbr1HhHpqdQZuvUeEempfXEWLEcWTYQ=='],
+            ['YWFhYWFhYWFhYWFhYWFhYWFhYWHrg28q', 'vWcEQuwfYZC9ZwRC7B9hkL1nBELsH2GQvWcEQuwfYZChcIWy7Jx4AQ=='],
+            ['YWFhYWFhYWFhYWFhYWFhYWFhYWE7VTFW', '5HfiS1TkD4Lkd+JLVOQPguR34ktU5A+C5HfiS1TkD4J7OjziCG84YA=='],
+            ['YWFhYWFhYWFhYWFhYWFhYWFhYWHu6jQV', '0XOLOVBh3HXRc4s5UGHcddFzizlQYdx10XOLOVBh3HWAfZzoan7UNA=='],
+            ['YWFhYWFhYWFhYWFhYWFhYWFhYWHBQqVh', '5sXLCUFzKCTmxcsJQXMoJObFywlBcygk5sXLCUFzKCQx78hr/rq4ww=='],
+            ['YWFhYWFhYWFhYWFhYWFhYWFhYWElZYAM', 'i7hwXD3f/ziLuHBcPd//OIu4cFw93/84i7hwXD3f/zjYM/eL8sCkVQ=='],
+            ['YWFhYWFhYWFhYWFhYWFhYWFhYWGiFRwF', '2ybIPpjRyufbJsg+mNHK59smyD6Y0crn2ybIPpjRyueUX5HLPHATqQ=='],
+            ['YWFhYWFhYWFhYWFhYWFhYWFhYWFHDjMw', 'uhLr0mWFI4i6EuvSZYUjiLoS69JlhSOIuhLr0mWFI4hrCZ9vaOlmbg=='],
+            ['YWFhYWFhYWFhYWFhYWFhYWFhYWGqlkgm', '9gjxyj6xL6z2CPHKPrEvrPYI8co+sS+s9gjxyj6xL6z1Swr5acgeOw=='],
+            ['YWFhYWFhYWFhYWFhYWFhYWFhYWGFxv4E', 'wr+yhvXSmo7Cv7KG9dKajsK/sob10pqOwr+yhvXSmo5fTYtM7AM0Tg=='],
+            ['YWFhYWFhYWFhYWFhYWFhYWFhYWHIuKFR', 'Ug35w2rztYhSDfnDavO1iFIN+cNq87WIUg35w2rztYgU5XzjwaRlbw=='],
+            ['YWFhYWFhYWFhYWFhYWFhYWFhYWEvbSIB', '7lo0S11Kp6PuWjRLXUqno+5aNEtdSqej7lo0S11Kp6OX1cTbb6FyyA=='],
+            ['YWFhYWFhYWFhYWFhYWFhYWFhYWEgD5wO', 'QF1VxM0jlm5AXVXEzSOWbkBdVcTNI5ZuQF1VxM0jlm6qoYnfJo67NQ=='],
+            ['YWFhYWFhYWFhYWFhYWFhYWFhYWGBNnsp', 'ZFtpJzprc+9kW2knOmtz72RbaSc6a3PvZFtpJzprc++DKOgJXprsFQ=='],
+            ['YWFhYWFhYWFhYWFhYWFhYWFhYWGbz7Zy', '6m3d0xNg5t/qbd3TE2Dm3+pt3dMTYObf6m3d0xNg5t+ddL6I8jfWYA=='],
+            ['YWFhYWFhYWFhYWFhYWFhYWFhYWEijusc', 'R8guMW5IH1pHyC4xbkgfWkfILjFuSB9aR8guMW5IH1pDXTJwKiDKbA=='],
+        ];
+    }
 }
diff --git a/tests/Unit/Crypt/TwofishTest.php b/tests/Unit/Crypt/TwofishTest.php
index f47443e93..b3cf62df5 100644
--- a/tests/Unit/Crypt/TwofishTest.php
+++ b/tests/Unit/Crypt/TwofishTest.php
@@ -1,25 +1,31 @@
 <?php
+
 /**
  * @author    Andreas Fischer <bantu@phpbb.com>
  * @copyright MMXIII Andreas Fischer
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\Crypt\Base;
-use phpseclib\Crypt\Twofish;
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Crypt;
+
+use phpseclib3\Crypt\Twofish;
+use phpseclib3\Tests\PhpseclibTestCase;
 
-class Unit_Crypt_TwofishTest extends PhpseclibTestCase
+class TwofishTest extends PhpseclibTestCase
 {
-    public function testVectors()
+    public function testVectors(): void
     {
-        $engines = array(
-            Base::ENGINE_INTERNAL => 'internal',
-            Base::ENGINE_MCRYPT => 'mcrypt',
-            Base::ENGINE_OPENSSL => 'OpenSSL',
-        );
+        $engines = [
+            'PHP',
+            'Eval',
+            'OpenSSL',
+        ];
 
-        foreach ($engines as $engine => $name) {
-            $tf = new Twofish();
+        foreach ($engines as $engine) {
+            $tf = new Twofish('cbc');
+            $tf->setIV(str_repeat("\0", $tf->getBlockLength() >> 3));
             $tf->disablePadding();
 
             // tests from https://www.schneier.com/code/ecb_ival.txt
@@ -28,47 +34,47 @@ public function testVectors()
             $key = pack('H*', '00000000000000000000000000000000');
             $tf->setKey($key);
             if (!$tf->isValidEngine($engine)) {
-                self::markTestSkipped('Unable to initialize ' . $name . ' engine');
+                self::markTestSkipped("Unable to initialize $engine engine");
             }
 
             $plaintext = pack('H*', '00000000000000000000000000000000');
             $ciphertext = $tf->encrypt($plaintext);
             $expected = strtolower('9F589F5CF6122C32B6BFEC2F2AE8C35A');
-            $this->assertEquals(bin2hex($ciphertext), $expected, "Failed asserting that $plaintext yielded expected output in $name engine");
+            $this->assertEquals(bin2hex($ciphertext), $expected, "Failed asserting that $plaintext yielded expected output in $engine engine");
 
             $expected = bin2hex($plaintext);
             $plaintext = bin2hex($tf->decrypt($ciphertext));
-            $this->assertEquals($plaintext, $expected, "Failed asserting that $plaintext yielded expected output in $name engine");
+            $this->assertEquals($plaintext, $expected, "Failed asserting that $plaintext yielded expected output in $engine engine");
 
             // key size = 192
             $key = pack('H*', '0123456789ABCDEFFEDCBA98765432100011223344556677');
             $tf->setKey($key);
             if (!$tf->isValidEngine($engine)) {
-                self::markTestSkipped('Unable to initialize ' . $name . ' engine');
+                self::markTestSkipped("Unable to initialize $engine engine");
             }
             $plaintext = pack('H*', '00000000000000000000000000000000');
             $ciphertext = $tf->encrypt($plaintext);
             $expected = strtolower('CFD1D2E5A9BE9CDF501F13B892BD2248');
-            $this->assertEquals(bin2hex($ciphertext), $expected, "Failed asserting that $plaintext yielded expected output in $name engine");
+            $this->assertEquals(bin2hex($ciphertext), $expected, "Failed asserting that $plaintext yielded expected output in $engine engine");
 
             $expected = bin2hex($plaintext);
             $plaintext = bin2hex($tf->decrypt($ciphertext));
-            $this->assertEquals($plaintext, $expected, "Failed asserting that $plaintext yielded expected output in $name engine");
+            $this->assertEquals($plaintext, $expected, "Failed asserting that $plaintext yielded expected output in $engine engine");
 
             // key size = 256
             $key = pack('H*', '0123456789ABCDEFFEDCBA987654321000112233445566778899AABBCCDDEEFF');
             $tf->setKey($key);
             if (!$tf->isValidEngine($engine)) {
-                self::markTestSkipped('Unable to initialize ' . $name . ' engine');
+                self::markTestSkipped("Unable to initialize $engine engine");
             }
             $plaintext = pack('H*', '00000000000000000000000000000000');
             $ciphertext = $tf->encrypt($plaintext);
             $expected = strtolower('37527BE0052334B89F0CFCCAE87CFA20');
-            $this->assertEquals(bin2hex($ciphertext), $expected, "Failed asserting that $plaintext yielded expected output in $name engine");
+            $this->assertEquals(bin2hex($ciphertext), $expected, "Failed asserting that $plaintext yielded expected output in $engine engine");
 
             $expected = bin2hex($plaintext);
             $plaintext = bin2hex($tf->decrypt($ciphertext));
-            $this->assertEquals($plaintext, $expected, "Failed asserting that $plaintext yielded expected output in $name engine");
+            $this->assertEquals($plaintext, $expected, "Failed asserting that $plaintext yielded expected output in $engine engine");
         }
     }
 }
diff --git a/tests/Unit/File/ANSITest.php b/tests/Unit/File/ANSITest.php
index 373504d1e..5a541a30e 100644
--- a/tests/Unit/File/ANSITest.php
+++ b/tests/Unit/File/ANSITest.php
@@ -1,31 +1,71 @@
 <?php
+
 /**
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2014 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\File\ANSI;
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\File;
+
+use phpseclib3\File\ANSI;
+use phpseclib3\Tests\PhpseclibTestCase;
 
-class Unit_File_ANSITest extends PhpseclibTestCase
+class ANSITest extends PhpseclibTestCase
 {
-    public function testCase1()
+    public function testCase1(): void
     {
         $str = "\x1B[07m"; // turn reverse video on
-        $str.= "aaaaaaaaaaaaaaaaaa";
-        $str.= "\x1B[10D"; // move cursor left 10 lines
-        $str.= "\x1B[m"; // reset everything
-        $str.= "bbb";
+        $str .= "aaaaaaaaaaaaaaaaaa";
+        $str .= "\x1B[10D"; // move cursor left 10 lines
+        $str .= "\x1B[m"; // reset everything
+        $str .= "bbb";
 
         $ansi = new ANSI();
         $ansi->appendString($str);
 
         $expected = '<pre width="80" style="color: white; background: black">';
-        $expected.= '<span style="color: black"><span style="background: white">aaaaaaaa</span></span>';
-        $expected.= 'bbb';
-        $expected.= '<span style="color: black"><span style="background: white">aaaaaaa</span></span>';
-        $expected.= '</pre>';
+        $expected .= '<span style="color: black"><span style="background: white">aaaaaaaa</span></span>';
+        $expected .= 'bbb';
+        $expected .= '<span style="color: black"><span style="background: white">aaaaaaa</span></span>';
+        $expected .= '</pre>';
 
         $this->assertSame($ansi->getScreen(), $expected);
     }
+
+    public function testCaseJ(): void
+    {
+        $str = "\x1B[H"; // Move cursor to upper left corner
+        $str .= "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+        $str .= "\x1B[H"; // Move cursor to upper left corner
+        $str .= "\x1B[J"; // Clear screen from cursor down
+
+        $ansi = new ANSI();
+        $ansi->appendString($str);
+
+        $expected = '<pre width="80" style="color: white; background: black">';
+        $expected .= '</pre>';
+
+        $this->assertSame($ansi->getScreen(), $expected);
+    }
+
+    public function testLineOverflow(): void
+    {
+        $str = '';
+        foreach (range('a', 'y') as $char) {
+            $str .= "$char\r\n";
+        }
+        $str .= str_repeat('z', 100);
+
+        $ansi = new ANSI();
+        $ansi->appendString($str);
+
+        $screen = $ansi->getScreen();
+
+        $lines = explode("\r\n", $screen);
+        $this->assertCount(24, $lines);
+        $this->assertSame(str_repeat('z', 80), $lines[22]);
+    }
 }
diff --git a/tests/Unit/File/ASN1/mal-cert-02.der b/tests/Unit/File/ASN1/mal-cert-02.der
new file mode 100644
index 000000000..981c35577
Binary files /dev/null and b/tests/Unit/File/ASN1/mal-cert-02.der differ
diff --git a/tests/Unit/File/ASN1Test.php b/tests/Unit/File/ASN1Test.php
index c9a1ea29b..d82f39673 100644
--- a/tests/Unit/File/ASN1Test.php
+++ b/tests/Unit/File/ASN1Test.php
@@ -1,67 +1,73 @@
 <?php
+
 /**
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2014 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\File\ASN1;
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\File;
+
+use phpseclib3\File\ASN1;
+use phpseclib3\Tests\PhpseclibTestCase;
 
-class Unit_File_ASN1Test extends PhpseclibTestCase
+class ASN1Test extends PhpseclibTestCase
 {
     /**
-     * on older versions of \phpseclib\File\ASN1 this would yield a PHP Warning
+     * on older versions of \phpseclib3\File\ASN1 this would yield a PHP Warning
      * @group github275
      */
-    public function testAnyString()
+    public function testAnyString(): void
     {
-        $KDC_REP = array(
+        $KDC_REP = [
             'type' => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'pvno' => array(
+            'children' => [
+                'pvno' => [
                     'constant' => 0,
                     'optional' => true,
                     'explicit' => true,
-                    'type' => ASN1::TYPE_ANY),
-                'msg-type' => array(
+                    'type' => ASN1::TYPE_ANY, ],
+                'msg-type' => [
                     'constant' => 1,
                     'optional' => true,
                     'explicit' => true,
-                    'type' => ASN1::TYPE_ANY),
-                'padata' => array(
+                    'type' => ASN1::TYPE_ANY, ],
+                'padata' => [
                     'constant' => 2,
                     'optional' => true,
                     'explicit' => true,
-                    'type' => ASN1::TYPE_ANY),
-                'crealm' => array(
+                    'type' => ASN1::TYPE_ANY, ],
+                'crealm' => [
                     'constant' => 3,
                     'optional' => true,
                     'explicit' => true,
-                    'type' => ASN1::TYPE_ANY),
-                'cname' => array(
+                    'type' => ASN1::TYPE_ANY, ],
+                'cname' => [
                     'constant' => 4,
                     'optional' => true,
                     'explicit' => true,
-                    'type' => ASN1::TYPE_ANY),
-                'ticket' => array(
+                    'type' => ASN1::TYPE_ANY, ],
+                'ticket' => [
                     'constant' => 5,
                     'optional' => true,
                     'explicit' => true,
-                    'type' => ASN1::TYPE_ANY),
-                'enc-part' => array(
+                    'type' => ASN1::TYPE_ANY, ],
+                'enc-part' => [
                     'constant' => 6,
                     'optional' => true,
                     'explicit' => true,
-                    'type' => ASN1::TYPE_ANY)
-            )
-        );
+                    'type' => ASN1::TYPE_ANY, ],
+            ],
+        ];
 
-        $AS_REP = array(
+        $AS_REP = [
             'class'    => ASN1::CLASS_APPLICATION,
             'cast'     => 11,
             'optional' => true,
-            'explicit' => true
-        ) + $KDC_REP;
+            'explicit' => true,
+        ] + $KDC_REP;
 
         $str = 'a4IC3jCCAtqgAwIBBaEDAgELoi8wLTAroQMCAROiJAQiMCAwHqADAgEXoRcbFUNSRUFUVUlUWS5ORVR0ZXN0dXNlcqMPGw' .
                '1DUkVBVFVJVFkuTkVUpBUwE6ADAgEBoQwwChsIdGVzdHVzZXKlggFOYYIBSjCCAUagAwIBBaEPGw1DUkVBVFVJVFkuTkVU' .
@@ -75,145 +81,144 @@ public function testAnyString()
                '4P3wep6uNMLnLzXJmUaAMaopjE+MOcai/t6T9Vg4pERF5Waqwg5ibAbVGK19HuS4LiKiaY3JsyYBuNkEDwiqM7i1Ekw3V+' .
                '+zoEIxqgXjGgPdrWkzU/H6rnXiqMtiZZqUXwWY0zkCmy';
 
-        $asn1 = new ASN1();
-        $decoded = $asn1->decodeBER(base64_decode($str));
-        $result = $asn1->asn1map($decoded[0], $AS_REP);
+        $decoded = ASN1::decodeBER(base64_decode($str));
+        $result = ASN1::asn1map($decoded[0], $AS_REP);
 
-        $this->assertInternalType('array', $result);
+        $this->assertIsArray($result);
     }
 
     /**
-     * on older versions of \phpseclib\File\ASN1 this would produce a null instead of an array
+     * on older versions of \phpseclib3\File\ASN1 this would produce a null instead of an array
      * @group github275
      */
-    public function testIncorrectString()
+    public function testIncorrectString(): void
     {
-        $PA_DATA = array(
+        $PA_DATA = [
             'type' => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'padata-type' => array(
+            'children' => [
+                'padata-type' => [
                     'constant' => 1,
                     'optional' => true,
                     'explicit' => true,
-                    'type' => ASN1::TYPE_INTEGER
-                ),
-                'padata-value' => array(
+                    'type' => ASN1::TYPE_INTEGER,
+                ],
+                'padata-value' => [
                     'constant' => 2,
                     'optional' => true,
                     'explicit' => true,
-                    'type' => ASN1::TYPE_OCTET_STRING
-                )
-            )
-        );
+                    'type' => ASN1::TYPE_OCTET_STRING,
+                ],
+            ],
+        ];
 
-        $PrincipalName = array(
+        $PrincipalName = [
             'type' => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'name-type' => array(
+            'children' => [
+                'name-type' => [
                     'constant' => 0,
                     'optional' => true,
                     'explicit' => true,
-                    'type' => ASN1::TYPE_INTEGER
-                ),
-                'name-string' => array(
+                    'type' => ASN1::TYPE_INTEGER,
+                ],
+                'name-string' => [
                     'constant' => 1,
                     'optional' => true,
                     'explicit' => true,
                     'min' => 0,
                     'max' => -1,
                     'type' => ASN1::TYPE_SEQUENCE,
-                    'children' => array('type' => ASN1::TYPE_IA5_STRING) // should be \phpseclib\File\ASN1::TYPE_GENERAL_STRING
-                )
-            )
-        );
+                    'children' => ['type' => ASN1::TYPE_IA5_STRING], // should be \phpseclib3\File\ASN1::TYPE_GENERAL_STRING
+                ],
+            ],
+        ];
 
-        $Ticket = array(
+        $Ticket = [
             'class'    => ASN1::CLASS_APPLICATION,
             'cast'     => 1,
             'optional' => true,
             'explicit' => true,
             'type' => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'tkt-vno' => array(
+            'children' => [
+                'tkt-vno' => [
                     'constant' => 0,
                     'optional' => true,
                     'explicit' => true,
-                    'type' => ASN1::TYPE_INTEGER
-                ),
-                'realm' => array(
+                    'type' => ASN1::TYPE_INTEGER,
+                ],
+                'realm' => [
                     'constant' => 1,
                     'optional' => true,
                     'explicit' => true,
-                    'type' => ASN1::TYPE_ANY
-                ),
-                'sname' => array(
+                    'type' => ASN1::TYPE_ANY,
+                ],
+                'sname' => [
                     'constant' => 2,
                     'optional' => true,
                     'explicit' => true,
-                    'type' => ASN1::TYPE_ANY
-                ),
-                'enc-part' => array(
+                    'type' => ASN1::TYPE_ANY,
+                ],
+                'enc-part' => [
                     'constant' => 3,
                     'optional' => true,
                     'explicit' => true,
-                    'type' => ASN1::TYPE_ANY
-                )
-            )
-        );
+                    'type' => ASN1::TYPE_ANY,
+                ],
+            ],
+        ];
 
-        $KDC_REP = array(
+        $KDC_REP = [
             'type' => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'pvno' => array(
+            'children' => [
+                'pvno' => [
                     'constant' => 0,
                     'optional' => true,
                     'explicit' => true,
-                    'type' => ASN1::TYPE_INTEGER),
-                'msg-type' => array(
+                    'type' => ASN1::TYPE_INTEGER, ],
+                'msg-type' => [
                      'constant' => 1,
                     'optional' => true,
                     'explicit' => true,
-                    'type' => ASN1::TYPE_INTEGER),
-                'padata' => array(
+                    'type' => ASN1::TYPE_INTEGER, ],
+                'padata' => [
                     'constant' => 2,
                     'optional' => true,
                     'explicit' => true,
                     'min' => 0,
                     'max' => -1,
                     'type' => ASN1::TYPE_SEQUENCE,
-                    'children' => $PA_DATA),
-                'crealm' => array(
+                    'children' => $PA_DATA, ],
+                'crealm' => [
                     'constant' => 3,
                     'optional' => true,
                     'explicit' => true,
-                    'type' => ASN1::TYPE_OCTET_STRING),
-                'cname' => array(
+                    'type' => ASN1::TYPE_OCTET_STRING, ],
+                'cname' => [
                     'constant' => 4,
                     'optional' => true,
-                    'explicit' => true) + $PrincipalName,
+                    'explicit' => true, ] + $PrincipalName,
                     //'type' => ASN1::TYPE_ANY),
-                'ticket' => array(
+                'ticket' => [
                     'constant' => 5,
                     'optional' => true,
                     'implicit' => true,
                     'min' => 0,
                     'max' => 1,
                     'type' => ASN1::TYPE_SEQUENCE,
-                    'children' => $Ticket),
-                'enc-part' => array(
+                    'children' => $Ticket, ],
+                'enc-part' => [
                     'constant' => 6,
                     'optional' => true,
                     'explicit' => true,
-                    'type' => ASN1::TYPE_ANY)
-            )
-        );
+                    'type' => ASN1::TYPE_ANY, ],
+            ],
+        ];
 
-        $AS_REP = array(
+        $AS_REP = [
             'class'    => ASN1::CLASS_APPLICATION,
             'cast'     => 11,
             'optional' => true,
-            'explicit' => true
-        ) + $KDC_REP;
+            'explicit' => true,
+        ] + $KDC_REP;
 
         $str = 'a4IC3jCCAtqgAwIBBaEDAgELoi8wLTAroQMCAROiJAQiMCAwHqADAgEXoRcbFUNSRUFUVUlUWS5ORVR0ZXN0dXNlcqMPGw' .
                '1DUkVBVFVJVFkuTkVUpBUwE6ADAgEBoQwwChsIdGVzdHVzZXKlggFOYYIBSjCCAUagAwIBBaEPGw1DUkVBVFVJVFkuTkVU' .
@@ -227,24 +232,22 @@ public function testIncorrectString()
                '4P3wep6uNMLnLzXJmUaAMaopjE+MOcai/t6T9Vg4pERF5Waqwg5ibAbVGK19HuS4LiKiaY3JsyYBuNkEDwiqM7i1Ekw3V+' .
                '+zoEIxqgXjGgPdrWkzU/H6rnXiqMtiZZqUXwWY0zkCmy';
 
-        $asn1 = new ASN1();
-        $decoded = $asn1->decodeBER(base64_decode($str));
-        $result = $asn1->asn1map($decoded[0], $AS_REP);
+        $decoded = ASN1::decodeBER(base64_decode($str));
+        $result = ASN1::asn1map($decoded[0], $AS_REP);
 
-        $this->assertInternalType('array', $result);
+        $this->assertIsArray($result);
     }
 
     /**
      * older versions of ASN1 didn't handle indefinite length tags very well
      */
-    public function testIndefiniteLength()
+    public function testIndefiniteLength(): void
     {
-        $asn1 = new ASN1();
-        $decoded = $asn1->decodeBER(file_get_contents(dirname(__FILE__) . '/ASN1/FE.pdf.p7m'));
+        $decoded = ASN1::decodeBER(file_get_contents(dirname(__FILE__) . '/ASN1/FE.pdf.p7m'));
         $this->assertCount(5, $decoded[0]['content'][1]['content'][0]['content']); // older versions would have returned 3
     }
 
-    public function testDefiniteLength()
+    public function testDefiniteLength(): void
     {
         // the following base64-encoded string is the X.509 cert from <http://phpseclib.sourceforge.net/x509/decoder.php>
         $str = 'MIIDITCCAoqgAwIBAgIQT52W2WawmStUwpV8tBV9TTANBgkqhkiG9w0BAQUFADBM' .
@@ -264,29 +267,226 @@ public function testDefiniteLength()
                'AAOBgQAhrNWuyjSJWsKrUtKyNGadeqvu5nzVfsJcKLt0AMkQH0IT/GmKHiSgAgDp' .
                'ulvKGQSy068Bsn5fFNum21K5mvMSf3yinDtvmX3qUA12IxL/92ZzKbeVCq3Yi7Le' .
                'IOkKcGQRCMha8X2e7GmlpdWC1ycenlbN0nbVeSv3JUMcafC4+Q==';
-        $asn1 = new ASN1();
-        $decoded = $asn1->decodeBER(base64_decode($str));
+        $decoded = ASN1::decodeBER(base64_decode($str));
         $this->assertCount(3, $decoded[0]['content']);
     }
 
     /**
      * @group github477
      */
-    public function testContextSpecificNonConstructed()
+    public function testContextSpecificNonConstructed(): void
     {
-        $asn1 = new ASN1();
-        $decoded = $asn1->decodeBER(base64_decode('MBaAFJtUo7c00HsI5EPZ4bkICfkOY2Pv'));
-        $this->assertInternalType('string', $decoded[0]['content'][0]['content']);
+        $decoded = ASN1::decodeBER(base64_decode('MBaAFJtUo7c00HsI5EPZ4bkICfkOY2Pv'));
+        $this->assertIsString($decoded[0]['content'][0]['content']);
     }
 
     /**
      * @group github602
      */
-    public function testEmptyContextTag()
+    public function testEmptyContextTag(): void
     {
-        $asn1 = new ASN1();
-        $decoded = $asn1->decodeBER("\xa0\x00");
-        $this->assertInternalType('array', $decoded);
+        $decoded = ASN1::decodeBER("\xa0\x00");
+        $this->assertIsArray($decoded);
         $this->assertCount(0, $decoded[0]['content']);
     }
+
+    /**
+     * @group github1027
+     */
+    public function testInfiniteLoop(): void
+    {
+        $data = base64_decode('MD6gJQYKKwYBBAGCNxQCA6AXDBVvZmZpY2VAY2VydGRpZ2l0YWwucm+BFW9mZmljZUBjZXJ0ZGlnaXRhbC5ybw==');
+        self::assertSame(
+            'a:1:{i:0;a:5:{s:5:"start";i:0;s:12:"headerlength";i:2;s:4:"type";i:16;s:7:"content";a:2:{i:0;a:6:{s:4:"type";i:2;s:8:"constant";i:0;s:7:"content";a:2:{i:0;a:5:{s:5:"start";i:4;s:12:"headerlength";i:2;s:4:"type";i:6;s:7:"content";s:22:"1.3.6.1.4.1.311.20.2.3";s:6:"length";i:12;}i:1;a:6:{s:4:"type";i:2;s:8:"constant";i:0;s:7:"content";a:1:{i:0;a:5:{s:5:"start";i:18;s:12:"headerlength";i:2;s:4:"type";i:12;s:7:"content";s:21:"office@certdigital.ro";s:6:"length";i:23;}}s:6:"length";i:25;s:5:"start";i:16;s:12:"headerlength";i:2;}}s:6:"length";i:39;s:5:"start";i:2;s:12:"headerlength";i:2;}i:1;a:6:{s:4:"type";i:2;s:8:"constant";i:1;s:7:"content";s:21:"office@certdigital.ro";s:6:"length";i:23;s:5:"start";i:41;s:12:"headerlength";i:2;}}s:6:"length";i:64;}}',
+            serialize(ASN1::decodeBER($data))
+        );
+    }
+
+    public function testMaps(): void
+    {
+        $files = scandir(__DIR__ . '/../../../phpseclib/File/ASN1/Maps');
+        self::assertNotEmpty($files);
+        foreach ($files as $file) {
+            if ($file == '.' || $file == '..') {
+                continue;
+            }
+            self::assertTrue(defined('phpseclib3\\File\\ASN1\\Maps\\' . basename($file, '.php') . '::MAP'));
+        }
+    }
+
+    public function testApplicationTag(): void
+    {
+        $map = [
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => [
+                // technically, default implies optional, but we'll define it as being optional, none-the-less, just to
+                // reenforce that fact
+                'version'             => [
+                    // if class isn't present it's assumed to be ASN1::CLASS_UNIVERSAL or
+                    // (if constant is present) ASN1::CLASS_CONTEXT_SPECIFIC
+                    'class'    => ASN1::CLASS_APPLICATION,
+                    'cast'     => 2,
+                    'optional' => true,
+                    'explicit' => true,
+                    'default'  => 'v1',
+                    'type'     => ASN1::TYPE_INTEGER,
+                    'mapping' => ['v1', 'v2', 'v3'],
+                ],
+            ],
+        ];
+
+        $data = ['version' => 'v3'];
+
+        $str = ASN1::encodeDER($data, $map);
+
+        $decoded = ASN1::decodeBER($str);
+        $arr = ASN1::asn1map($decoded[0], $map);
+
+        $this->assertSame($data, $arr);
+    }
+
+    public function testBigApplicationTag()
+    {
+        $map = [
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => [
+                'demo' => [
+                    'constant' => 0xFFFFFFFF,
+                    'optional' => true,
+                    'explicit' => true,
+                    'default'  => 'v1',
+                    'type'     => ASN1::TYPE_INTEGER,
+                    'mapping' => ['v1', 'v2', 'v3'],
+                ],
+            ],
+        ];
+
+        $data = ['demo' => 'v3'];
+
+        $str = ASN1::encodeDER($data, $map);
+
+        $decoded = ASN1::decodeBER($str);
+        $arr = ASN1::asn1map($decoded[0], $map);
+
+        $this->assertSame($data, $arr);
+    }
+
+    /**
+     * @group github1296
+     */
+    public function testInvalidCertificate(): void
+    {
+        $data = 'a' . base64_decode('MD6gJQYKKwYBBAGCNxQCA6AXDBVvZmZpY2VAY2VydGRpZ2l0YWwucm+BFW9mZmljZUBjZXJ0ZGlnaXRhbC5ybw==');
+        self::assertSame(
+            'a:1:{i:0;a:6:{s:4:"type";i:1;s:8:"constant";i:1;s:7:"content";a:0:{}s:6:"length";i:2;s:5:"start";i:0;s:12:"headerlength";i:2;}}',
+            serialize(ASN1::decodeBER($data))
+        );
+    }
+
+    /**
+     * @group github1367
+     */
+    public function testOIDs(): void
+    {
+        // from the example in 8.19.5 in the following:
+        // https://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#page=22
+        $orig = pack('H*', '813403');
+        $new = ASN1::decodeOID($orig);
+        $this->assertSame('2.100.3', $new);
+        $this->assertSame($orig, ASN1::encodeOID($new));
+
+        // UUID OID from the following:
+        // https://healthcaresecprivacy.blogspot.com/2011/02/creating-and-using-unique-id-uuid-oid.html
+        $orig = '2.25.329800735698586629295641978511506172918';
+        $new = ASN1::encodeOID($orig);
+        $this->assertSame(pack('H*', '6983f09da7ebcfdee0c7a1a7b2c0948cc8f9d776'), $new);
+        $this->assertSame($orig, ASN1::decodeOID($new));
+    }
+
+    /**
+     * @group github1388
+     */
+    public function testExplicitImplicitDate(): void
+    {
+        $map = [
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => [
+                'notBefore' => [
+                                             'constant' => 0,
+                                             'optional' => true,
+                                             'implicit' => true,
+                                             'type' => ASN1::TYPE_GENERALIZED_TIME, ],
+                'notAfter'  => [
+                                             'constant' => 1,
+                                             'optional' => true,
+                                             'implicit' => true,
+                                             'type' => ASN1::TYPE_GENERALIZED_TIME, ],
+            ],
+        ];
+
+        $a = pack('H*', '3026a011180f32303137303432313039303535305aa111180f32303138303432313230353935395a');
+        $a = ASN1::decodeBER($a);
+        $a = ASN1::asn1map($a[0], $map);
+
+        $this->assertIsArray($a);
+    }
+
+    public function testNullGarbage(): void
+    {
+        $em = pack('H*', '3080305c0609608648016503040201054f8888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888804207509e5bda0c762d2bac7f90d758b5b2263fa01ccbc542ab5e3df163be08e6ca9');
+        $decoded = ASN1::decodeBER($em);
+        $this->assertNull($decoded);
+
+        $em = pack('H*', '3080307f0609608648016503040201057288888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888804207509e5bda0c762d2bac7f90d758b5b2263fa01ccbc542ab5e3df163be08e6ca90000');
+        $decoded = ASN1::decodeBER($em);
+        $this->assertNull($decoded);
+    }
+
+    public function testOIDGarbage(): void
+    {
+        $em = pack('H*', '3080305c065860864801650304020188888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888050004207509e5bda0c762d2bac7f90d758b5b2263fa01ccbc542ab5e3df163be08e6ca9');
+        $decoded = ASN1::decodeBER($em);
+        $this->assertNull($decoded);
+
+        $em = pack('H*', '3080307f067d608648016503040201888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888804207509e5bda0c762d2bac7f90d758b5b2263fa01ccbc542ab5e3df163be08e6ca9');
+        $decoded = ASN1::decodeBER($em);
+        $this->assertNull($decoded);
+    }
+
+    public function testConstructedMismatch(): void
+    {
+        $em = pack('H*', '1031300d0609608648016503040201050004207509e5bda0c762d2bac7f90d758b5b2263fa01ccbc542ab5e3df163be08e6ca9');
+        $decoded = ASN1::decodeBER($em);
+        $this->assertNull($decoded);
+
+        $em = pack('H*', '3031100d0609608648016503040201050004207509e5bda0c762d2bac7f90d758b5b2263fa01ccbc542ab5e3df163be08e6ca9');
+        $decoded = ASN1::decodeBER($em);
+        $this->assertNull($decoded);
+
+        $em = pack('H*', '3031300d2609608648016503040201050004207509e5bda0c762d2bac7f90d758b5b2263fa01ccbc542ab5e3df163be08e6ca9');
+        $decoded = ASN1::decodeBER($em);
+        $this->assertNull($decoded);
+
+        $em = pack('H*', '3031300d06096086480165030402012d0004207509e5bda0c762d2bac7f90d758b5b2263fa01ccbc542ab5e3df163be08e6ca9');
+        $decoded = ASN1::decodeBER($em);
+        $this->assertNull($decoded);
+    }
+
+    public function testBadTagSecondOctet(): void
+    {
+        $em = pack('H*', '3033300f1f808080060960864801650304020104207509e5bda0c762d2bac7f90d758b5b2263fa01ccbc542ab5e3df163be08e6ca9');
+        $decoded = ASN1::decodeBER($em);
+        $this->assertNull($decoded);
+    }
+
+    public function testLongOID(): void
+    {
+        $cert = file_get_contents(dirname(__FILE__) . '/ASN1/mal-cert-02.der');
+
+        $decoded = ASN1::decodeBER($cert);
+        $this->assertNull($decoded);
+
+        //$x509 = new X509();
+        //$x509->loadX509($cert);
+    }
 }
diff --git a/tests/Unit/File/X509/CRLTest.php b/tests/Unit/File/X509/CRLTest.php
new file mode 100644
index 000000000..b0d333203
--- /dev/null
+++ b/tests/Unit/File/X509/CRLTest.php
@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\File\X509;
+
+use phpseclib3\Crypt\RSA;
+use phpseclib3\File\X509;
+use phpseclib3\Tests\PhpseclibTestCase;
+
+class CRLTest extends PhpseclibTestCase
+{
+    public function testLoadCRL(): void
+    {
+        $test = file_get_contents(__DIR__ . '/crl.bin');
+
+        $x509 = new X509();
+
+        $x509->loadCRL($test);
+
+        $reason = $x509->getRevokedCertificateExtension('9048354325167497831898969642461237543', 'id-ce-cRLReasons');
+
+        $this->assertSame('unspecified', $reason);
+    }
+
+    public function testCreateCRL(): void
+    {
+        // create private key / x.509 cert for signing
+        $CAPrivKey = RSA::createKey(1024);
+        $CAPubKey = $CAPrivKey->getPublicKey();
+
+        $CASubject = new X509();
+        $CASubject->setDNProp('id-at-organizationName', 'phpseclib CA cert');
+        $CASubject->setPublicKey($CAPubKey);
+
+        $CAIssuer = new X509();
+        $CAIssuer->setPrivateKey($CAPrivKey);
+        $CAIssuer->setDN($CASubject->getDN());
+
+        $x509 = new X509();
+        $x509->makeCA();
+        $result = $x509->sign($CAIssuer, $CASubject);
+        $CA = $x509->saveX509($result);
+
+        // create CRL
+        $x509 = new X509();
+        $crl = $x509->loadCRL($x509->saveCRL($x509->signCRL($CAIssuer, new X509())));
+        $x509->revoke('zzz', '+1 year');
+        $crl = $x509->saveCRL($x509->signCRL($CAIssuer, $x509));
+
+        // validate newly created CRL
+        $x509 = new X509();
+        $x509->loadCA($CA);
+        $r = $x509->loadCRL($crl);
+        $this->assertArrayHasKey('parameters', $r['signatureAlgorithm']);
+        $this->assertTrue($x509->validateSignature());
+    }
+
+    public function testPSSSigWithPKCS1Cert(): void
+    {
+        $x509 = new X509();
+        $x509->loadCA('-----BEGIN CERTIFICATE-----
+MIICADCCAWmgAwIBAgIUH+4+TBK2Iq+xTOuixlxSuMbPXPkwDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UECgwRcGhwc2VjbGliIENBIGNlcnQwHhcNMjIwOTIzMjIyNTE3
+WhcNMjMwOTIzMjIyNTE3WjAcMRowGAYDVQQKDBFwaHBzZWNsaWIgQ0EgY2VydDCB
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxugfdcHvQmI+1yXG6gAWZIzNu9DF
+DLW425OxnYItztzAadZUBX0hmlv2r08Zc8cz0jvkgqu1fbWbKnPlm6RT2MQyTasF
+oNcsqPboVUPS/i2aT4AY0KYbD0lD+xj1+8ZnvMvUUXngOB0t2nOE+P4oksImB3hu
+LUeDOHayGYbUtTcCAwEAAaM/MD0wCwYDVR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMB
+Af8wHQYDVR0OBBYEFHMLbQFPm/meQfDSApMLorFe6reZMA0GCSqGSIb3DQEBCwUA
+A4GBACQPK28znZ0+OgOS3vLoFvulom5nHhjtQFY/eunA55ZeyaaHXP2mw0GD9r0m
+Hhx6hB0t2yoX8C2TdgaAgkLhfDbv3clqrSxFDk9PQ4fojvdUdeWn4/X6guhxON+6
+Sf6AuHojwnMy6vC++ADABcqhsHwOOqB+nbRvCc+xXg1bmxtY
+-----END CERTIFICATE-----');
+        $x509->loadCRL('-----BEGIN X509 CRL-----
+MIIBVDCBiTBCBgkqhkiG9w0BAQowNaANMAsGCWCGSAFlAwQCAaEaMBgGCSqGSIb3
+DQEBCDALBglghkgBZQMEAgGiAwIBIKMDAgEBMBwxGjAYBgNVBAoMEXBocHNlY2xp
+YiBDQSBjZXJ0Fw0yMjA5MjMyMjI1MTdaMBYwFAIDenp6Fw0yMzA5MjMyMjI1MTda
+MEIGCSqGSIb3DQEBCjA1oA0wCwYJYIZIAWUDBAIBoRowGAYJKoZIhvcNAQEIMAsG
+CWCGSAFlAwQCAaIDAgEgowMCAQEDgYEAZcN+8iKHAZiARPlx3rj1NpRoanrljSsH
+F5C4wjjz936D0o3lLgSGwfDLKOBI8wu5BVYQMnBVtpI6be+QcTjrFbsbuB9IonG9
+uY1UHwoR+HohPes2wPUOV931ds6TufSxxcGgvwdaMacBfj/AD6M2ylxtqXY4EtVc
+xbyT0osik+w=
+-----END X509 CRL-----');
+        $this->assertTrue($x509->validateSignature());
+    }
+}
diff --git a/tests/Unit/File/X509/CSRTest.php b/tests/Unit/File/X509/CSRTest.php
index 6e4b827db..a0229bcac 100644
--- a/tests/Unit/File/X509/CSRTest.php
+++ b/tests/Unit/File/X509/CSRTest.php
@@ -1,15 +1,23 @@
 <?php
+
 /**
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2014 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\File\X509;
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\File\X509;
+
+use phpseclib3\Crypt\PublicKeyLoader;
+use phpseclib3\Crypt\RSA;
+use phpseclib3\File\X509;
+use phpseclib3\Tests\PhpseclibTestCase;
 
-class Unit_File_X509_CSRTest extends PhpseclibTestCase
+class CSRTest extends PhpseclibTestCase
 {
-    public function testLoadCSR()
+    public function testLoadCSR(): void
     {
         $test = '-----BEGIN CERTIFICATE REQUEST-----
 MIIBWzCBxQIBADAeMRwwGgYDVQQKDBNwaHBzZWNsaWIgZGVtbyBjZXJ0MIGdMAsG
@@ -26,10 +34,10 @@ public function testLoadCSR()
 
         $spkac = $x509->loadCSR($test);
 
-        $this->assertInternalType('array', $spkac);
+        $this->assertIsArray($spkac);
     }
 
-    public function testCSRWithAttributes()
+    public function testCSRWithAttributes(): void
     {
         $test = '-----BEGIN NEW CERTIFICATE REQUEST-----
 MIIFGDCCAwACAQAwOjEWMBQGCgmSJomT8ixkARkWBnNlY3VyZTEgMB4GA1UEAxMX
@@ -66,10 +74,10 @@ public function testCSRWithAttributes()
 
         $csr = $x509->loadCSR($test);
 
-        $this->assertInternalType('array', $csr);
+        $this->assertIsArray($csr);
     }
 
-    public function testCSRDER()
+    public function testCSRDER(): void
     {
         $csr = 'MIICdzCCAV8CAQEwDDEKMAgGA1UEAwwBeDCCASIwDQYJKoZIhvcNAQEBBQADggEP' .
                'ADCCAQoCggEBALtcrFDD2AHe3x2bR00wPDsPH6FJLxr5uc1ybb+ldDB5xNVImC8P' .
@@ -91,6 +99,123 @@ public function testCSRDER()
 
         $csr = $x509->loadCSR($csr);
 
-        $this->assertInternalType('array', $csr);
+        $this->assertIsArray($csr);
+    }
+
+    // on PHP 7.1, with older versions of phpseclib, this would produce a "A non-numeric value encountered" warning
+    public function testNewCSR(): void
+    {
+        $x509 = new X509();
+
+        $rsa = PublicKeyLoader::load('-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQCqGKukO1De7zhZj6+H0qtjTkVxwTCpvKe4eCZ0FPqri0cb2JZfXJ/DgYSF6vUp
+wmJG8wVQZKjeGcjDOL5UlsuusFncCzWBQ7RKNUSesmQRMSGkVb1/3j+skZ6UtW+5u09lHNsj6tQ5
+1s1SPrCBkedbNf0Tp0GbMJDyR4e9T04ZZwIDAQABAoGAFijko56+qGyN8M0RVyaRAXz++xTqHBLh
+3tx4VgMtrQ+WEgCjhoTwo23KMBAuJGSYnRmoBZM3lMfTKevIkAidPExvYCdm5dYq3XToLkkLv5L2
+pIIVOFMDG+KESnAFV7l2c+cnzRMW0+b6f8mR1CJzZuxVLL6Q02fvLi55/mbSYxECQQDeAw6fiIQX
+GukBI4eMZZt4nscy2o12KyYner3VpoeE+Np2q+Z3pvAMd/aNzQ/W9WaI+NRfcxUJrmfPwIGm63il
+AkEAxCL5HQb2bQr4ByorcMWm/hEP2MZzROV73yF41hPsRC9m66KrheO9HPTJuo3/9s5p+sqGxOlF
+L0NDt4SkosjgGwJAFklyR1uZ/wPJjj611cdBcztlPdqoxssQGnh85BzCj/u3WqBpE2vjvyyvyI5k
+X6zk7S0ljKtt2jny2+00VsBerQJBAJGC1Mg5Oydo5NwD6BiROrPxGo2bpTbu/fhrT8ebHkTz2epl
+U9VQQSQzY1oZMVX8i1m5WUTLPz2yLJIBQVdXqhMCQBGoiuSoSjafUhV7i1cEGpb88h5NBYZzWXGZ
+37sJ5QsW+sJyoNde3xH8vdXhzU7eT82D6X/scw9RZz+/6rCJ4p0=
+-----END RSA PRIVATE KEY-----')
+            ->withPadding(RSA::SIGNATURE_PKCS1)
+            ->withHash('sha1');
+        $x509->setPrivateKey($rsa);
+        $x509->setDN(['cn' => 'website.com']);
+        $x509->saveCSR($x509->signCSR(), X509::FORMAT_DER);
+        self::assertSame(
+            'MIIBVTCBvwIBADAWMRQwEgYDVQQDDAt3ZWJzaXRlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqhirpDtQ3u84WY+vh9KrY05FccEwqbynuHgmdBT6q4tHG9iWX1yfw4GEher1KcJiRvMFUGSo3hnIwzi+VJbLrrBZ3As1gUO0SjVEnrJkETEhpFW9f94/rJGelLVvubtPZRzbI+rUOdbNUj6wgZHnWzX9E6dBmzCQ8keHvU9OGWcCAwEAAaAAMA0GCSqGSIb3DQEBBQUAA4GBACu5LfpfpPfZfeSKblywn/SJj6RLwwG3cPeB4ctnHpkAcjuiWSURoY40mn7FqNPfEzApLcCfB7xemapyfz6EA4l1kbTEcXb5L9Pjr1Rffa6I+0KI29ELZEmjnvAyPdf7YEKMLRax5hvpYe6ueG7u7zNZwDdMQbLHKj4UOMyMVaxk',
+            base64_encode($x509->saveCSR($x509->signCSR(), X509::FORMAT_DER))
+        );
+    }
+
+    /**
+     * @group github1675
+     */
+    public function testPKCS1CSR(): void
+    {
+        $x509 = new X509();
+        $x509->loadCSR('-----BEGIN CERTIFICATE REQUEST-----
+MIICijCCAXICAQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx
+ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJ/PFzGDOThrFNMmEFGoheGD5uOzAEBfTMLusRul
+NA6x/qYKxtsvGa6QOyNMprGuJDIXmvgF9rfXQWyvsbJyCKXFQcJFEEas5yY1XlAI
+t4dz/5ZT2oAAPvA+cAfvYzQxyyxSW4/sdLXCiHw+ixQAsLHBJ7clI7Dc6h3qYsPO
+g+BbR+5IXK9RuietJ0R4D0j+rXlYW4xA1RwvawK2pgZsTgGRrJe7Ve0gMP8BBDRI
+6wafiTS7XpjEHOvZnRVHXNNOwkvo8WmYtR68fQ84CQSp9vIQPDdmqMyGWh1PsPN/
+VxrEVu2Ag6K/JoJPJetZelbOoUjZXOVxH0vHkIGvc2Ym0IUCAwEAAaAAMA0GCSqG
+SIb3DQEBCwUAA4IBAQA2lcOk3iLmh3lvSyV8l+Sf98VSaAHJ+UkrRTdWNveKjIva
+jhPgFQkXv6zhD0Jm/EfF22whVHA4EG3bC2Gl2B4qx5uV9Dv76usTdiJHBuDCxcXj
+17ixfv7rUGTBUv28W1RiyDeJQe3ybUYy0s3erJewum6wiLDxcWyWu18lw3C7Vkjy
+fUQvcGEA9FSQ8Y0nfF9vzzcCjLtOI6xJluYL9XCk8WVEBEawA2zmHWTzzuHFHHEM
+7qncJric4bulCQ0CmNiv+IUnyoLHzaef79+q+7ohi6mYYDP9dmdlj/Yd7Ndae3wt
+2qzmm8yz+tnp3rOpfrHvQLBK5C7g/qaM2jBguSsj
+-----END CERTIFICATE REQUEST-----');
+        $this->assertTrue(boolval($x509->getPublicKey()->getPadding() & RSA::SIGNATURE_PKCS1));
+        $this->assertFalse(boolval($x509->getPublicKey()->getPadding() & RSA::SIGNATURE_PSS));
+    }
+
+    /**
+     * @group github1675
+     */
+    public function testPSSCSR(): void
+    {
+        $x509 = new X509();
+        $x509->loadCSR('-----BEGIN CERTIFICATE REQUEST-----
+MIICuTCCAXACAQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx
+ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCASAwCwYJKoZIhvcN
+AQEKA4IBDwAwggEKAoIBAQDM8Dapuz5bjff8xxmOBGxg4dZZd2/Vp6pKGvEewSHC
+HSda+SYoC44+KX4nqQanZLxTqtyOwZPmomDBOztXJk84JhcvyrXL4Vp61xrZserr
+Hivhvc8VwgaFVjFUIMZbnB2EPQiI2zN7Dc1a5Ytmz9dI/Q6LOuA698YPqWZLgeih
+CVoGBZei2F8ANeIp3I2/x0ipEWRUNliBrR2BFc5+GPaR8Y+uaFrER/D774hcFTuC
+FSmHPOhN0S+XCWPYwgU2luUoDrvW+bqC/BJRfE1BGaO5NgdQ9HKdV3zCJE1/p08b
+pX/nUhga1lEw0kr3Kb2N0AYNDXUnWiFjBNQpTmSIYzUnAgMBAAGgADA+BgkqhkiG
+9w0BAQowMaANMAsGCWCGSAFlAwQCAaEaMBgGCSqGSIb3DQEBCDALBglghkgBZQME
+AgGiBAICAN4DggEBAA2eQuuzaPVx/uUJQyyLgBbsRGRwWyAdZAQoHx9nTeDYaIiX
+Uw6Tn0OIUhg1W+H1eCLSZEaBc0PXLcpRsbf4rK+a8tpVfR1F6mI3KfRfSQALpBsq
+S64eNMpi1FpaBu4FxgA31FaXcQVDEgYNB5BK0qr+6NFDtwnOXG03kGaAMOUGT02n
+yGSdZsGMatjn2ld+Ndj3uAYlujyKlqGcAOb53bu+PswH5KXTJJquOJH84UoKraog
++3qWznvQLPSZVSEp03EViSh82fuRxa+6B/W5ur43FERi/5sakzI1kMcvYDO/pord
+12M26xz/hpPfs5yFls/NPzW3o7PSkvFJhSrGmgg=
+-----END CERTIFICATE REQUEST-----');
+        $this->assertFalse(boolval($x509->getPublicKey()->getPadding() & RSA::SIGNATURE_PKCS1));
+        $this->assertTrue(boolval($x509->getPublicKey()->getPadding() & RSA::SIGNATURE_PSS));
+    }
+
+    public function testAttributes(): void
+    {
+        $private = RSA::createKey();
+        $private = $private->withHash('sha256');
+        $private = $private->withPadding(RSA::ENCRYPTION_PKCS1 | RSA::SIGNATURE_PKCS1);
+        $subject = new X509();
+        $subject->setDNProp('id-at-commonName', 'example.com');
+        $subject->setDNProp('id-at-organizationName', 'Example Organization');
+        $subject->setDNProp('id-at-organizationalUnitName', 'IT Department');
+        $subject->setDNProp('id-at-localityName', 'City');
+        $subject->setDNProp('id-at-stateOrProvinceName', 'State');
+        $subject->setDNProp('id-at-countryName', 'US');
+        $subject->setDNProp('id-at-emailAddress', 'admin@example.com');
+        $subject->setPublicKey($private->getPublicKey()->withPadding(RSA::SIGNATURE_PKCS1));
+        $subject->setPrivateKey($private);
+
+        $subject->setAttribute('pkcs-9-at-unstructuredName', 'Some unstructured name');
+        $subject->setAttribute('pkcs-9-at-challengePassword', 'MySecretPassword');
+        $extensions = [
+            ['extnId' => 'id-ce-basicConstraints', 'critical' => true, 'extnValue' => ['cA' => false]],
+            ['extnId' => 'id-ce-keyUsage', 'critical' => true, 'extnValue' => ['digitalSignature', 'keyEncipherment']],
+            ['extnId' => 'id-ce-extKeyUsage', 'extnValue' => ['id-kp-serverAuth', 'id-kp-clientAuth']],
+        ];
+        $subject->setAttribute('pkcs-9-at-extensionRequest', $extensions);
+
+        $csr = $subject->signCSR();
+        $csrPem = $subject->saveCSR($csr);
+
+        $x509 = new X509();
+        $r = $x509->loadCSR($csrPem);
+
+        $this->assertArrayHasKey('attributes', $r['certificationRequestInfo']);
+        $this->assertCount(0, $r['certificationRequestInfo']['attributes']);
     }
 }
diff --git a/tests/Unit/File/X509/SPKACTest.php b/tests/Unit/File/X509/SPKACTest.php
index 41ff2a0d7..3b9a4fedd 100644
--- a/tests/Unit/File/X509/SPKACTest.php
+++ b/tests/Unit/File/X509/SPKACTest.php
@@ -1,16 +1,22 @@
 <?php
+
 /**
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2014 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\File\X509;
-use phpseclib\Crypt\RSA;
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\File\X509;
 
-class Unit_File_X509_SPKACTest extends PhpseclibTestCase
+use phpseclib3\Crypt\RSA;
+use phpseclib3\File\X509;
+use phpseclib3\Tests\PhpseclibTestCase;
+
+class SPKACTest extends PhpseclibTestCase
 {
-    public function testLoadSPKAC()
+    public function testLoadSPKAC(): void
     {
         $test = 'MIICQDCCASgwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQChgo9mWzQm3TSwGgpZnIc54' .
                 'TZ8gYpfAO/AI0etvyWDqnFfdNCUQsqxTdSi6/rtrJdLGBsszRGrRIc/0JqmjM+jCHGYutLeo4xwgr' .
@@ -28,11 +34,11 @@ public function testLoadSPKAC()
 
         $spkac = $x509->loadSPKAC($test);
 
-        $this->assertInternalType('array', $spkac);
+        $this->assertIsArray($spkac);
 
         $spkac = $x509->loadSPKAC('SPKAC=' . $test);
 
-        $this->assertInternalType('array', $spkac);
+        $this->assertIsArray($spkac);
 
         $this->assertTrue(
             $x509->validateSignature(),
@@ -41,33 +47,34 @@ public function testLoadSPKAC()
 
         $pubKey = $x509->getPublicKey();
 
-        $this->assertInternalType('string', "$pubKey");
+        $this->assertIsString("$pubKey");
     }
 
-    public function testSaveSPKAC()
+    public function testSaveSPKAC(): void
     {
-        $privKey = new RSA();
-        extract($privKey->createKey());
+        $privatekey = RSA::createKey(512)
+            ->withPadding(RSA::SIGNATURE_PKCS1)
+            ->withHash('sha1');
 
         $x509 = new X509();
         $x509->setPrivateKey($privatekey);
         $x509->setChallenge('...');
 
         $spkac = $x509->signSPKAC();
-        $this->assertInternalType('array', $spkac);
+        $this->assertIsArray($spkac);
 
-        $this->assertInternalType('string', $x509->saveSPKAC($spkac));
+        $this->assertIsString($x509->saveSPKAC($spkac));
 
         $x509 = new X509();
-        $x509->setPrivateKey($privKey);
+        $x509->setPrivateKey($privatekey);
 
         $spkac = $x509->signSPKAC();
-        $this->assertInternalType('array', $spkac);
+        $this->assertIsArray($spkac);
 
-        $this->assertInternalType('string', $x509->saveSPKAC($spkac));
+        $this->assertIsString($x509->saveSPKAC($spkac));
     }
 
-    public function testBadSignatureSPKAC()
+    public function testBadSignatureSPKAC(): void
     {
         $test = 'MIICQDCCASgwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQChgo9mWzQm3TSwGgpZnIc54' .
                 'TZ8gYpfAO/AI0etvyWDqnFfdNCUQsqxTdSi6/rtrJdLGBsszRGrRIc/0JqmjM+jCHGYutLeo4xwgr' .
diff --git a/tests/Unit/File/X509/X509ExtensionTest.php b/tests/Unit/File/X509/X509ExtensionTest.php
new file mode 100644
index 000000000..373d284ae
--- /dev/null
+++ b/tests/Unit/File/X509/X509ExtensionTest.php
@@ -0,0 +1,157 @@
+<?php
+
+/**
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2014 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\File\X509;
+
+use phpseclib3\Crypt\EC;
+use phpseclib3\Crypt\RSA;
+use phpseclib3\File\ASN1;
+use phpseclib3\File\X509;
+use phpseclib3\Tests\PhpseclibTestCase;
+
+class X509ExtensionTest extends PhpseclibTestCase
+{
+    public function testCustomExtension(): void
+    {
+        $customExtensionData = [
+            'toggle' => true,
+            'num' => 3,
+            'name' => 'Johnny',
+            'list' => ['foo', 'bar'],
+        ];
+        $customExtensionName = 'cust';
+        $customExtensionNumber = '2.16.840.1.101.3.4.2.99';
+        $customExtensionMapping = [
+            'type' => ASN1::TYPE_SEQUENCE,
+            'children' => [
+                'toggle' => ['type' => ASN1::TYPE_BOOLEAN],
+                'num' => ['type' => ASN1::TYPE_INTEGER],
+                'name' => ['type' => ASN1::TYPE_OCTET_STRING],
+                'list' => [
+                    'type' => ASN1::TYPE_SEQUENCE,
+                    'min' => 0,
+                    'max' => -1,
+                    'children' => ['type' => ASN1::TYPE_OCTET_STRING],
+                ],
+            ],
+        ];
+
+        ASN1::loadOIDs([
+            $customExtensionName => $customExtensionNumber,
+        ]);
+
+        X509::registerExtension($customExtensionName, $customExtensionMapping);
+
+        $privateKey = RSA::createKey();
+
+        $publicKey = $privateKey->getPublicKey();
+
+        $subject = new X509();
+        $subject->setDNProp('id-at-organizationName', 'phpseclib CA cert');
+        $subject->setPublicKey($publicKey);
+
+        $issuer = new X509();
+        $issuer->setPrivateKey($privateKey);
+        $issuer->setDN($subject->getDN());
+
+        $x509 = new X509();
+        $x509->setExtensionValue($customExtensionName, $customExtensionData);
+        $x509->makeCA();
+
+        $result = $x509->sign($issuer, $subject);
+
+        $certificate = $x509->saveX509($result);
+
+        $x509 = new X509();
+
+        $decodedData = $x509->loadX509($certificate);
+        $customExtensionDecodedData = null;
+
+        foreach ($decodedData['tbsCertificate']['extensions'] as $extension) {
+            if ($extension['extnId'] === $customExtensionName) {
+                $customExtensionDecodedData = $extension['extnValue'];
+
+                break;
+            }
+        }
+
+        $this->assertTrue($customExtensionDecodedData['toggle']);
+        $this->assertInstanceOf('phpseclib3\Math\BigInteger', $customExtensionDecodedData['num']);
+        $this->assertSame('3', (string) $customExtensionDecodedData['num']);
+        $this->assertSame('Johnny', $customExtensionDecodedData['name']);
+        $this->assertSame(['foo', 'bar'], $customExtensionDecodedData['list']);
+        $this->assertSame($customExtensionMapping, X509::getRegisteredExtension($customExtensionName));
+    }
+
+    public function testCustomExtensionRegisterTwiceTheSame(): void
+    {
+        $customExtensionMapping = [
+            'type' => ASN1::TYPE_SEQUENCE,
+            'children' => [
+                'toggle' => ['type' => ASN1::TYPE_BOOLEAN],
+                'num' => ['type' => ASN1::TYPE_INTEGER],
+                'name' => ['type' => ASN1::TYPE_OCTET_STRING],
+                'list' => [
+                    'type' => ASN1::TYPE_SEQUENCE,
+                    'min' => 0,
+                    'max' => -1,
+                    'children' => ['type' => ASN1::TYPE_OCTET_STRING],
+                ],
+            ],
+        ];
+
+        X509::registerExtension('foo', $customExtensionMapping);
+        X509::registerExtension('foo', $customExtensionMapping);
+
+        $this->assertSame($customExtensionMapping, X509::getRegisteredExtension('foo'));
+    }
+
+    public function testCustomExtensionRegisterConflict(): void
+    {
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('Extension bar has already been defined with a different mapping.');
+
+        X509::registerExtension('bar', ['type' => ASN1::TYPE_OCTET_STRING]);
+        X509::registerExtension('bar', ['type' => ASN1::TYPE_ANY]);
+    }
+
+    public function testExtensionsAreInitializedIfMissing(): void
+    {
+        $issuerKey = EC::createKey('ed25519');
+        $subjectKey = EC::createKey('ed25519')->getPublicKey();
+
+        $subject = new X509();
+        $subject->setPublicKey($subjectKey);
+        $subject->setDN(['commonName' => 'subject']);
+
+        $issuer = new X509();
+        $issuer->setPrivateKey($issuerKey);
+        $issuer->setDN(['commonName' => 'issuer']);
+
+        $authority = new X509();
+
+        $authority->setExtensionValue('id-ce-keyUsage', ['digitalSignature']);
+
+        $cert = $authority->saveX509($authority->sign($issuer, $subject));
+
+        $loader = new X509();
+
+        $this->assertSame(
+            [
+                [
+                    'extnId' => 'id-ce-keyUsage',
+                    'critical' => false,
+                    'extnValue' => ['digitalSignature'],
+                ],
+            ],
+            $loader->loadX509($cert)['tbsCertificate']['extensions']
+        );
+    }
+}
diff --git a/tests/Unit/File/X509/X509Test.php b/tests/Unit/File/X509/X509Test.php
index c172b05ab..a4e8406f0 100644
--- a/tests/Unit/File/X509/X509Test.php
+++ b/tests/Unit/File/X509/X509Test.php
@@ -1,18 +1,25 @@
 <?php
+
 /**
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2014 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\File\ASN1;
-use phpseclib\File\ASN1\Element;
-use phpseclib\File\X509;
-use phpseclib\Crypt\RSA;
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\File\X509;
+
+use phpseclib3\Crypt\PublicKeyLoader;
+use phpseclib3\Crypt\RSA;
+use phpseclib3\File\ASN1;
+use phpseclib3\File\ASN1\Element;
+use phpseclib3\File\X509;
+use phpseclib3\Tests\PhpseclibTestCase;
 
-class Unit_File_X509_X509Test extends PhpseclibTestCase
+class X509Test extends PhpseclibTestCase
 {
-    public function testExtensionMapping()
+    public function testExtensionMapping(): void
     {
         $test = '-----BEGIN CERTIFICATE-----
 MIIG1jCCBL6gAwIBAgITUAAAAA0qg8bE6DhrLAAAAAAADTANBgkqhkiG9w0BAQsF
@@ -58,10 +65,10 @@ public function testExtensionMapping()
 
         $cert = $x509->loadX509($test);
 
-        $this->assertInternalType('array', $cert['tbsCertificate']['extensions'][3]['extnValue']);
+        $this->assertIsArray($cert['tbsCertificate']['extensions'][3]['extnValue']);
     }
 
-    public function testLoadUnsupportedExtension()
+    public function testLoadUnsupportedExtension(): void
     {
         $test = '-----BEGIN CERTIFICATE-----
 MIIG1jCCBL6gAwIBAgITUAAAAA0qg8bE6DhrLAAAAAAADTANBgkqhkiG9w0BAQsF
@@ -107,10 +114,10 @@ public function testLoadUnsupportedExtension()
 
         $cert = $x509->loadX509($test);
 
-        $this->assertEquals('MDUwDgYIKoZIhvcNAwICAgCAMA4GCCqGSIb3DQMEAgIAgDAHBgUrDgMCBzAKBggqhkiG9w0DBw==', $cert['tbsCertificate']['extensions'][8]['extnValue']);
+        $this->assertEquals(base64_decode('MDUwDgYIKoZIhvcNAwICAgCAMA4GCCqGSIb3DQMEAgIAgDAHBgUrDgMCBzAKBggqhkiG9w0DBw=='), $cert['tbsCertificate']['extensions'][8]['extnValue']);
     }
 
-    public function testSaveUnsupportedExtension()
+    public function testSaveUnsupportedExtension(): void
     {
         $x509 = new X509();
         $cert = $x509->loadX509('-----BEGIN CERTIFICATE-----
@@ -133,13 +140,11 @@ public function testSaveUnsupportedExtension()
 IOkKcGQRCMha8X2e7GmlpdWC1ycenlbN0nbVeSv3JUMcafC4+Q==
 -----END CERTIFICATE-----');
 
-        $asn1 = new ASN1();
-
-        $value = $this->_encodeOID('1.2.3.4');
-        $ext = chr(ASN1::TYPE_OBJECT_IDENTIFIER) . $asn1->_encodeLength(strlen($value)) . $value;
+        $value = ASN1::encodeOID('1.2.3.4');
+        $ext = chr(ASN1::TYPE_OBJECT_IDENTIFIER) . ASN1::encodeLength(strlen($value)) . $value;
         $value = 'zzzzzzzzz';
-        $ext.= chr(ASN1::TYPE_OCTET_STRING) . $asn1->_encodeLength(strlen($value)) . $value;
-        $ext = chr(ASN1::TYPE_SEQUENCE | 0x20) . $asn1->_encodeLength(strlen($ext)) . $ext;
+        $ext .= chr(ASN1::TYPE_OCTET_STRING) . ASN1::encodeLength(strlen($value)) . $value;
+        $ext = chr(ASN1::TYPE_SEQUENCE | 0x20) . ASN1::encodeLength(strlen($ext)) . $ext;
 
         $cert['tbsCertificate']['extensions'][4] = new Element($ext);
 
@@ -151,10 +156,9 @@ public function testSaveUnsupportedExtension()
     /**
      * @group github705
      */
-    public function testSaveNullRSAParam()
+    public function testSaveNullRSAParam(): void
     {
-        $privKey = new RSA();
-        $privKey->load('-----BEGIN RSA PRIVATE KEY-----
+        $privKey = PublicKeyLoader::load('-----BEGIN RSA PRIVATE KEY-----
 MIICXQIBAAKBgQDMswfEpAgnUDWA74zZw5XcPsWh1ly1Vk99tsqwoFDkLF7jvXy1
 dDLHYfuquvfxCgcp8k/4fQhx4ubR8bbGgEq9B05YRnViK0R0iBB5Ui4IaxWYYhKE
 8xqAEH2fL+/7nsqqNFKkEN9KeFwc7WbMY49U2adlMrpBdRjk1DqIEW3QTwIDAQAB
@@ -169,10 +173,11 @@ public function testSaveNullRSAParam()
 aBtsWpliLSex/HHhtRW9AkBGcq67zKmEpJ9kXcYLEjJii3flFS+Ct/rNm+Hhm1l7
 4vca9v/F2hGVJuHIMJ8mguwYlNYzh2NqoIDJTtgOkBmt
 -----END RSA PRIVATE KEY-----');
+        $privKey = $privKey
+            ->withPadding(RSA::SIGNATURE_PKCS1)
+            ->withHash('sha1');
 
-        $pubKey = new RSA();
-        $pubKey->load($privKey->getPublicKey());
-        $pubKey->setPublicKey();
+        $pubKey = $privKey->getPublicKey();
 
         $subject = new X509();
         $subject->setDNProp('id-at-organizationName', 'phpseclib demo cert');
@@ -183,6 +188,7 @@ public function testSaveNullRSAParam()
         $issuer->setDN($subject->getDN());
 
         $x509 = new X509();
+        $x509->setEndDate('lifetime');
 
         $result = $x509->sign($issuer, $subject);
         $cert = $x509->saveX509($result);
@@ -193,36 +199,1285 @@ public function testSaveNullRSAParam()
         $this->assertArrayHasKey('parameters', $cert['tbsCertificate']['signature']);
     }
 
-    private function _encodeOID($oid)
-    {
-        if ($oid === false) {
-            user_error('Invalid OID');
-            return false;
-        }
-        $value = '';
-        $parts = explode('.', $oid);
-        $value = chr(40 * $parts[0] + $parts[1]);
-        for ($i = 2; $i < count($parts); $i++) {
-            $temp = '';
-            if (!$parts[$i]) {
-                $temp = "\0";
-            } else {
-                while ($parts[$i]) {
-                    $temp = chr(0x80 | ($parts[$i] & 0x7F)) . $temp;
-                    $parts[$i] >>= 7;
-                }
-                $temp[strlen($temp) - 1] = $temp[strlen($temp) - 1] & chr(0x7F);
-            }
-            $value.= $temp;
-        }
-        return $value;
-    }
-
-    public function testGetOID()
-    {
-        $x509 = new X509();
-        $this->assertEquals($x509->getOID('2.16.840.1.101.3.4.2.1'), '2.16.840.1.101.3.4.2.1');
-        $this->assertEquals($x509->getOID('id-sha256'), '2.16.840.1.101.3.4.2.1');
-        $this->assertEquals($x509->getOID('zzz'), 'zzz');
+    public function testGetOID(): void
+    {
+        // load the OIDs
+        new X509();
+        $this->assertEquals(ASN1::getOID('1.2.840.113549.1.1.5'), '1.2.840.113549.1.1.5');
+        $this->assertEquals(ASN1::getOID('sha1WithRSAEncryption'), '1.2.840.113549.1.1.5');
+        $this->assertEquals(ASN1::getOID('zzz'), 'zzz');
+    }
+
+    public function testIPAddressSubjectAltNamesDecoding(): void
+    {
+        $test = '-----BEGIN CERTIFICATE-----
+MIIEcTCCAlmgAwIBAgIBDjANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBQuU2Vj
+dXJlIElzc3VpbmcgQ0EgMTAeFw0xNjAxMjUyMzIwMjZaFw0yMTAxMjYyMzIwMjZa
+MBoxGDAWBgNVBAMMDzIwNC4xNTIuMjAwLjI1MDCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAM9lMPiYQ26L5qXR1rlUXM0Z3DeRhDsJ/9NadLFJnvxKCV5L
+M9rlrThpK6V5VbgPgEwKVLXGtJoGSEUkLd4roJ25ZTH08GcYszWyp8nLPQRovYnN
++aeE1aefnHcpt524f0Es9NFXh0uwRWV3ZCWSwN+mo9Qo6507KZq+q34if7/q9+De
+O5RJumVQWc9OCjCt6pQBnBua9oCAca+SIHftOdgWXqVw+Xvl6/dLeF70jJD43P00
++bdAnGDgBdgO+p+K+XrOCaCWMcCsRX5xiK4hUG54UM5ayBST+McyfjsKxpO2djPg
+FlSL0RLg+Nj8WehANUUuaNU874Pp3FV5GTI0ZbUCAwEAAaOBvDCBuTAMBgNVHRMB
+Af8EAjAAMAsGA1UdDwQEAwIF4DATBgNVHSUEDDAKBggrBgEFBQcDATAhBgNVHREE
+GjAYhwTMmMj6hxAgAQRw8wkACQAAAAAAAAADMEMGA1UdHwQ8MDowOKA2oDSGMmh0
+dHA6Ly9jcmwuc2VjdXJlb2JzY3VyZS5jb20vP2FjdGlvbj1jcmwmY2E9aXNzdWUx
+MB8GA1UdIwQYMBaAFOJWVCX4poZSBzemgihf9dAhFNHJMA0GCSqGSIb3DQEBCwUA
+A4ICAQAce9whx4InRtzk1to6oeRxTCbeNDjNFuTkotphSws4hDoaz3nyFLSYyMT4
+aKFnNP9AmMS5nEXphtP4HP9wAluTcAFMuip0rDJjiRA/khIE27KurO6cg1faFWHl
+6lh6xnEf9UFZZzTLsXt2miBiMb8olgPrBuVFWjPZ/ConesJRZRFqMd5mfntXC+2V
+zRcXdtwp9h/Am/WuvjsG/gBAPdeRNKffCokIcgfvffd2oklSDD0T9baG2MTgaxnX
+oG6e5saWjoN8bLWuCJpvjA7aErXQwXUyXx1nrTWQ1TCR2N+M62X7e07jZLKSAECP
+v6SqZ9/LDmCacVQbfg4wDC/gbpjDSKaD5fkusH6leXleWQ7X8Z03LsKvVq43a71z
+jO61kkiFAh3CegWsY+TSYjZxDq58xGMiE7y/fK+SHQXDLyY7HU4eky2l3DSy8bXQ
+p64vTJ/OmAcXVNUASfBCNw0kpxuFjlxers/+6zheowB1RIKo0xvSRC4cEDRl/jFA
+b7WUT/MIe6B1r0v1gxHnFG2bFI/MhTT9V+tICOLo7+69z4jf/OFkzjYvqq2QWPgc
+sE3f2TNnmKFRJx67bEMoaaWLIR94Yuq/TWB6dTiWwk9meZkGG3OjQg/YbO6vl/Am
+NDEuGt30Vl2de7G1glnhaceB6Q9KfH7p2gAwNP9JMTtx3PtEcA==
+-----END CERTIFICATE-----';
+
+        $x509 = new X509();
+        $cert = $x509->loadX509($test);
+        $this->assertEquals($cert['tbsCertificate']['extensions'][3]['extnValue'][0]['iPAddress'], '204.152.200.250');
+        $this->assertEquals($cert['tbsCertificate']['extensions'][3]['extnValue'][1]['iPAddress'], '2001:470:f309:9::3');
+    }
+
+    public function testPostalAddress(): void
+    {
+        $x509 = new X509();
+        $decoded = $x509->loadX509('-----BEGIN CERTIFICATE-----
+MIIFzzCCBLegAwIBAgIDAfdlMA0GCSqGSIb3DQEBBQUAMHMxCzAJBgNVBAYTAlBM
+MSgwJgYDVQQKDB9LcmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMSQwIgYD
+VQQDDBtDT1BFIFNaQUZJUiAtIEt3YWxpZmlrb3dhbnkxFDASBgNVBAUTC05yIHdw
+aXN1OiA2MB4XDTExMTEwOTA2MDAwMFoXDTEzMTEwOTA2MDAwMFowgdkxCzAJBgNV
+BAYTAlBMMRwwGgYDVQQKDBNVcnrEhWQgTWlhc3RhIEdkeW5pMRswGQYDVQQFExJQ
+RVNFTDogNjEwNjA2MDMxMTgxGTAXBgNVBAMMEEplcnp5IFByemV3b3Jza2kxTzBN
+BgNVBBAwRgwiQWwuIE1hcnN6YcWCa2EgUGnFgnN1ZHNraWVnbyA1Mi81NAwNODEt
+MzgyIEdkeW5pYQwGUG9sc2thDAlwb21vcnNraWUxDjAMBgNVBCoMBUplcnp5MRMw
+EQYDVQQEDApQcnpld29yc2tpMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCM
+m5vjGqHPthJCMqKpqssSISRos0PYDTcEQzyyurfX67EJWKtZj6HNwuDMEGJ02iBN
+ZfjUl7r8dIi28bSKhNlsfycXZKYRcIjp0+r5RqtR2auo9GQ6veKb61DEAGIqaR+u
+LLcJVTHCu0w9oXLGbRlGth5eNoj03CxXVAH2IfhbNwIDAQABo4IChzCCAoMwDAYD
+VR0TAQH/BAIwADCCAUgGA1UdIAEB/wSCATwwggE4MIIBNAYJKoRoAYb3IwEBMIIB
+JTCB3QYIKwYBBQUHAgIwgdAMgc1EZWtsYXJhY2phIHRhIGplc3Qgb8Wbd2lhZGN6
+ZW5pZW0gd3lkYXdjeSwgxbxlIHRlbiBjZXJ0eWZpa2F0IHpvc3RhxYIgd3lkYW55
+IGpha28gY2VydHlmaWthdCBrd2FsaWZpa293YW55IHpnb2RuaWUgeiB3eW1hZ2Fu
+aWFtaSB1c3Rhd3kgbyBwb2RwaXNpZSBlbGVrdHJvbmljem55bSBvcmF6IHRvd2Fy
+enlzesSFY3ltaSBqZWogcm96cG9yesSFZHplbmlhbWkuMEMGCCsGAQUFBwIBFjdo
+dHRwOi8vd3d3Lmtpci5jb20ucGwvY2VydHlmaWthY2phX2tsdWN6eS9wb2xpdHlr
+YS5odG1sMAkGA1UdCQQCMAAwIQYDVR0RBBowGIEWai5wcnpld29yc2tpQGdkeW5p
+YS5wbDAOBgNVHQ8BAf8EBAMCBkAwgZ4GA1UdIwSBljCBk4AU3TGldJXipN4oGS3Z
+YmnBDMFs8gKhd6R1MHMxCzAJBgNVBAYTAlBMMSgwJgYDVQQKDB9LcmFqb3dhIEl6
+YmEgUm96bGljemVuaW93YSBTLkEuMSQwIgYDVQQDDBtDT1BFIFNaQUZJUiAtIEt3
+YWxpZmlrb3dhbnkxFDASBgNVBAUTC05yIHdwaXN1OiA2ggJb9jBIBgNVHR8EQTA/
+MD2gO6A5hjdodHRwOi8vd3d3Lmtpci5jb20ucGwvY2VydHlmaWthY2phX2tsdWN6
+eS9DUkxfT1pLMzIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQBYPIqnAreyeql7/opJ
+jcar/qWZy9ruhB2q0lZFsJOhwgMnbQXzp/4vv93YJqcHGAXdHP6EO8FQX47mjo2Z
+KQmi+cIHJHLONdX/3Im+M17V0iNAh7Z1lOSfTRT+iiwe/F8phcEaD5q2RmvYusR7
+zXZq/cLL0If0hXoPZ/EHQxjN8pxzxiUx6bJAgturnIMEfRNesxwghdr1dkUjOhGL
+f3kHVzgM6j3VAM7oFmMUb5y5s96Bzl10DodWitjOEH0vvnIcsppSxH1C1dCAi0o9
+f/1y2XuLNhBNHMAyTqpYPX8Yvav1c+Z50OMaSXHAnTa20zv8UtiHbaAhwlifCelU
+Mj93
+-----END CERTIFICATE-----');
+        $x509->loadX509($x509->saveX509($decoded));
+        $expected = [
+            [
+                ['utf8String' => "Al. Marsza\xC5\x82ka Pi\xC5\x82sudskiego 52/54"],
+                ['utf8String' => '81-382 Gdynia'],
+                ['utf8String' => 'Polska'],
+                ['utf8String' => 'pomorskie'],
+            ],
+        ];
+        $this->assertEquals($x509->getDNProp('id-at-postalAddress'), $expected);
+
+        $expected = "C=PL, O=Urz\xC4\x85d Miasta Gdyni/serialNumber=PESEL: 61060603118, CN=Jerzy Przeworski/postalAddress=" . '0F\X0C"AL. MARSZA\XC5\X82KA PI\XC5\X82SUDSKIEGO 52/54\X0C\X0D81-382 GDYNIA\X0C\X06POLSKA\X0C\X09POMORSKIE/givenName=Jerzy, SN=Przeworski';
+        $this->assertEquals($x509->getDN(X509::DN_STRING), $expected);
+    }
+
+    public function testStrictComparison(): void
+    {
+        $x509 = new X509();
+        $x509->loadCA('-----BEGIN CERTIFICATE-----
+MIIEbDCCA1SgAwIBAgIUJguKOMpJm/yRMDlMOW04NV0YPXowDQYJKoZIhvcNAQEF
+BQAwYTELMAkGA1UEBhMCUEwxNzA1BgNVBAoTLkNaaUMgQ2VudHJhc3QgU0EgdyBp
+bWllbml1IE1pbmlzdHJhIEdvc3BvZGFya2kxGTAXBgNVBAMTEENaaUMgQ2VudHJh
+c3QgU0EwHhcNMDkwNDI5MTE1MzIxWhcNMTMxMjEzMjM1OTU5WjBzMQswCQYDVQQG
+EwJQTDEoMCYGA1UEChMfS3Jham93YSBJemJhIFJvemxpY3plbmlvd2EgUy5BLjEk
+MCIGA1UEAxMbQ09QRSBTWkFGSVIgLSBLd2FsaWZpa293YW55MRQwEgYDVQQFEwtO
+ciB3cGlzdTogNjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIjNy3EL
+oK0uKTqAJokiP8VIxER/0OfwhY4DBhJGW38W6Pfema8iUs4net0NgoIeDpMQ8IHj
+FDSKkSaRkyL5f7PgvqBwzKe0HD1Duf9G/Lr2lu/J4QUMF3rqKaMRipXKkkEoKrub
+Qe41/mPiPXeClNswNQUEyInqWpfWNncU8AIs2GKIFTfSNqK4PgWOY1kG9MYfoNVr
+74dhejv7yHexEw9eAIcM1fIkEEq0vWIOjRtBXBAuWtUyD8iSeBs4nIN+614pHIjv
+ncHxG7xTDbmOAVZFgGZ8Hk5CUseAtTpazQNdU66XRUuCj4km01L4wsfZ1X8tfYQA
+6msMRYj+F7hLtoECAwEAAaOCAQgwggEEMA8GA1UdEwEB/wQFMAMBAf8wgY4GA1Ud
+IwSBhjCBg4AU2a7r85Cp1iJNW0Ca1LR6VG3996ShZaRjMGExCzAJBgNVBAYTAlBM
+MTcwNQYDVQQKEy5DWmlDIENlbnRyYXN0IFNBIHcgaW1pZW5pdSBNaW5pc3RyYSBH
+b3Nwb2RhcmtpMRkwFwYDVQQDExBDWmlDIENlbnRyYXN0IFNBggQ9/0sQMDEGA1Ud
+IAEB/wQnMCUwIwYEVR0gADAbMBkGCCsGAQUFBwIBFg13d3cubmNjZXJ0LnBsMA4G
+A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU3TGldJXipN4oGS3ZYmnBDMFs8gIwDQYJ
+KoZIhvcNAQEFBQADggEBAJrkn3XycfimT5C6D+lYvQNB4/X44KZRhxhnplMOdr/V
+3O13oJA/G2SkVaRZS1Rqy01vC9H3YSFfYnjFXJTOXldzodwszHEcGLHF/3JazHI9
+BTpP1F4oFyd0Un/wkp1usGU4e1riU5RAlSp8YcMX3q+nOqyCh0JsxnP7LjauHkE3
+KZ1RuBDZYbsYOwkAKjHax8srKugdWtq4sMNcqpxGFUah/4uLQn6hD4jeRpP4VGDv
+HZDmxaIoJdmCxfn9XeIS5PcZR+mHHkUOIhYLnfdUp/T3Yxxo+XrrTckC6AjtsL5/
+OA0vBLngVqqeuzVf0tUhcrCwPKQo5rKoakbApeXrows=
+-----END CERTIFICATE-----');
+
+        $x509->loadX509('-----BEGIN CERTIFICATE-----
+MIIFzzCCBLegAwIBAgIDAfdlMA0GCSqGSIb3DQEBBQUAMHMxCzAJBgNVBAYTAlBM
+MSgwJgYDVQQKDB9LcmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMSQwIgYD
+VQQDDBtDT1BFIFNaQUZJUiAtIEt3YWxpZmlrb3dhbnkxFDASBgNVBAUTC05yIHdw
+aXN1OiA2MB4XDTExMTEwOTA2MDAwMFoXDTEzMTEwOTA2MDAwMFowgdkxCzAJBgNV
+BAYTAlBMMRwwGgYDVQQKDBNVcnrEhWQgTWlhc3RhIEdkeW5pMRswGQYDVQQFExJQ
+RVNFTDogNjEwNjA2MDMxMTgxGTAXBgNVBAMMEEplcnp5IFByemV3b3Jza2kxTzBN
+BgNVBBAwRgwiQWwuIE1hcnN6YcWCa2EgUGnFgnN1ZHNraWVnbyA1Mi81NAwNODEt
+MzgyIEdkeW5pYQwGUG9sc2thDAlwb21vcnNraWUxDjAMBgNVBCoMBUplcnp5MRMw
+EQYDVQQEDApQcnpld29yc2tpMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCM
+m5vjGqHPthJCMqKpqssSISRos0PYDTcEQzyyurfX67EJWKtZj6HNwuDMEGJ02iBN
+ZfjUl7r8dIi28bSKhNlsfycXZKYRcIjp0+r5RqtR2auo9GQ6veKb61DEAGIqaR+u
+LLcJVTHCu0w9oXLGbRlGth5eNoj03CxXVAH2IfhbNwIDAQABo4IChzCCAoMwDAYD
+VR0TAQH/BAIwADCCAUgGA1UdIAEB/wSCATwwggE4MIIBNAYJKoRoAYb3IwEBMIIB
+JTCB3QYIKwYBBQUHAgIwgdAMgc1EZWtsYXJhY2phIHRhIGplc3Qgb8Wbd2lhZGN6
+ZW5pZW0gd3lkYXdjeSwgxbxlIHRlbiBjZXJ0eWZpa2F0IHpvc3RhxYIgd3lkYW55
+IGpha28gY2VydHlmaWthdCBrd2FsaWZpa293YW55IHpnb2RuaWUgeiB3eW1hZ2Fu
+aWFtaSB1c3Rhd3kgbyBwb2RwaXNpZSBlbGVrdHJvbmljem55bSBvcmF6IHRvd2Fy
+enlzesSFY3ltaSBqZWogcm96cG9yesSFZHplbmlhbWkuMEMGCCsGAQUFBwIBFjdo
+dHRwOi8vd3d3Lmtpci5jb20ucGwvY2VydHlmaWthY2phX2tsdWN6eS9wb2xpdHlr
+YS5odG1sMAkGA1UdCQQCMAAwIQYDVR0RBBowGIEWai5wcnpld29yc2tpQGdkeW5p
+YS5wbDAOBgNVHQ8BAf8EBAMCBkAwgZ4GA1UdIwSBljCBk4AU3TGldJXipN4oGS3Z
+YmnBDMFs8gKhd6R1MHMxCzAJBgNVBAYTAlBMMSgwJgYDVQQKDB9LcmFqb3dhIEl6
+YmEgUm96bGljemVuaW93YSBTLkEuMSQwIgYDVQQDDBtDT1BFIFNaQUZJUiAtIEt3
+YWxpZmlrb3dhbnkxFDASBgNVBAUTC05yIHdwaXN1OiA2ggJb9jBIBgNVHR8EQTA/
+MD2gO6A5hjdodHRwOi8vd3d3Lmtpci5jb20ucGwvY2VydHlmaWthY2phX2tsdWN6
+eS9DUkxfT1pLMzIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQBYPIqnAreyeql7/opJ
+jcar/qWZy9ruhB2q0lZFsJOhwgMnbQXzp/4vv93YJqcHGAXdHP6EO8FQX47mjo2Z
+KQmi+cIHJHLONdX/3Im+M17V0iNAh7Z1lOSfTRT+iiwe/F8phcEaD5q2RmvYusR7
+zXZq/cLL0If0hXoPZ/EHQxjN8pxzxiUx6bJAgturnIMEfRNesxwghdr1dkUjOhGL
+f3kHVzgM6j3VAM7oFmMUb5y5s96Bzl10DodWitjOEH0vvnIcsppSxH1C1dCAi0o9
+f/1y2XuLNhBNHMAyTqpYPX8Yvav1c+Z50OMaSXHAnTa20zv8UtiHbaAhwlifCelU
+Mj93
+-----END CERTIFICATE-----');
+        $this->assertFalse($x509->validateSignature());
+    }
+
+    // fixed by #1104
+    public function testMultipleDomainNames(): void
+    {
+        $privatekey = RSA::createKey(512)
+            ->withPadding(RSA::SIGNATURE_PKCS1)
+            ->withHash('sha1');
+        $publickey = $privatekey->getPublicKey();
+
+        $subject = new X509();
+        $subject->setDomain('example.com', 'example.net');
+
+        $subject->setPublicKey($publickey);
+
+        $issuer = new X509();
+        $issuer->setPrivateKey($privatekey);
+        $issuer->setDN($subject->getDN());
+
+        $x509 = new X509();
+        $x509->sign($issuer, $subject);
+        self::assertTrue(true);
+    }
+
+    public function testUtcTimeWithoutSeconds(): void
+    {
+        $test = '-----BEGIN CERTIFICATE-----
+MIIGFDCCBPygAwIBAgIDKCHVMA0GCSqGSIb3DQEBBQUAMIHcMQswCQYDVQQGEwJVUzEQMA4GA1UE
+CBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hu
+b2xvZ2llcywgSW5jLjE5MDcGA1UECxMwaHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNo
+LmNvbS9yZXBvc2l0b3J5MTEwLwYDVQQDEyhTdGFyZmllbGQgU2VjdXJlIENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5MREwDwYDVQQFEwgxMDY4ODQzNTAcFwsxNDAxMDcwMDAwWhcNMTYwNDAxMDcwMDAw
+WjCB6zETMBEGCysGAQQBgjc8AgEDEwJVUzEYMBYGCysGAQQBgjc8AgECEwdBcml6b25hMR0wGwYD
+VQQPExRQcml2YXRlIE9yZ2FuaXphdGlvbjEUMBIGA1UEBRMLUi0xNzI0NzQxLTYxCzAJBgNVBAYT
+AlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSQwIgYDVQQKExtTdGFy
+ZmllbGQgVGVjaG5vbG9naWVzLCBMTEMxKzApBgNVBAMTInZhbGlkLnNmaS5jYXRlc3Quc3RhcmZp
+ZWxkdGVjaC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCt1LHQOza9tkKxwGL+
+/yKi/Fe5HM0sjvcM4ic1XVrvpewa4P/04IzGSjIGO3CXaSArxQMSzsTt2dcO9tSJ1Zk8c9NZXM8e
+Vqx92iTMEf9OQcubWpzWmrPc3TAFhbVnfEmCptsXEgtxbAIbntrNeDk/hBPdl4DYFYRdm3ZTk4JM
+If/quDZe5Oti53J0UsxWXSSoqKyPNdb671Q+OTQfSDj7kVF4+Ri3FIeAV16d2UnpBW1bgNqA5yIT
+RskHE4bX98HDNHUTHioHpgA+fXfejWkGB/0FQN4HbZcysYHhf1L5cWBtz9w5J00YmjM5fzWvTc3U
+UF9ou7m7JE4aqEbNOWb9AgMBAAGjggHOMIIByjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIF
+oDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwLQYDVR0RBCYwJIIidmFsaWQuc2ZpLmNh
+dGVzdC5zdGFyZmllbGR0ZWNoLmNvbTAdBgNVHQ4EFgQUcO+QEqZcHphPW9szww9ty+1AGmQwHwYD
+VR0jBBgwFoAUSUtSJ9EbvPKhIWpie1FCeorX1VYwOAYDVR0fBDEwLzAtoCugKYYnaHR0cDovL2Ny
+bC5zdGFyZmllbGR0ZWNoLmNvbS9zZnMzLTAuY3JsMIGNBggrBgEFBQcBAQSBgDB+MCoGCCsGAQUF
+BzABhh5odHRwOi8vb2NzcC5zdGFyZmllbGR0ZWNoLmNvbS8wUAYIKwYBBQUHMAKGRGh0dHA6Ly9j
+ZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS9zZl9pbnRlcm1lZGlhdGUu
+Y3J0MFIGA1UdIARLMEkwRwYLYIZIAYb9bgEHFwMwODA2BggrBgEFBQcCARYqaHR0cDovL2NlcnRz
+LnN0YXJmaWVsZHRlY2guY29tL3JlcG9zaXRvcnkvMA0GCSqGSIb3DQEBBQUAA4IBAQAViYkLUjQk
+xWRmZl4DutL0/9/wJSURcJ1qunLP+TImJFp0A9RE/MNKZOmQoAEoH6hMg7FL4etkvTcnruTdcx+3
+mvqYiECUiUEx6pkx3dmkYgZACEuk2nfyJ0MkV/zwzqmI8aV+kunpOQv93aePZbrBgaAzkE8jDlEx
+td7c4pE7JF40jxmvDwjZHwpyNDULreGtFBij7JcWJCfihM3uetqrao0kOoeih1PQyJXtz2RldhFY
+s6Jdk3ILYv+84t5UMO+aS9nVBXIcbgaGjIMZjHDgR/tE9FKFB66k8UTDzAwwEs38VV24zx6hlOzT
+F7xAUxmPUnNb2teatMf2Rmj0fs+d
+-----END CERTIFICATE-----
+';
+
+        $x509 = new X509();
+
+        $cert = $x509->loadX509($test);
+
+        $this->assertEquals($cert['tbsCertificate']['validity']['notBefore']['utcTime'], 'Tue, 07 Jan 2014 00:00:00 +0000');
+        $this->assertEquals($cert['tbsCertificate']['validity']['notAfter']['utcTime'], 'Fri, 01 Apr 2016 07:00:00 +0000');
+    }
+
+    public function testValidateURL(): void
+    {
+        $test = '-----BEGIN CERTIFICATE-----
+MIIEgDCCA2igAwIBAgIIPUwrl6kGL2QwDQYJKoZIhvcNAQELBQAwSTELMAkGA1UE
+BhMCVVMxEzARBgNVBAoTCkdvb2dsZSBJbmMxJTAjBgNVBAMTHEdvb2dsZSBJbnRl
+cm5ldCBBdXRob3JpdHkgRzIwHhcNMTcxMDI0MDkwMjMxWhcNMTcxMjI5MDAwMDAw
+WjBoMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwN
+TW91bnRhaW4gVmlldzETMBEGA1UECgwKR29vZ2xlIEluYzEXMBUGA1UEAwwOd3d3
+Lmdvb2dsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDwFKTU
+FgOf1beWoPUuJu8kbwmPBEAPIl933guV6XV54V0rtcc61DZplOzJO4uEyzcGxVqE
+A9hKr0CAM/6jBQGZrKm5u6SyqXMPo3qEH2AxsbTx2eIeRIiAt3bDTq2eCilxyM/m
+qOvEWAlXPPBFs2B7OBth0xuaSW8+XkNx5ZHIJrNqvh/6INbMVMRzRdQkxz72fiWn
+fgtPAC4tBywmzUYTiboJW7poYqIZIxEZCKN0NdzKNOzKpIS1MByByQZECYDCsLVi
+gkAuBdo4tT1QNU6KIqKvV716PhQU/ynQA/o7uzjgxO2p/KwaZyD/pihdfLv62qLg
+jDBJMU9AfUCWxPmpAgMBAAGjggFLMIIBRzAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
+KwYBBQUHAwIwGQYDVR0RBBIwEIIOd3d3Lmdvb2dsZS5jb20waAYIKwYBBQUHAQEE
+XDBaMCsGCCsGAQUFBzAChh9odHRwOi8vcGtpLmdvb2dsZS5jb20vR0lBRzIuY3J0
+MCsGCCsGAQUFBzABhh9odHRwOi8vY2xpZW50czEuZ29vZ2xlLmNvbS9vY3NwMB0G
+A1UdDgQWBBQAl7IbLVzwRb/SsW5jI3gdi7YCqjAMBgNVHRMBAf8EAjAAMB8GA1Ud
+IwQYMBaAFErdBhYbvPZotXb1gba7Yhq6WoEvMCEGA1UdIAQaMBgwDAYKKwYBBAHW
+eQIFATAIBgZngQwBAgIwMAYDVR0fBCkwJzAloCOgIYYfaHR0cDovL3BraS5nb29n
+bGUuY29tL0dJQUcyLmNybDANBgkqhkiG9w0BAQsFAAOCAQEAYJ+3TXE7etCjkLEE
+/CN1BKGQVkYoCshZS3FkX8vUBP2orgvu9VGiLN9lb8+LMO+uNMVf+PLNsTP3lQ0q
+oFzpU8xsv/87L7UcJoCge2ZR4kANgjmJ12TG7dCcPpbH2qu7Y8wnWubik5U68gsI
+Qopg3hKg24p645o4exwsd/lOrsqh3vPorwZwU2Ekd2wKdxBID3puQA1jvWOBUcJI
+Oe2K7+R2Cf6p8bYmm3OABuYkvO8D+u8gIdIO5cP+ic+SDOGVNJaT949YPes/S99R
+9NQRFKcjEPl1UYh5bpPTKYzS7cTcDYG6xvbtG/XKEsK5U9UggzY6PCOPDDYpF+rq
+C47x9g==
+-----END CERTIFICATE-----';
+
+        $x509 = new X509();
+
+        $cert = $x509->loadX509($test);
+
+        $this->assertTrue($x509->validateURL('https://www.google.com'));
+    }
+
+    public function testValidateSignatureWithoutKeyIdentifier(): void
+    {
+        $x509 = new X509();
+        $x509->loadX509('-----BEGIN CERTIFICATE-----
+MIIDATCCAmqgAwIBAgICApowDQYJKoZIhvcNAQEFBQAwdzELMAkGA1UEBhMCVUsx
+DzANBgNVBAgMBkxvbmRvbjEPMA0GA1UEBwwGTG9uZG9uMQwwCgYDVQQKDANNUFMx
+DDAKBgNVBAsMA0RldjENMAsGA1UEAwwEdGVzdDEbMBkGCSqGSIb3DQEJARYMZGVr
+aUBtcHMuY29tMB4XDTE3MTEyNDE4MzE0MFoXDTE4MTEyNDE4MzE0MFowYTELMAkG
+A1UEBhMCVUsxDzANBgNVBAgMBkxvbmRvbjEPMA0GA1UEBwwGTG9uZG9uMQwwCgYD
+VQQKDANNUFMxETAPBgNVBAsMCERldi90ZXN0MQ8wDQYDVQQDDAZ0ZXN0MDEwgZ8w
+DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJ6+ydLXtjwbKhUBIodrm9Zq5yhhfMUM
+IDhpcEZ2PAWWUiwKZOo9eyXGAv4LnpvDcX5GzThqI1g3/rcPjgBMOB8bcuQA6RE0
+I9Jcf3YHbg/ednp7Q2X/zqUW+QUd01VfG8OJiRvO/4WKJTdQMU7/DKAv5WScIa4c
+0b11X4iiLUVvAgMBAAGjgbEwga4wgZMGA1UdIwSBizCBiKF7pHkwdzELMAkGA1UE
+BhMCVUsxDzANBgNVBAgMBkxvbmRvbjEPMA0GA1UEBwwGTG9uZG9uMQwwCgYDVQQK
+DANNUFMxDDAKBgNVBAsMA0RldjENMAsGA1UEAwwEdGVzdDEbMBkGCSqGSIb3DQEJ
+ARYMZGVraUBtcHMuY29tggkA+Fj4n7pGuRMwCQYDVR0TBAIwADALBgNVHQ8EBAMC
+BPAwDQYJKoZIhvcNAQEFBQADgYEAK0s83KbLM0OSj93/aly7UZHKGY3R/XhBNcsQ
+3fcxzX6VX8naJpqfK9kM5Ry9IBnqu6LwCnk18kqt6V6PSjqQ3gj9S3x8znTMdus1
+xraMNBOqRrn9quWCGEQt/iBrXHZ8zCdb4a+Eb5Jhz6/qK00KVufxw67fhuvhsjjv
+nnA8of4=
+-----END CERTIFICATE-----');
+
+        $authorityKeyIdentifier = $x509->getExtension('id-ce-authorityKeyIdentifier');
+        $this->assertNotNull($authorityKeyIdentifier);
+        $this->assertFalse(isset($authorityKeyIdentifier['keyIdentifier']));
+
+        $x509->loadCA('-----BEGIN CERTIFICATE-----
+MIIDITCCAoqgAwIBAgIJAPhY+J+6RrkTMA0GCSqGSIb3DQEBBQUAMHcxCzAJBgNV
+BAYTAlVLMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEMMAoGA1UE
+CgwDTVBTMQwwCgYDVQQLDANEZXYxDTALBgNVBAMMBHRlc3QxGzAZBgkqhkiG9w0B
+CQEWDGRla2lAbXBzLmNvbTAeFw0xNzExMjQxODI3NDlaFw0xODExMjQxODI3NDla
+MHcxCzAJBgNVBAYTAlVLMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRv
+bjEMMAoGA1UECgwDTVBTMQwwCgYDVQQLDANEZXYxDTALBgNVBAMMBHRlc3QxGzAZ
+BgkqhkiG9w0BCQEWDGRla2lAbXBzLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
+gYkCgYEA022CwduFLxKCwwKp2WTTpBu1vhcVywOAW0rNIfuSa7XsYyX5rCSScE4d
+YW8hUgWbZSoJMk1s1omZarmwMAIeknpigZSKWUhEJF3IVnc1tW3mGaSAEvKg6r4g
+unKttJV2aDW8w3Ew2qzP0G8sJwMX7y49XQumG5IgpuVXkiydTwsCAwEAAaOBtDCB
+sTCBkwYDVR0jBIGLMIGIoXukeTB3MQswCQYDVQQGEwJVSzEPMA0GA1UECAwGTG9u
+ZG9uMQ8wDQYDVQQHDAZMb25kb24xDDAKBgNVBAoMA01QUzEMMAoGA1UECwwDRGV2
+MQ0wCwYDVQQDDAR0ZXN0MRswGQYJKoZIhvcNAQkBFgxkZWtpQG1wcy5jb22CCQD4
+WPifuka5EzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIE8DANBgkqhkiG9w0BAQUF
+AAOBgQBNhIESJpRiYBPDdIsdfOyuclzmN+5KHXicAXN4WXFiYgVQhML44Vb7Macb
+X5ZBGsa3olRvoKrhg8ian7NyfRviAk0iO8EAAFCeeYHPN6bbloGfUcuf72P8576w
+HI8pYRZmT7tKW3HxlZLJGGVo5CgBawdiWngK5v+LwWiNRTqxJA==
+-----END CERTIFICATE-----');
+
+        $this->assertTrue($x509->validateSignature());
+    }
+
+    public function testValidateSignatureSelfSignedWithoutKeyIdentifier(): void
+    {
+        $x509 = new X509();
+        $x509->loadX509('-----BEGIN CERTIFICATE-----
+MIIDITCCAoqgAwIBAgIJAPhY+J+6RrkTMA0GCSqGSIb3DQEBBQUAMHcxCzAJBgNV
+BAYTAlVLMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEMMAoGA1UE
+CgwDTVBTMQwwCgYDVQQLDANEZXYxDTALBgNVBAMMBHRlc3QxGzAZBgkqhkiG9w0B
+CQEWDGRla2lAbXBzLmNvbTAeFw0xNzExMjQxODI3NDlaFw0xODExMjQxODI3NDla
+MHcxCzAJBgNVBAYTAlVLMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRv
+bjEMMAoGA1UECgwDTVBTMQwwCgYDVQQLDANEZXYxDTALBgNVBAMMBHRlc3QxGzAZ
+BgkqhkiG9w0BCQEWDGRla2lAbXBzLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
+gYkCgYEA022CwduFLxKCwwKp2WTTpBu1vhcVywOAW0rNIfuSa7XsYyX5rCSScE4d
+YW8hUgWbZSoJMk1s1omZarmwMAIeknpigZSKWUhEJF3IVnc1tW3mGaSAEvKg6r4g
+unKttJV2aDW8w3Ew2qzP0G8sJwMX7y49XQumG5IgpuVXkiydTwsCAwEAAaOBtDCB
+sTCBkwYDVR0jBIGLMIGIoXukeTB3MQswCQYDVQQGEwJVSzEPMA0GA1UECAwGTG9u
+ZG9uMQ8wDQYDVQQHDAZMb25kb24xDDAKBgNVBAoMA01QUzEMMAoGA1UECwwDRGV2
+MQ0wCwYDVQQDDAR0ZXN0MRswGQYJKoZIhvcNAQkBFgxkZWtpQG1wcy5jb22CCQD4
+WPifuka5EzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIE8DANBgkqhkiG9w0BAQUF
+AAOBgQBNhIESJpRiYBPDdIsdfOyuclzmN+5KHXicAXN4WXFiYgVQhML44Vb7Macb
+X5ZBGsa3olRvoKrhg8ian7NyfRviAk0iO8EAAFCeeYHPN6bbloGfUcuf72P8576w
+HI8pYRZmT7tKW3HxlZLJGGVo5CgBawdiWngK5v+LwWiNRTqxJA==
+-----END CERTIFICATE-----');
+
+        $authorityKeyIdentifier = $x509->getExtension('id-ce-authorityKeyIdentifier');
+        $this->assertNotNull($authorityKeyIdentifier);
+        $this->assertFalse(isset($authorityKeyIdentifier['keyIdentifier']));
+
+        $this->assertTrue($x509->validateSignature(false));
+    }
+
+    /**
+     * @group github1243
+     */
+    public function testExtensionRemoval(): void
+    {
+        // Load the CA and its private key.
+        $pemcakey = '-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQCpKtNFBdtRd8eFcq7L7RxvkeeUFcc4QDY6rLDJUpPGp1qL9L7p
+l+rK0L66TGSs+wZTM4awDP2d75HZG2/9LOX5Xy4oAb7aS2PiLDQmVa81t1sA42bs
+3UBxak9w4jcj623gesDG6dN1sFpqVq9/Z4JOnPJu1PXzwcuj3t7J5QLFSwIDAQAB
+AoGBAI8/vHeOZhGupD3Uxz/YIWQ44Sj86B4yAbnd0jYovwpRXNN3BNM52ZC1A00u
+s3Hnf4uk7kDWP00mORLnsQVqp7IKMznTHyvBJ/uA5vipXc0fmpmmPLjy6Sh071Co
+0iTYFUDu3dlPi6UEgQ6ZjgXmHdeTRA/YuH/70sqKjLjkYRbBAkEA3oRoMdJjJAm4
++XY3+1Ulc2qTHkecsTOON0Reta9THws4ibtKIP89aBUthz1XGLm9mUtWu49kQXht
+o1FtFLhLtQJBAMKfUurb075FQIRl6KsRJilCWVJSplf0szvKWm40uDXYmFlj7D7J
+bEdbVBWdfBi9SNzZrLAThjfxwdBsr+DjbP8CQQCeft+cxUfazpYUErHTcxXG/R2n
+jsi8q4VcNnXjoetqDFsMN/yYPlYmAhe44edc9EhpnXE9DekSfU5S61fwT0mVAkAm
+keSg3sfr4VWT545guJlTe+6vvelxbPFIXCXnyVLoePBYZtEe8FQhIBxd3EQHsxuJ
+iSoMCxKCa8r5P1DrxKaJAkBBP87OdahRq0CBQjTFg0wmPs66PoTXA4hZvSxV77CO
+tMPj6Pas7Muejogm6JkmxXC/uT6Tzfknd0B3XSmtDzGL
+-----END RSA PRIVATE KEY-----';
+        $cakey = PublicKeyLoader::load($pemcakey)
+            ->withPadding(RSA::SIGNATURE_PKCS1)
+            ->withHash('sha1');
+        $pemca = '-----BEGIN CERTIFICATE-----
+MIICADCCAWmgAwIBAgIUJXQulcz5xkTam8UGC/yn6iVaiWwwDQYJKoZIhvcNAQEF
+BQAwHDEaMBgGA1UECgwRcGhwc2VjbGliIGRlbW8gQ0EwHhcNMTgwMTIxMTc0NzM0
+WhcNMTkwMTIxMTc0NzM0WjAcMRowGAYDVQQKDBFwaHBzZWNsaWIgZGVtbyBDQTCB
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqSrTRQXbUXfHhXKuy+0cb5HnlBXH
+OEA2OqywyVKTxqdai/S+6ZfqytC+ukxkrPsGUzOGsAz9ne+R2Rtv/Szl+V8uKAG+
+2ktj4iw0JlWvNbdbAONm7N1AcWpPcOI3I+tt4HrAxunTdbBaalavf2eCTpzybtT1
+88HLo97eyeUCxUsCAwEAAaM/MD0wCwYDVR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMB
+Af8wHQYDVR0OBBYEFCS1BJ12nN8ObQWE4OgOOSH9DxTRMA0GCSqGSIb3DQEBBQUA
+A4GBAHkSnlJnlkwDEUcENKWFZpfNgZu9HUvEuLDVOnhvsdd2MDr8EbVbgMHYNWnV
++ZOS/dqbuCd9Vd27JsBC2YHklaq9/V5zMbrEBiMLo5P5WL9qrz0qbmK/aruP+VX7
+cKVMm1WnOQd4aQgCvzv2r7/gsdX++496vRpBMTfwa1qLBjG6
+-----END CERTIFICATE-----';
+        $ca = new X509();
+        $ca->loadX509($pemca);
+        $ca->setPrivateKey($cakey);
+
+        // Read the old certificate.
+        $oldcert = new X509();
+        $oldcert->loadCA($pemca);
+        $oldcert->loadX509('-----BEGIN CERTIFICATE-----
+MIIB+TCCAWKgAwIBAgIUW+D7X27oKXHaD6WqFjelccV+D4YwDQYJKoZIhvcNAQEF
+BQAwHDEaMBgGA1UECgwRcGhwc2VjbGliIGRlbW8gQ0EwHhcNMTgwMTIxMTc0NzM0
+WhcNMTkwMTIxMTc0NzM0WjA3MRwwGgYDVQQKDBNwaHBzZWNsaWIgZGVtbyBjZXJ0
+MRcwFQYDVQQDDA53d3cuZ29vZ2xlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
+gYkCgYEAqnB0IyO+O6RcZdZooFaMKY/ggeNPXW/EaLXdciHEnzxgbsVb1I5m5pwy
+nZIf6RCHUsfOYdhTX/xQE8JOSkbDEYtKmrySxu+JpmR3qZPhL+4rJUJKCdI+9YbM
+z1wiqQeHhVUTPiEvgdAzkzPXcrkLmpb1KV7VhKoQ4Z3swmJX528CAwEAAaMdMBsw
+GQYDVR0RBBIwEIIOd3d3Lmdvb2dsZS5jb20wDQYJKoZIhvcNAQEFBQADgYEAV5W5
+G9eY1SJiwIHMcd5Eo41w+bN69EqOJhTY28LQc/m9i+Fuc1J6nkwDMKCtEeEUyhjl
+bEbVUszdgPQWON7Y2nS5OCb2BevxW8Xdf6gnf/PRRYmlZJgygwf0KpgSm5CxxsZW
+Fqfy+n5VpXOdrjic4yZ52yS5sUaq05s6ZZvnmdU=
+-----END CERTIFICATE-----');
+        $this->assertTrue($oldcert->validateSignature());
+
+        // Set new dates and serial number.
+        $newcert = new X509();
+        $newcert->setStartDate('-1 day');
+        $newcert->setEndDate('+2 years');
+        //$newcert->setSerialNumber('1234', 10);
+
+        $oldcert->setDomain('www.google.com');
+
+        // Produce the new certificate by signing the old one.
+        $crt = $newcert->loadX509($newcert->saveX509($newcert->sign($ca, $oldcert)));
+
+        // Output new certificate.
+        $newcert->saveX509($crt);
+    }
+
+    public function testAuthorityInfoAccess(): void
+    {
+        $x509 = new X509();
+        $x509->loadCA('-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
+QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT
+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
+b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB
+CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97
+nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt
+43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P
+T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4
+gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO
+BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR
+TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw
+DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr
+hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg
+06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF
+PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls
+YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
+CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
+-----END CERTIFICATE-----');
+        $x509->loadX509('-----BEGIN CERTIFICATE-----
+MIIG3TCCBcWgAwIBAgIQAtB7LVsRCmgbyWiiw7Sf5jANBgkqhkiG9w0BAQsFADBN
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
+aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTcwOTEzMDAwMDAwWhcN
+MTkwOTEzMTIwMDAwWjBqMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3Rv
+bjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0
+aW9uMRQwEgYDVQQDEwtvdXRsb29rLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAIz2tovvgBmK4sOHgpyzCdtXrI0XOujctf6LHMj16wzUnMEatioS
+tH0Pz0dKkCr/0yd9qtXbGhD1o6WhFsd7k651K9MZ98+uQ29SzTIAl6y1gkaBbp4h
+MFXcE5EpRNHHmK8t2OR7hzmrvvNr6OTYv7BhVCw9pSrQqEFNno0K2TQRhAD9uzrL
+OY+rBBVedCXWXH7uhZoZ6joUU7CEA5pPMzKPL1ro+Eorc8vt5FYOC+oAT587+b1M
+z+jbZVQlq0qaMkBKRtUIII78MYY0n8DopGqHyzwqWoGySHJNC8256q+MwsZQvvQ3
+vmy/rf61h2sg1tU0s7O88Yufxp0LSaMMzZcCAwEAAaOCA5owggOWMB8GA1UdIwQY
+MBaAFA+AYRyCMWHVLyjnjUY4tCzhxtniMB0GA1UdDgQWBBT7hLoZ/03rqwcslIc2
+0k0z2R+vNTCCAdwGA1UdEQSCAdMwggHPggtvdXRsb29rLmNvbYIWKi5jbG8uZm9v
+dHByaW50ZG5zLmNvbYIWKi5ucmIuZm9vdHByaW50ZG5zLmNvbYIgYXR0YWNobWVu
+dC5vdXRsb29rLm9mZmljZXBwZS5uZXSCG2F0dGFjaG1lbnQub3V0bG9vay5saXZl
+Lm5ldIIdYXR0YWNobWVudC5vdXRsb29rLm9mZmljZS5uZXSCHWNjcy5sb2dpbi5t
+aWNyb3NvZnRvbmxpbmUuY29tgiFjY3Mtc2RmLmxvZ2luLm1pY3Jvc29mdG9ubGlu
+ZS5jb22CC2hvdG1haWwuY29tgg0qLmhvdG1haWwuY29tggoqLmxpdmUuY29tghZt
+YWlsLnNlcnZpY2VzLmxpdmUuY29tgg1vZmZpY2UzNjUuY29tgg8qLm9mZmljZTM2
+NS5jb22CFyoub3V0bG9vay5vZmZpY2UzNjUuY29tgg0qLm91dGxvb2suY29tghYq
+LmludGVybmFsLm91dGxvb2suY29tggwqLm9mZmljZS5jb22CEm91dGxvb2sub2Zm
+aWNlLmNvbYIUc3Vic3RyYXRlLm9mZmljZS5jb22CGHN1YnN0cmF0ZS1zZGYub2Zm
+aWNlLmNvbTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+AQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNv
+bS9zc2NhLXNoYTItZzEuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5j
+b20vc3NjYS1zaGEyLWcxLmNybDBMBgNVHSAERTBDMDcGCWCGSAGG/WwBATAqMCgG
+CCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMAgGBmeBDAEC
+AjB8BggrBgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2lj
+ZXJ0LmNvbTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29t
+L0RpZ2lDZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0G
+CSqGSIb3DQEBCwUAA4IBAQA3zjN7I6jTeL+08nhG5eAY0q4pLY40bCQHqONBLSI3
+uRmQFUfrQOPYBqLC1QU+J2Z2HcX7YiqE3WAR3ODS9g2BAVXkKOQKNBnr2hKwueOz
+qPwyvTyzcIQYUw+SrTX+bfJwYMTmZvtP9S7/pB1jPhrV7YGsD55AI9bGa9cmH7VQ
+OiL1p5Qovg5KRsldoZeC04OF/UQIR1fv47VGptsHHGypvSo1JinJFQMXylqLIrUW
+lV66p3Ui7pFABGc/Lv7nOyANXfLugBO8MyzydGA4NRGiS2MbGpswPCg154pWausU
+M0qaEPsM2o3CSTfxSJQQIyEe+izV3UQqYSyWkNqCCFPN
+-----END CERTIFICATE-----');
+
+        X509::setRecurLimit(0);
+        $this->assertFalse($x509->validateSignature());
+
+        X509::setRecurLimit(5);
+        $this->assertTrue($x509->validateSignature());
+    }
+
+    public function testValidateDate(): void
+    {
+        $x509 = new X509();
+        $x509->loadX509('-----BEGIN CERTIFICATE-----
+MIIDITCCAoqgAwIBAgIQT52W2WawmStUwpV8tBV9TTANBgkqhkiG9w0BAQUFADBM
+MQswCQYDVQQGEwJaQTElMCMGA1UEChMcVGhhd3RlIENvbnN1bHRpbmcgKFB0eSkg
+THRkLjEWMBQGA1UEAxMNVGhhd3RlIFNHQyBDQTAeFw0xMTEwMjYwMDAwMDBaFw0x
+MzA5MzAyMzU5NTlaMGgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlh
+MRYwFAYDVQQHFA1Nb3VudGFpbiBWaWV3MRMwEQYDVQQKFApHb29nbGUgSW5jMRcw
+FQYDVQQDFA53d3cuZ29vZ2xlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC
+gYEA3rcmQ6aZhc04pxUJuc8PycNVjIjujI0oJyRLKl6g2Bb6YRhLz21ggNM1QDJy
+wI8S2OVOj7my9tkVXlqGMaO6hqpryNlxjMzNJxMenUJdOPanrO/6YvMYgdQkRn8B
+d3zGKokUmbuYOR2oGfs5AER9G5RqeC1prcB6LPrQ2iASmNMCAwEAAaOB5zCB5DAM
+BgNVHRMBAf8EAjAAMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwudGhhd3Rl
+LmNvbS9UaGF3dGVTR0NDQS5jcmwwKAYDVR0lBCEwHwYIKwYBBQUHAwEGCCsGAQUF
+BwMCBglghkgBhvhCBAEwcgYIKwYBBQUHAQEEZjBkMCIGCCsGAQUFBzABhhZodHRw
+Oi8vb2NzcC50aGF3dGUuY29tMD4GCCsGAQUFBzAChjJodHRwOi8vd3d3LnRoYXd0
+ZS5jb20vcmVwb3NpdG9yeS9UaGF3dGVfU0dDX0NBLmNydDANBgkqhkiG9w0BAQUF
+AAOBgQAhrNWuyjSJWsKrUtKyNGadeqvu5nzVfsJcKLt0AMkQH0IT/GmKHiSgAgDp
+ulvKGQSy068Bsn5fFNum21K5mvMSf3yinDtvmX3qUA12IxL/92ZzKbeVCq3Yi7Le
+IOkKcGQRCMha8X2e7GmlpdWC1ycenlbN0nbVeSv3JUMcafC4+Q==
+-----END CERTIFICATE-----');
+
+        $this->assertFalse($x509->validateDate('Nov 22, 2018'));
+        $this->assertTrue($x509->validateDate('Nov 22, 2012'));
+    }
+
+    public function testDSALoad(): void
+    {
+        // openssl dsaparam -out params.pem 3072
+        // openssl gendsa -out key.pem params.pem
+        // openssl req -new -key key.pem -out req.pem
+        // openssl x509 -req -in req.pem -signkey key.pem -out certificate.cer
+
+        $x509 = new X509();
+        $r = $x509->loadX509('-----BEGIN CERTIFICATE-----
+MIIF6jCCBZACCQDH427nRymbrDALBglghkgBZQMEAwIwRTELMAkGA1UEBhMCQVUx
+EzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMg
+UHR5IEx0ZDAeFw0xOTA1MjEwMjE2NTVaFw0xOTA2MjAwMjE2NTVaMEUxCzAJBgNV
+BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQwggTGMIIDOQYHKoZIzjgEATCCAywCggGBAMLpmurU070o
+PR1F7HgKror1KV8hL8ipiH9F1PxDp+GOhK8qBVIT355xdt6icQSHwQ3ZPuQzzm42
+FKZvLBHtU+UaPwWGOtjjGt7VXGawl1kVudwZ0du7gzvtcScynn09DhsaC3XEiDy6
+9CVrPbUck0/TyIzjr0czblRw6znaMoYGW/UlkKF+v86cmx200ASWawuW00QhiRD9
+cvoN23TgxZKNachi/2o1TCQ5UIRNUBR6Z50q3cXMIMzmSXl/8TKii655zWdda+au
+ecf/GomjJUpaw/7QMzCwgYH18rZdjO2VocUhpbkitayFrjbIaxLmUTLF080GfweX
+AUGcMYb6M+9hYey5xEyPLtWcmD0lvFwlOhIHSncKiDsYQLQqRyBRsSQ5wIq2u3Zi
+L5f7Jeb/rBF5knt7UhmA/QHYZPUidJFEfgbnm/XTt0I+Ykw9Olkvwx+hwH+552Ox
+owIs05XeMwdDUA50HhlLtzLLfU+Hi1LThX/B3Y70i0Z7UjkiS8IBGwIhAN7DyxFC
+zsD/nMXC5GKLVjmQATu8wSE0fBtJCTPlCAJdAoIBgCbZ9mTLiVmHwPvzf2Ii5+B4
+Acm/OUR0PvOtg7Qp1A0IG3PSyQkbxNySxjxN4kBT/3w2vroLiuRhXc6tenhCWnPv
+ZJBbO8XyfI/kcoTxjHC33XWXGuUkCKBHlOupmtdEVcFTkC3LYdEcWgTZ7b8CKaeH
+kDvJnmgkkz6OCXO8r5TPAYjh5HCTJkLen5RPKJL9426fNAZJaXz7Zxydisuk7ymY
+jTxyPpb1AkV06a/iEFavSzrKi9KSQxvVoSXij18bm9SWzXPZeai6NHd0ZUpwqR0e
+Tt784FmpD862YFWcahzbVObY7+JBX9v9H4kTcO7nophKK2BiLDagoqZMSkW8oSOL
+4DU0F8K8UkHjtuiLXw40bE9j2uyPqB9UCJ4qygXq0XkTZHuCSfSvGyA16yWobZOV
+0szio1/4l6EpmPKYpy1nZ2dk9vEgm4eXxZuhZlmyPTiC6rPGzEHrHkc56SK8Kn8k
+sy8Udvsgzr8+UpkN3rBQvgHrEfJnuNTmPGQbLyBukwOCAYUAAoIBgBxS7Ghb6ujq
+FFln6AlFL2OrpUrB9q8NZH84o+ygP39Kf/FdJ7CRs4dRL7L0FdruimK6Vsm55rPJ
+DSCaDZD45p2deG6mFmdpVAtiDPqOWMm6zGXjU4HhNA70oVOGQ7HkIlRWvbkYPA3z
+qT7Ibqe8gFaIkqobCEwQudcoqDlK+5vnO1IYt5zwuy6oeCN9rixaWjRLPm65SKzc
++4l9+XAZWThoKlFL3wVmuZ/3EeYX0G8FAR7nYEFwSTrGQTCAmTMVgYi9TxDLqGMe
+M6Nkp2R90dadRBqt6MJ/lZ3jOzgUw4dF9ofIumUJ0Up9sWDPEB96Ng69ZPWbXNo6
+799zo1mN2GaxQHfyn6VWjNf649eBg5Q3aNHjOSz9wi9afjs3u44AnBdGdZzlKVXX
+obtpt4Nwq9elof+9iwdjKqki6A9h0NWS1w9zjZ21n3Yq69J/XQl0UYYykGSWz65D
+bFuYoWPMpfSxEnxDZL5O3nxBCQDlPRxEjKwG/TdKxIJAuhPlgkgknzALBglghkgB
+ZQMEAwIDRwAwRAIgJPiEjjf2EMdvVuu5dkxR6OpVdbHST9pWTAUVa0ZMeuYCIBLX
+pMAUPdvLhVjjTvw4ypYrNMc4Z3z5n3bfCVzIQL5Z
+-----END CERTIFICATE-----');
+
+        $this->assertSame('id-dsa-with-sha256', $r['tbsCertificate']['signature']['algorithm']);
+        $this->assertSame('id-dsa', $r['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['algorithm']);
+        $this->assertSame('id-dsa-with-sha256', $r['signatureAlgorithm']['algorithm']);
+
+        $this->assertTrue($x509->validateSignature(false));
+    }
+
+    public function testECLoad(): void
+    {
+        // openssl req -x509 -nodes -days 3650 -newkey ec:<(openssl ecparam -name prime256v1) -keyout ecdsakey.pem -out ecdsacert.pem
+
+        $x509 = new X509();
+        $r = $x509->loadX509('-----BEGIN CERTIFICATE-----
+MIIB0zCCAXqgAwIBAgIJAIUvi6ecHYnoMAoGCCqGSM49BAMCMEUxCzAJBgNVBAYT
+AkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRn
+aXRzIFB0eSBMdGQwHhcNMTkwNTIxMDIxOTMyWhcNMjkwNTE4MDIxOTMyWjBFMQsw
+CQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJu
+ZXQgV2lkZ2l0cyBQdHkgTHRkMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEXYOR
+ZYFctekS6LIey8va5CLkQCWZw8JMIRPyWkABB6tjx5xJr8MgYiXB0nS15HC82JYN
+fR6NAT6lSnbpcfBgJKNTMFEwHQYDVR0OBBYEFEReRoJtjUXYus7iJWM/T1J7YxVH
+MB8GA1UdIwQYMBaAFEReRoJtjUXYus7iJWM/T1J7YxVHMA8GA1UdEwEB/wQFMAMB
+Af8wCgYIKoZIzj0EAwIDRwAwRAIgIBo2fgqfVsbKczXodiXamRIv1vmqgo3pIGzV
+f11dQP8CIDoB2AbvB3Yk/iGduWpw+3FwNAZ1y/rTqQK6+XgZCt6K
+-----END CERTIFICATE-----');
+
+        $this->assertSame('ecdsa-with-SHA256', $r['tbsCertificate']['signature']['algorithm']);
+        $this->assertSame('id-ecPublicKey', $r['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['algorithm']);
+        $this->assertSame('ecdsa-with-SHA256', $r['signatureAlgorithm']['algorithm']);
+
+        $this->assertTrue($x509->validateSignature(false));
+    }
+
+    public function testPSSLoad(): void
+    {
+        // openssl genpkey -algorithm rsa-pss -pkeyopt rsa_keygen_bits:2048 -pkeyopt rsa_keygen_pubexp:65537 -pkeyopt rsa_pss_keygen_md:sha256 -pkeyopt rsa_pss_keygen_mgf1_md:sha512 -pkeyopt rsa_pss_keygen_saltlen:5 -out CA.priKey
+        // openssl req -x509 -new -key CA.priKey -subj "/CN=CA" -sha256 -pkeyopt rsa_pss_keygen_md:sha256 -pkeyopt rsa_pss_keygen_mgf1_md:sha512 -pkeyopt rsa_pss_keygen_saltlen:5 -out CA.cer
+
+        $x509 = new X509();
+        $r = $x509->loadX509('-----BEGIN CERTIFICATE-----
+MIIDizCCAkOgAwIBAgIUZe4gqXJqqyKvQDBxcbAuPdttxTQwPQYJKoZIhvcNAQEK
+MDCgDTALBglghkgBZQMEAgGhGjAYBgkqhkiG9w0BAQgwCwYJYIZIAWUDBAIDogMC
+AQUwDTELMAkGA1UEAwwCQ0EwHhcNMTkwNTA5MDI0MTI0WhcNMTkwNjA4MDI0MTI0
+WjANMQswCQYDVQQDDAJDQTCCAVIwPQYJKoZIhvcNAQEKMDCgDTALBglghkgBZQME
+AgGhGjAYBgkqhkiG9w0BAQgwCwYJYIZIAWUDBAIDogMCAQUDggEPADCCAQoCggEB
+AOB5e+yI4nAfiDdhignByF9Hw9BOjCeRk++9m5iSKaZdkzFLPtR3uMw+x+B9xChq
+kro/jG1ierEP8YISEDe6wXIRmuSunC1/wqy8oX0xfo23jE7gdSpjk+9cF1cVABPh
+ehwcGmzuXeOv/M4iQr41MK8hdqAVJRIA8O7kZuQxpEbLBKsQc9u0eEFrNVf5jYGj
+7vsCpW/XmZYaNWQaOK5Psd0rxVaz2CYYG2RiXq2wQiHrFtwOVJAhuHXlOmr4ZjuR
+NJLNnHjqkIaRv+JU2VCwPHcbIK4vO7EL7PKVa6g5WY33SzF3aqE7hCk6JeZ4KSSh
+i5dq4bRiGpGp1BzrU/t/XTkCAwEAAaNTMFEwHQYDVR0OBBYEFOWZWROhub/avDzR
+hDc5biqHzkrYMB8GA1UdIwQYMBaAFOWZWROhub/avDzRhDc5biqHzkrYMA8GA1Ud
+EwEB/wQFMAMBAf8wPQYJKoZIhvcNAQEKMDCgDTALBglghkgBZQMEAgGhGjAYBgkq
+hkiG9w0BAQgwCwYJYIZIAWUDBAIDogMCAQUDggEBANAoXtrOunHHlrEWNhj8xvwB
+pMa3N66PO3wQ/nax73s+xCF57haXjh8mBkDy6DsvctHSyV8RgXQUXaprDLtNA+F3
+JIgUNfP4znO98cdQ3tkANvtWA5YuyhyNq9xDzH6LsLB6cZfqPrvFGuvhCmGT9qCk
+OKmHrFklewl1sfwIQzK+hHeimaUSrb6SIYYenbvH5XI9vjbA/jojlvIc1mz7Pzmr
+9idg8ckxvQ5K3Y01UNBg2vOSaInp+G7N7XlEMERssq6ALMaPm4GrXUlO0cs/mQXd
+edu9tyNNr2vvZjshoY5y58+hVIjee/Pzxa7GX0LDEmK8FdFBxWeNx0g/TsZj6GE=
+-----END CERTIFICATE-----');
+
+        $this->assertSame('id-RSASSA-PSS', $r['tbsCertificate']['signature']['algorithm']);
+        $this->assertSame('id-RSASSA-PSS', $r['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['algorithm']);
+        $this->assertSame('id-RSASSA-PSS', $r['signatureAlgorithm']['algorithm']);
+
+        $this->assertTrue($x509->validateSignature(false));
+    }
+
+    public function testDSASave(): void
+    {
+        $private = '-----BEGIN DSA PRIVATE KEY-----
+MIIE1QIBAAKCAYEAwuma6tTTvSg9HUXseAquivUpXyEvyKmIf0XU/EOn4Y6EryoF
+UhPfnnF23qJxBIfBDdk+5DPObjYUpm8sEe1T5Ro/BYY62OMa3tVcZrCXWRW53BnR
+27uDO+1xJzKefT0OGxoLdcSIPLr0JWs9tRyTT9PIjOOvRzNuVHDrOdoyhgZb9SWQ
+oX6/zpybHbTQBJZrC5bTRCGJEP1y+g3bdODFko1pyGL/ajVMJDlQhE1QFHpnnSrd
+xcwgzOZJeX/xMqKLrnnNZ11r5q55x/8aiaMlSlrD/tAzMLCBgfXytl2M7ZWhxSGl
+uSK1rIWuNshrEuZRMsXTzQZ/B5cBQZwxhvoz72Fh7LnETI8u1ZyYPSW8XCU6EgdK
+dwqIOxhAtCpHIFGxJDnAira7dmIvl/sl5v+sEXmSe3tSGYD9Adhk9SJ0kUR+Bueb
+9dO3Qj5iTD06WS/DH6HAf7nnY7GjAizTld4zB0NQDnQeGUu3Mst9T4eLUtOFf8Hd
+jvSLRntSOSJLwgEbAiEA3sPLEULOwP+cxcLkYotWOZABO7zBITR8G0kJM+UIAl0C
+ggGAJtn2ZMuJWYfA+/N/YiLn4HgByb85RHQ+862DtCnUDQgbc9LJCRvE3JLGPE3i
+QFP/fDa+uguK5GFdzq16eEJac+9kkFs7xfJ8j+RyhPGMcLfddZca5SQIoEeU66ma
+10RVwVOQLcth0RxaBNntvwIpp4eQO8meaCSTPo4Jc7yvlM8BiOHkcJMmQt6flE8o
+kv3jbp80BklpfPtnHJ2Ky6TvKZiNPHI+lvUCRXTpr+IQVq9LOsqL0pJDG9WhJeKP
+Xxub1JbNc9l5qLo0d3RlSnCpHR5O3vzgWakPzrZgVZxqHNtU5tjv4kFf2/0fiRNw
+7ueimEorYGIsNqCipkxKRbyhI4vgNTQXwrxSQeO26ItfDjRsT2Pa7I+oH1QInirK
+BerReRNke4JJ9K8bIDXrJahtk5XSzOKjX/iXoSmY8pinLWdnZ2T28SCbh5fFm6Fm
+WbI9OILqs8bMQeseRznpIrwqfySzLxR2+yDOvz5SmQ3esFC+AesR8me41OY8ZBsv
+IG6TAoIBgBxS7Ghb6ujqFFln6AlFL2OrpUrB9q8NZH84o+ygP39Kf/FdJ7CRs4dR
+L7L0FdruimK6Vsm55rPJDSCaDZD45p2deG6mFmdpVAtiDPqOWMm6zGXjU4HhNA70
+oVOGQ7HkIlRWvbkYPA3zqT7Ibqe8gFaIkqobCEwQudcoqDlK+5vnO1IYt5zwuy6o
+eCN9rixaWjRLPm65SKzc+4l9+XAZWThoKlFL3wVmuZ/3EeYX0G8FAR7nYEFwSTrG
+QTCAmTMVgYi9TxDLqGMeM6Nkp2R90dadRBqt6MJ/lZ3jOzgUw4dF9ofIumUJ0Up9
+sWDPEB96Ng69ZPWbXNo6799zo1mN2GaxQHfyn6VWjNf649eBg5Q3aNHjOSz9wi9a
+fjs3u44AnBdGdZzlKVXXobtpt4Nwq9elof+9iwdjKqki6A9h0NWS1w9zjZ21n3Yq
+69J/XQl0UYYykGSWz65DbFuYoWPMpfSxEnxDZL5O3nxBCQDlPRxEjKwG/TdKxIJA
+uhPlgkgknwIgdDqqKIAF60ouiynsbU53ERS0TwpjeFiYGA48SwYW3Nk=
+-----END DSA PRIVATE KEY-----';
+        $private = PublicKeyLoader::load($private);
+        $public = $private->getPublicKey();
+
+        $subject = new X509();
+        $subject->setDNProp('id-at-organizationName', 'phpseclib demo cert');
+        $subject->setPublicKey($public);
+
+        $issuer = new X509();
+        $issuer->setPrivateKey($private);
+        $issuer->setDN($subject->getDN());
+
+        $x509 = new X509();
+
+        $result = $x509->sign($issuer, $subject);
+        $result = $x509->saveX509($result);
+
+        $this->assertIsString($result);
+
+        $r = $x509->loadX509($result);
+        $this->assertSame('id-dsa-with-sha256', $r['tbsCertificate']['signature']['algorithm']);
+        $this->assertSame('id-dsa', $r['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['algorithm']);
+        $this->assertSame('id-dsa-with-sha256', $r['signatureAlgorithm']['algorithm']);
+    }
+
+    public function testECSave(): void
+    {
+        $private = '-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgQ0o1byJQbAcuklBt
+MENv2e0W3cE6gRmETxEvTBAxRTShRANCAARdg5FlgVy16RLosh7Ly9rkIuRAJZnD
+wkwhE/JaQAEHq2PHnEmvwyBiJcHSdLXkcLzYlg19Ho0BPqVKdulx8GAk
+-----END PRIVATE KEY-----';
+        $private = PublicKeyLoader::load($private);
+        $public = $private->getPublicKey();
+
+        $subject = new X509();
+        $subject->setDNProp('id-at-organizationName', 'phpseclib demo cert');
+        $subject->setPublicKey($public);
+
+        $issuer = new X509();
+        $issuer->setPrivateKey($private);
+        $issuer->setDN($subject->getDN());
+
+        $x509 = new X509();
+
+        $result = $x509->sign($issuer, $subject);
+        $result = $x509->saveX509($result);
+
+        $this->assertIsString($result);
+
+        $r = $x509->loadX509($result);
+        $this->assertSame('ecdsa-with-SHA256', $r['tbsCertificate']['signature']['algorithm']);
+        $this->assertSame('id-ecPublicKey', $r['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['algorithm']);
+        $this->assertSame('ecdsa-with-SHA256', $r['signatureAlgorithm']['algorithm']);
+    }
+
+    public function testPSSSave(): void
+    {
+        $private = '-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQCqGKukO1De7zhZj6+H0qtjTkVxwTCpvKe4eCZ0FPqri0cb2JZfXJ/DgYSF6vUp
+wmJG8wVQZKjeGcjDOL5UlsuusFncCzWBQ7RKNUSesmQRMSGkVb1/3j+skZ6UtW+5u09lHNsj6tQ5
+1s1SPrCBkedbNf0Tp0GbMJDyR4e9T04ZZwIDAQABAoGAFijko56+qGyN8M0RVyaRAXz++xTqHBLh
+3tx4VgMtrQ+WEgCjhoTwo23KMBAuJGSYnRmoBZM3lMfTKevIkAidPExvYCdm5dYq3XToLkkLv5L2
+pIIVOFMDG+KESnAFV7l2c+cnzRMW0+b6f8mR1CJzZuxVLL6Q02fvLi55/mbSYxECQQDeAw6fiIQX
+GukBI4eMZZt4nscy2o12KyYner3VpoeE+Np2q+Z3pvAMd/aNzQ/W9WaI+NRfcxUJrmfPwIGm63il
+AkEAxCL5HQb2bQr4ByorcMWm/hEP2MZzROV73yF41hPsRC9m66KrheO9HPTJuo3/9s5p+sqGxOlF
+L0NDt4SkosjgGwJAFklyR1uZ/wPJjj611cdBcztlPdqoxssQGnh85BzCj/u3WqBpE2vjvyyvyI5k
+X6zk7S0ljKtt2jny2+00VsBerQJBAJGC1Mg5Oydo5NwD6BiROrPxGo2bpTbu/fhrT8ebHkTz2epl
+U9VQQSQzY1oZMVX8i1m5WUTLPz2yLJIBQVdXqhMCQBGoiuSoSjafUhV7i1cEGpb88h5NBYZzWXGZ
+37sJ5QsW+sJyoNde3xH8vdXhzU7eT82D6X/scw9RZz+/6rCJ4p0=
+-----END RSA PRIVATE KEY-----';
+        $private = PublicKeyLoader::load($private);
+        $public = $private->getPublicKey();
+
+        $subject = new X509();
+        $subject->setDNProp('id-at-organizationName', 'phpseclib demo cert');
+        $subject->setPublicKey($public);
+
+        $issuer = new X509();
+        $issuer->setPrivateKey($private);
+        $issuer->setDN($subject->getDN());
+
+        $x509 = new X509();
+
+        $result = $x509->sign($issuer, $subject);
+        $result = $x509->saveX509($result);
+
+        $this->assertIsString($result);
+
+        $r = $x509->loadX509($result);
+        $this->assertSame('id-RSASSA-PSS', $r['tbsCertificate']['signature']['algorithm']);
+        $this->assertArrayHasKey('parameters', $r['tbsCertificate']['signature']);
+        $this->assertSame('id-RSASSA-PSS', $r['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['algorithm']);
+        $this->assertArrayHasKey('parameters', $r['tbsCertificate']['subjectPublicKeyInfo']['algorithm']);
+        $this->assertSame('id-RSASSA-PSS', $r['signatureAlgorithm']['algorithm']);
+        $this->assertArrayHasKey('parameters', $r['signatureAlgorithm']);
+    }
+
+    public function testPKCS1Save(): void
+    {
+        $private = '-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQCqGKukO1De7zhZj6+H0qtjTkVxwTCpvKe4eCZ0FPqri0cb2JZfXJ/DgYSF6vUp
+wmJG8wVQZKjeGcjDOL5UlsuusFncCzWBQ7RKNUSesmQRMSGkVb1/3j+skZ6UtW+5u09lHNsj6tQ5
+1s1SPrCBkedbNf0Tp0GbMJDyR4e9T04ZZwIDAQABAoGAFijko56+qGyN8M0RVyaRAXz++xTqHBLh
+3tx4VgMtrQ+WEgCjhoTwo23KMBAuJGSYnRmoBZM3lMfTKevIkAidPExvYCdm5dYq3XToLkkLv5L2
+pIIVOFMDG+KESnAFV7l2c+cnzRMW0+b6f8mR1CJzZuxVLL6Q02fvLi55/mbSYxECQQDeAw6fiIQX
+GukBI4eMZZt4nscy2o12KyYner3VpoeE+Np2q+Z3pvAMd/aNzQ/W9WaI+NRfcxUJrmfPwIGm63il
+AkEAxCL5HQb2bQr4ByorcMWm/hEP2MZzROV73yF41hPsRC9m66KrheO9HPTJuo3/9s5p+sqGxOlF
+L0NDt4SkosjgGwJAFklyR1uZ/wPJjj611cdBcztlPdqoxssQGnh85BzCj/u3WqBpE2vjvyyvyI5k
+X6zk7S0ljKtt2jny2+00VsBerQJBAJGC1Mg5Oydo5NwD6BiROrPxGo2bpTbu/fhrT8ebHkTz2epl
+U9VQQSQzY1oZMVX8i1m5WUTLPz2yLJIBQVdXqhMCQBGoiuSoSjafUhV7i1cEGpb88h5NBYZzWXGZ
+37sJ5QsW+sJyoNde3xH8vdXhzU7eT82D6X/scw9RZz+/6rCJ4p0=
+-----END RSA PRIVATE KEY-----';
+        $private = PublicKeyLoader::load($private)
+            ->withPadding(RSA::SIGNATURE_PKCS1)
+            ->withHash('sha256');
+        $public = $private->getPublicKey();
+
+        $subject = new X509();
+        $subject->setDNProp('id-at-organizationName', 'phpseclib demo cert');
+        $subject->setPublicKey($public);
+
+        $issuer = new X509();
+        $issuer->setPrivateKey($private);
+        $issuer->setDN($subject->getDN());
+
+        $x509 = new X509();
+
+        $result = $x509->sign($issuer, $subject);
+        $result = $x509->saveX509($result);
+
+        $this->assertIsString($result);
+
+        $r = $x509->loadX509($result);
+        $this->assertSame('sha256WithRSAEncryption', $r['tbsCertificate']['signature']['algorithm']);
+        $this->assertSame('rsaEncryption', $r['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['algorithm']);
+        $this->assertSame('sha256WithRSAEncryption', $r['signatureAlgorithm']['algorithm']);
+    }
+
+    public function testLongTagOnBadCert(): void
+    {
+        // the problem with this cert is that it'd cause an infinite loop
+        $x509 = new X509();
+        $r = @$x509->loadX509('-----BEGIN CERTIFICATE-----
+MIIBjDCCATGgAwIBAgIJAJSiNCIEEiyyMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMM
+AkNBMB4XDTE5MDUwOTAzMTUzMFoXDTE5MDYwODAzMTUzMFowDTELMAkGA1UEAwwC
+Q0FNRmt3RXdZSEtvWkl6ajBDQVFZSUtvWkl6ajBEQVFjRFFnQUU4K0R0TDM0Syt0
+RzZGR3o2QXJ2QzlySnlmN1Y5N09wY3ZWeG1IbjRXQStXc0E2L0dxLzZ1cUFBdG5Y
+RDZOQUxsRVVSVFZCcmlvNjB4L0xZN1ZoTmx0UT09o1kwVzAgBgNVHQ4BAf8EFgQU
+25GbjmtucxjEGkWrB2R6AB6/yrkwIgYDVR0jAQH/BBgwFoAU25GbjmtucxjEGkWr
+B2R6AB6/yrkwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNJADBGAiEA6ZB6
++KlUM1ZXFrxtDxLWqp51myWDulWjnK6cl7b5AVgCIQCRdthTn8JlN5bRSnJ6qiCk
+A9bhRA0cVk7bAEU2c44CYg==
+-----END CERTIFICATE-----');
+
+        $this->assertFalse($r);
+    }
+
+    /**
+     * @group github1387
+     */
+    public function testNameConstraintIP(): void
+    {
+        $x509 = new X509();
+        $r = $x509->loadX509('-----BEGIN CERTIFICATE-----
+MIIGcDCCBVigAwIBAgIQRUgJC4ec7yFWcqzT3mwbWzANBgkqhkiG9w0BAQwFADB1MQswCQYDVQQG
+EwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2Vy
+dGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMCAXDTE1
+MTIxNzEyMzg0M1oYDzIwMzAxMjE3MjM1OTU5WjBjMQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMg
+U2VydGlmaXRzZWVyaW1pc2tlc2t1czEXMBUGA1UEYQwOTlRSRUUtMTA3NDcwMTMxFzAVBgNVBAMM
+DkVTVEVJRC1TSyAyMDE1MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0oH61NDxbdW9
+k8nLA1qGaL4B7vydod2Ewp/STBZB3wEtIJCLdkpEsS8pXfFiRqwDVsgGGbu+Q99trlb5LI7yi7rI
+kRov5NftBdSNPSU5rAhYPQhvZZQgOwRaHa5Ey+BaLJHmLqYQS9hQvQsCYyws+xVvNFUpK0pGD64i
+ycqdMuBl/nWq3fLuZppwBh0VFltm4nhr/1S0R9TRJpqFUGbGr4OK/DwebQ5PjhdS40gCUNwmC7fP
+Q4vIH+x+TCk2aG+u3MoAz0IrpVWqiwzG/vxreuPPAkgXeFCeYf6fXLsGz4WivsZFbph2pMjELu6s
+ltlBXfAG3fGv43t91VXicyzR/eT5dsB+zFsW1sHV+1ONPr+qzgDxCH2cmuqoZNfIIq+buob3eA8e
+e+XpJKJQr+1qGrmhggjvAhc7m6cU4x/QfxwRYhIVNhJf+sKVThkQhbJ9XxuKk3c18wymwL1mpDD0
+PIGJqlssMeiuJ4IzagFbgESGNDUd4icm0hQT8CmQeUm1GbWeBYseqPhMQX97QFBLXJLVy2SCyoAz
+7Bq1qA43++EcibN+yBc1nQs2Zoq8ck9MK0bCxDMeUkQUz6VeQGp69ImOQrsw46qTz0mtdQrMSbnk
+XCuLan5dPm284J9HmaqiYi6j6KLcZ2NkUnDQFesBVlMEm+fHa2iR6lnAFYZ06UECAwEAAaOCAgow
+ggIGMB8GA1UdIwQYMBaAFBLyWj7qVhy/zQas8fElyalL1BSZMB0GA1UdDgQWBBSzq4i8mdVipIUq
+CM20HXI7g3JHUTAOBgNVHQ8BAf8EBAMCAQYwdwYDVR0gBHAwbjAIBgYEAI96AQIwCQYHBACL7EAB
+AjAwBgkrBgEEAc4fAQEwIzAhBggrBgEFBQcCARYVaHR0cHM6Ly93d3cuc2suZWUvQ1BTMAsGCSsG
+AQQBzh8BAjALBgkrBgEEAc4fAQMwCwYJKwYBBAHOHwEEMBIGA1UdEwEB/wQIMAYBAf8CAQAwQQYD
+VR0eBDowOKE2MASCAiIiMAqHCAAAAAAAAAAAMCKHIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAMCcGA1UdJQQgMB4GCCsGAQUFBwMJBggrBgEFBQcDAgYIKwYBBQUHAwQwfAYIKwYBBQUH
+AQEEcDBuMCAGCCsGAQUFBzABhhRodHRwOi8vb2NzcC5zay5lZS9DQTBKBggrBgEFBQcwAoY+aHR0
+cDovL3d3dy5zay5lZS9jZXJ0cy9FRV9DZXJ0aWZpY2F0aW9uX0NlbnRyZV9Sb290X0NBLmRlci5j
+cnQwPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL3d3dy5zay5lZS9yZXBvc2l0b3J5L2NybHMvZWVj
+Y3JjYS5jcmwwDQYJKoZIhvcNAQEMBQADggEBAHRWDGI3P00r2sOnlvLHKk9eE7X93eT+4e5TeaQs
+OpE5zQRUTtshxN8Bnx2ToQ9rgi18q+MwXm2f0mrGakYYG0bix7ZgDQvCMD/kuRYmwLGdfsTXwh8K
+uL6uSHF+U/ZTss6qG7mxCHG9YvebkN5Yj/rYRvZ9/uJ9rieByxw4wo7b19p22PXkAkXP5y3+qK/O
+et98lqwI97kJhiS2zxFYRk+dXbazmoVHnozYKmsZaSUvoYNNH19tpS7BLdsgi9KpbvQLb5ywIMq9
+ut3+b2Xvzq8yzmHMFtLIJ6Afu1jJpqD82BUAFcvi5vhnP8M7b974R18WCOpgNQvXDI+2/8ZINeU=
+-----END CERTIFICATE-----');
+        $r = $x509->saveX509($r);
+        $r = $x509->loadX509($r);
+        $this->assertSame($r['tbsCertificate']['extensions'][5]['extnValue']['excludedSubtrees'][1]['base']['iPAddress'], ['0.0.0.0', '0.0.0.0']);
+    }
+
+    /**
+     * @group github1456
+     */
+    public function testRandomString(): void
+    {
+        $a = 'da7e705569d4196cd49cf3b3d92cd435ca34ccbe';
+        $a = pack('H*', $a);
+
+        $x509 = new X509();
+        $r = $x509->loadX509($a);
+
+        $this->assertFalse($r);
+    }
+
+    /**
+     * @group github1542
+     */
+    public function testMultiCertPEM(): void
+    {
+        $a = '-----BEGIN CERTIFICATE-----
+MIILODCCCSCgAwIBAgIQDh0LGipJ++wxFLj8X5MXKDANBgkqhkiG9w0BAQsFADCB
+kDELMAkGA1UEBhMCVVMxDTALBgNVBAgTBFV0YWgxDTALBgNVBAcTBExlaGkxFzAV
+BgNVBAoTDkRpZ2lDZXJ0LCBJbmMuMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29t
+MS8wLQYDVQQDEyZEaWdpQ2VydCBWZXJpZmllZCBNYXJrIEludGVybWVkaWF0ZSBD
+QTAeFw0yMDA3MzAwMDAwMDBaFw0yMTAxMjUxMjAwMDBaMIIBDjEdMBsGA1UEDxMU
+UHJpdmF0ZSBPcmdhbml6YXRpb24xEzARBgsrBgEEAYI3PAIBAxMCVVMxGTAXBgsr
+BgEEAYI3PAIBAhMIRGVsYXdhcmUxEDAOBgNVBAUTBzM2MzMwMTkxGTAXBgNVBAkT
+EDEwMDAgVyBNYXVkZSBBdmUxDjAMBgNVBBETBTk0MDg1MQswCQYDVQQGEwJVUzET
+MBEGA1UECBMKQ2FsaWZvcm5pYTESMBAGA1UEBxMJU3Vubnl2YWxlMR0wGwYDVQQK
+ExRMaW5rZWRJbiBDb3Jwb3JhdGlvbjESMBAGCisGAQQBg55fAQMTAlVTMRcwFQYK
+KwYBBAGDnl8BBBMHNTY3NTczOTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAOCl7WccAcvSaf5+pNsV82VjFuwdzEwjDYESZmIuurz95e+JtJZst/M3Hw90
+YxKSDV4LdaVFAogXy2F+Npit1KhbBEb8vbBkm4LJ3iM8teE/10JugLyxrcVi3LSj
+iKHs+rqxcTJsVYoR+CuPLuAbu4xKi+xQ4tVafrFd0Y21n6OL8nB2SRISHF58kRXq
+UDW/NippF1AhcdCc5L5EmXFPCpyWfv+UXgTj9i+/I9AWUC3diHckb5NXd/wS7Jmq
+5FE0uixRGTixI5a9uZr0jasTtfhlVtvqFyDmzARB/q9IU0eXm3dtcCJISIXGum6o
+yCFUk8pyYsGd/M5Fyw7zbmEqsucCAwEAAaOCBgswggYHMB8GA1UdIwQYMBaAFOsN
+zmX0UnV7TbPUsz0w41AYq+NuMB0GA1UdDgQWBBSkuL0+t0wu/+y2xkUY/FOSsiuV
+ODAXBgNVHREEEDAOggxsaW5rZWRpbi5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAx8w
+gZkGA1UdHwSBkTCBjjBFoEOgQYY/aHR0cDovL2NybDMuZGlnaWNlcnQuY29tL0Rp
+Z2lDZXJ0VmVyaWZpZWRNYXJrSW50ZXJtZWRpYXRlQ0EuY3JsMEWgQ6BBhj9odHRw
+Oi8vY3JsNC5kaWdpY2VydC5jb20vRGlnaUNlcnRWZXJpZmllZE1hcmtJbnRlcm1l
+ZGlhdGVDQS5jcmwwUAYDVR0gBEkwRzA3BglghkgBhv1sCgEwKjAoBggrBgEFBQcC
+ARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAMBgorBgEEAYOeXwEBMF4G
+CCsGAQUFBwEBBFIwUDBOBggrBgEFBQcwAoZCaHR0cDovL2NhY2VydHMuZGlnaWNl
+cnQuY29tL0RpZ2lDZXJ0VmVyaWZpZWRNYXJrSW50ZXJtZWRpYXRlQ0EuY3J0MAwG
+A1UdEwEB/wQCMAAwggOsBggrBgEFBQcBDASCA54wggOaooIDlqCCA5IwggOOMIID
+ijCCA4YWDWltYWdlL3N2Zyt4bWwwIzAhMAkGBSsOAwIaBQAEFGckN8uhuoNkcXXh
+wRAm7wkz4JRLMIIDThaCA0pkYXRhOmltYWdlL3N2Zyt4bWw7YmFzZTY0LEg0c0lB
+QUFBQUFBQUNsMVR5MjdiTUJDODl5c0k5VXlhKytLanNITElJVWlCRnVqSjkxUlJR
+cUdLSGNTQ25PYnJ1NVRVQkMwTVNKN2w3SEozZHJRL3o0OW03bC9PdytuWU51Q3dN
+YTlQNC9IY05tV2Fuci9zZHBmTHhWM0luVjRlZCtpOTN5bS9NWmZoZmlwdEUySm9U
+T21IeHpKdFlCNzZ5L1hwdFcyODhVWWpab24rdkR2M1AxNU9EOFBZdDgwMEhIL2I1
+M056dForR2FleXZ2ZzNIWC8zOTErTit0K0w5ODkxVWpITEh0dm5zWTB6WFd1Ryti
+YjVMQkJkek5vR2NSTHdGenk1NzdpeWk4eHlzUXdETDNnR2dnZWlZWTBYczJWQjJu
+T0ZRODFQb0hBcVltaFBGUUhLRXVSTDBIdk5CbHhBTGgrQlNsazZwb0R3VXJnUU1i
+R3QxcVVBazJwVjlBRS9PQitxc0k1S2xwUlN0cG5GSWxSSlo3RWVDZHZQVzdQNmQ5
+T2JtWmgwVFdGd01ZakJrNXlHVnBFc0pNbU1BUjVHS1hmRmhPMzU3cWwwbnNFRGVl
+Y29kQmcyVFZVblFjSFJBYkJBMHRDTGRpTDQ4OHRrdVVkZzRkbzF1SExzRlY0cjlD
+Q3BsMXRJeDZKemVnMFZ4T2RGeUFTODhMMm03WU1sNnl1QkN5bVpycnNUb2N1YVpS
+S094YUZhUXV5UTZGNXJ0cGI3UnUxd1N0SXdPcVV2NkZORjRWdFVqR1dGdEp2NUZn
+S3p5d3d4TWprUnVXZFFBZEdEZEJqSjIzdXJGVEdvT0liU3FHRUZhNjc0RGJUQkg0
+eTBuOVFBWjBqWHE2WVpDckhZNmlGYlI3cXYwa04rVi8zK0RIdXB2WFdLQXJNcWdF
+YThWTXBXbytXRkdVcURPVWkxVXh3M3BJR20yUzZ4VXgyU0FlVUc2V2xGVDUvVnN0
+S3FkVitlcWtwNHFTTHFnQlJTcmpnRzFTTlRCb0pETE10ZWpHTWEwT0hyNVg3Q3VZ
+cXlPaC9WMFhwNjNJWUxTMTl4YUtlZGx0UHFsWDMzNkEwYlJhNW9nQkFBQTCBigYK
+KwYBBAHWeQIEAgR8BHoAeAB2AFVZU64wlgCAbNLrUgimyZ6TGCisEFa0QhxVNhVM
+X3WsAAABc6DTF3wAAAQDAEcwRQIgRsnN1miYsyCMT234C14MaMgSAgKHXmc7RrBM
+a/1ovTMCIQCOc/THDvltzhZrtnoRSbjc2EYp57A0VVHvduQPa7FKBDANBgkqhkiG
+9w0BAQsFAAOCAgEA8UQt5jcUeOaDkhvbLq380Oq1Jy8Vr1BO1GPisn20KRCz/NvE
+56f8hhmZlZ1xXfOM+JCaGQnwVwcRBQtLQ/+6bmeT8/WM3hf9A5rP0g0ZxvaAlQtu
+e6UjvgnNx02QOKNPrmxN0rW8s24kUi0OAf1ump3SY5Ab+S+ywRG7Ah+3qch+FwA8
+CYau9TgV5kvfYDRULBM84EeFhsPcwT+YJ5u7RvkGQobqNao21Ti5tupiks/9NzI8
+splBS77Z6bPdFGvZ7pJdXiiDB2+SZdyv8iqDFM6mKRbOcuwAHcTY2zVhcS46H7SO
+8OU7L/2y0XQB1rMtQDarCKwdAcsAb2e+N8mYQ0glQX4k41Sf4saMXsU1EjnOCUas
+YxvVgJRD+fe4JWf8EO59fElzkrQsT3guBIzV5Kg1dYaCHngCYQIakjKQM0eKxZ3d
+vn4648A0vXynhJUThOSxN4jbvVA5uYYHqHDMjJtkBPDA7HtLSIxRNattshOAoeC5
+LMszAsL9th/WoXkAa2lTs2kashOHEpx+ncGactrL8tu7dvU01Yk6yP1QAjFEo1Nt
+8umUG7jQQIuquB2ry4qzFuQvKpbNQZ//9RsSmq1nni+DEKd/S63N7T8M0FpioLVm
+Z2OXFTCG5ORjPUOyMGjxzjEPZWmTOG+gqNOc0HKXbuBAsGZbK4dind+YdZE=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIHLzCCBRegAwIBAgIQDZXVhKBTvJ0ZjW6meNxHhTANBgkqhkiG9w0BAQsFADCB
+iDELMAkGA1UEBhMCVVMxDTALBgNVBAgTBFV0YWgxDTALBgNVBAcTBExlaGkxFzAV
+BgNVBAoTDkRpZ2lDZXJ0LCBJbmMuMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29t
+MScwJQYDVQQDEx5EaWdpQ2VydCBWZXJpZmllZCBNYXJrIFJvb3QgQ0EwHhcNMTkw
+OTIzMTIyNTQyWhcNMzQwOTIzMTIyNTQyWjCBkDELMAkGA1UEBhMCVVMxDTALBgNV
+BAgTBFV0YWgxDTALBgNVBAcTBExlaGkxFzAVBgNVBAoTDkRpZ2lDZXJ0LCBJbmMu
+MRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMS8wLQYDVQQDEyZEaWdpQ2VydCBW
+ZXJpZmllZCBNYXJrIEludGVybWVkaWF0ZSBDQTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAPfhMd+2RBjNZpqq0GVUF0kKK72fQxhJbnxgYv7GFpmi69sX
+dgeqH9RE07ShTDtkLks9G/GuiXsLEmjSCBDDTwfB3hpbdrZsNQFWOIRHXmU8ykuP
+bCd/HVRZGULeWvbt93deEB1el5MpxP9Fs3LKjw7xytbuM/nkGJ4D2R1IHC953FoU
+4BYsp+8VB1+7Gh8eKVh+HpmBeEfIB+cuq4FpZKxi+F5J7UjW5yO4SuDcTF4AMY0J
+DPuKIy+Og6laNOtDS30P1CUu1N6BwLMYTbeqyYHJ7B3kLWsDceGMqIcxo8zrk1rT
+sJctcXHXhB4k2PnVxt8qkQjg2Lo++kU0dFSUyrzvg3WrGypv9vphWMI+vmCjmu2K
+0BZLZ4nKshoTX495R6pGbsecGaaGgACB/1NcGI7PVp7spY2ytLvHHZ+Hh446BGFy
+AdM8lZCMXEhNftP8RRRVr8mwHHzyIa86r4yk0SkOlXUkNrGdTqqyMSDJ3W7DWGO/
+vCObzXiM0aq77ebD/0fE5LsZhEJYx7txF9NA1DoICgHp8zqF35i3UOp4+5IyJ8A9
+MjqYcX+LayH06B45bMgTHLmJKcsRYvXAtu+nIvIL0fk4+Ea7kJ7MNx5/udS89b2f
+vSFC4hmA3OBDiJqGmldwqJL/HP7RI8O54yj10vpiH4obDo8QgfhKSVoX5HwDAgMB
+AAGjggGJMIIBhTAdBgNVHQ4EFgQU6w3OZfRSdXtNs9SzPTDjUBir424wHwYDVR0j
+BBgwFoAU7G8ipLME4sFjh+Z3Y+pGaU7u/OswDgYDVR0PAQH/BAQDAgGGMBMGA1Ud
+JQQMMAoGCCsGAQUFBwMfMBIGA1UdEwEB/wQIMAYBAf8CAQAwfAYIKwYBBQUHAQEE
+cDBuMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wRgYIKwYB
+BQUHMAKGOmh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFZlcmlm
+aWVkTWFya1Jvb3RDQS5jcnQwSAYDVR0fBEEwPzA9oDugOYY3aHR0cDovL2NybDMu
+ZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VmVyaWZpZWRNYXJrUm9vdENBLmNybDBCBgNV
+HSAEOzA5MDcGCWCGSAGG/WwKATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5k
+aWdpY2VydC5jb20vQ1BTMA0GCSqGSIb3DQEBCwUAA4ICAQA6v371ixHAA9WyGlFr
++RvmmqkZZg9pf6+j5sKImeTFAHfYz3TJa2wmDRpZxSRYy9VUFOMPVDEavsJ2i5Ua
+jEpkJ/7VHbX60joKBxQHKCbMpbwGen6pTXRaeE6CET2zCMbyiIqT2E6OiBZL8cWT
+sgLbdhVKspoOi+c3JwTR4khR24J9IQVxK90Nq3zeciYgBvM3G+ZJtZgkA58CRdex
+xVO6O57bwe4ti4rlRgWOGgAFpFrJSD1jqhhHD3MWg17NI4k0ciBPoDHHBAI8hiqg
+jPM+y6aEGww7BFSfkp5tl/Aq9uGXCwxNLOc3UlUd8Cc0qH1KfkvjrumVMmJhsk9I
+88YefbCuGPZ5Q8V2LIz7LrNDh0VRq/HSENXn1sBGlAFahgUTk/cWJ8nKA+8mHMlE
+NGmx205Rtbf9lVL1CbH3QFwlvGEfqoMXw6G9JW2hFQVTKpBKuzjQw43CEw12lstP
+oa96ixNAXXVGJsdKpYCqTIWJ0x1DssvG2shvzdHxawvYQ3C+/jaEoQ6bxSIdanI2
+NMtBdy9Q0TjDc7uf/eaUYKkP4wskNc1Os23oHllFHVm++8wdDltNulc7B1TXIQ+2
+oD5EoULMFSVUHX8gtyd463GgOQtBDwf3aZ4Xe6eDrhdfI/4IW098kVcg+qFO841L
+qzFkAKWjJj4KjfrbZX4C0Spfxw==
+-----END CERTIFICATE-----';
+
+        $x509 = new X509();
+        $r = $x509->loadX509($a);
+
+        $this->assertIsArray($r);
+    }
+
+    /**
+     * @group github1586
+     */
+    public function testComputeKeyIdentifier(): void
+    {
+        $key = RSA::createKey(512);
+        $key = ASN1::extractBER("$key");
+        $key = ASN1::encodeDER($key, ['type' => ASN1::TYPE_BIT_STRING]);
+        $key = new Element($key);
+
+        $x509 = new X509();
+        $this->assertIsString($x509->computeKeyIdentifier($key));
+    }
+
+    /**
+     * @group github1665
+     */
+    public function testImplicitV1(): void
+    {
+        $x509 = new X509();
+        $r = $x509->loadX509('-----BEGIN CERTIFICATE-----
+MIIDZDCCAkwCCQDIda+OHQTFSTANBgkqhkiG9w0BAQsFADB0MQswCQYDVQQGEwJE
+RTEMMAoGA1UECAwDc2RmMQ4wDAYDVQQHDAVzZ3J3ZTEOMAwGA1UECgwFZXJncmUx
+DDAKBgNVBAsMA2VyZzEMMAoGA1UEAwwDd3JnMRswGQYJKoZIhvcNAQkBFgxqYWRm
+c0BzZGYuZGUwHhcNMjEwNTI2MTIxMTQwWhcNMjIwNTI2MTIxMTQwWjB0MQswCQYD
+VQQGEwJERTEMMAoGA1UECAwDc2RmMQ4wDAYDVQQHDAVzZ3J3ZTEOMAwGA1UECgwF
+ZXJncmUxDDAKBgNVBAsMA2VyZzEMMAoGA1UEAwwDd3JnMRswGQYJKoZIhvcNAQkB
+FgxqYWRmc0BzZGYuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCy
+Cdw2oh1mLuMq9icQWkv1Sgt1p4RhwAeiYcqo/lm0VAf3LjPDDCccXmwFUEQJ2g8r
+UPmvazT0IaYytsPGlNCS2nA+OyY/NBySpBcksiQHEfmrW04/jsoJ2oql+BCWkGsF
+dAewCWpzvL8RZxoKYlZwBfvyDn4QFn1TsuCxnHdKvrcpvzaQcfBcJT8P39TFTlUc
+mBoa3Y/iIULlvwk3w+1LjY7gnNDqNyGaOSZpfpliTxwvIK/PJbStD0srT+voSPZW
+4Xt1oOxqmdFvTL+6H6xT/HrEfwtN/+bU1ZmY23Kcq21sczy4dvglrnPqmRUVjoL8
+qs/qT8GNZmvZxB5dLXbfAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAH5ciSY+dD+H
+CmnMHmZwyE1q3QifO/qiygNeosnth6dYI+JxR9aAJKB6vnBQl3IReeoniaSH/iaH
+DthLeo0haSb5d3P911wPmw3gut7ungnQ1X/HHroDL6UASj+x2Dux04w7Q3YNyqGT
+OObFmWs68kxLV3V0TDYNjz+nU4wVqFDKlehdoDm4Q/uq2FIRbU/qWS61sxI/s+Pg
+42cGvzZe673OZgtOIDuRo/8Ahe/Vc285nbuMRMTWIs9e5fGSW8b6gVmKhBUmIFGj
+bMgrc775Q3t4hkitEymosEiqHsj7YM6EpgHZwke+CNdybIUw+u9L3xxOl4mEeY6l
+itRo91vT68U=
+-----END CERTIFICATE-----');
+        $this->assertSame($r['tbsCertificate']['version'], 'v1');
+    }
+
+    /**
+     * @group github1657
+     */
+    public function signWithEncryptedPSS(): void
+    {
+        $private = PublicKeyLoader::load('-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIBvTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIpZHwLtkYRb4CAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAECBBCCGsoP7F4bd8O5I1poTn8PBIIB
+YBtM1tgqsAQgbSZT0475aHufzFuJuPWOYqiHag8OUKMeZuxVHndElipEY2V5lS9m
+wddwtWaGuYD/Swcdt0Xht8U8BF0SjSyzQ4YtRsG9CmEHYhWmQ5AqK1W3mDUApO38
+Cm5L1HrHV4YJnYmmK9jgq+iWlLFDmB8s4TA6kMPWbCENlpr1kEXz4hLwY3ylH8XW
+I65WX2jGSn61jayCwpf1HPFBPDUaS5s3f92aKjk0AE8htsDBBiCVS3Yjq4QSbhfz
+uNIZ1TooXT9Xn+EJC0yjVnlTHZMfqrcA3OmVSi4kftugjAax4Z2qDqO+onkgeJAw
+P75scMcwH0SQUdrNrejgfIzJFWzcH9xWwKhOT9s9hLx2OfPlMtDDSJVRspqwwQrF
+QwinX0cR9Hx84rSMrFndxZi52o9EOLJ7cithncoW1KOAf7lIJIUzP0oIKkskAndQ
+o2UiZsxgoMYuq02T07DOknc=
+-----END ENCRYPTED PRIVATE KEY-----', 'demo');
+
+        $subject = new X509();
+        $subject->setDNProp('id-at-organizationName', 'phpseclib demo cert');
+        $subject->setPublicKey($private->getPublicKey());
+
+        $issuer = new X509();
+        $issuer->setPrivateKey($private);
+        $issuer->setDNProp('id-at-organizationName', 'phpseclib CA cert');
+
+        $x509 = new X509();
+        $x509->sign($issuer, $subject);
+    }
+
+    /**
+     * @group github1676
+     */
+    public function testMalformedExt(): void
+    {
+        $a = '-----BEGIN CERTIFICATE-----
+MIIDtjCCAmmgAwIBAgIUOynecffcNv1/7oqCfu98x899PhwwQgYJKoZIhvcNAQEK
+MDWgDTALBglghkgBZQMEAgGhGjAYBgkqhkiG9w0BAQgwCwYJYIZIAWUDBAIBogMC
+ASCjAwIBATAcMRowGAYDVQQKDBFwaHBzZWNsaWIgQ0EgY2VydDAeFw0yMTA2MjUw
+MTQ1MjlaFw0yMjA2MjUwMTQ1MjlaMBwxGjAYBgNVBAoMEXBocHNlY2xpYiBDQSBj
+ZXJ0MIIBVzBCBgkqhkiG9w0BAQowNaANMAsGCWCGSAFlAwQCAaEaMBgGCSqGSIb3
+DQEBCDALBglghkgBZQMEAgGiAwIBIKMDAgEBA4IBDwAwggEKAoIBAQCm8w3WEr4t
+rbTaAHLI4uAGkZ5mJG8tgThw/qlADPZODjyJtNBZ1i39URXkHa4jdTfLMaCg8aWp
+6eouRnNftUktmM4lG3j1JF6Cq2SkF93zJ2RZq3Ldpnv1jXS9qmtsndSzElria6f7
+qY3c63S0YFYvNLmMd5lECPYuS3fj0DcPp1Gyy1GnfjSu6OyP34gtjOpZ3bSQmpTg
+78HllRZiq6vQIAw6Svoi4Ih573PGRjVHbh/KP5/4gP0ClW+qGjR+qJinmBSOISRU
+RSP3Yqh1eSo/gdqOfe+8g7ffTdsZ77xzP2nwq9wsmSyFh/jbQyG05R1cC0zGfBdo
+3sDkSw5KDMQzAgMBAAGjUTBPMAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8EBTADAQH/
+MB0GA1UdDgQWBBTsxDp1d394JKfAJZOuA9YQSvtvWjAQBggrBgEFBQcBAQEB/wQB
+ADBCBgkqhkiG9w0BAQowNaANMAsGCWCGSAFlAwQCAaEaMBgGCSqGSIb3DQEBCDAL
+BglghkgBZQMEAgGiAwIBIKMDAgEBA4IBAQCF8DNkkP5z2mkHoo0SvoUpscbaSpXF
+jjMpLsQwdhar1jbrEIEQpSGsZlmxpGroBj91wQLjJv7godfFC6b2T4cRcj5NZAEI
+ZyoxrfZ0WU609ZAKFooYwEA2nLAG8Y4ygD5adT45MhmqKs79p4uaG5Z78zQrkUYY
+d9BtBm0pyZ513s+KW/keUxVKlHnnxdV9FIis0S/d74mjass4YjPZcWnss6TBfIyD
+EbQ5UK6Zu74q0lQLp7t14zSQ2B5tclVnM7jY0RiRzpLgDCq3kpbaw6KvFzH9lfPP
+BbNA6tFZAwLoX18R6yEmzHAQ+R2Eliiaz7mgQ+M2d0ec6qQJFoO7aJsX
+-----END CERTIFICATE-----';
+
+        $x509 = new X509();
+        $r = $x509->loadX509($a);
+
+        $this->assertIsArray($r);
+    }
+
+    public function testWildcardCert(): void
+    {
+        $cert = '-----BEGIN CERTIFICATE-----
+MIIKqDCCCZCgAwIBAgIQAZ3dCTUFVNcaZ4TM/m6DFTANBgkqhkiG9w0BAQsFADBY
+MQswCQYDVQQGEwJCRTEZMBcGA1UEChMQR2xvYmFsU2lnbiBudi1zYTEuMCwGA1UE
+AxMlR2xvYmFsU2lnbiBBdGxhcyBSMyBEViBUTFMgQ0EgMjAyMyBRMzAeFw0yMzA5
+MTIxOTM4MDVaFw0yNDEwMTMxOTM4MDRaMBIxEDAOBgNVBAMMB2Nubi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDsZniL9RpV7hDYPJvS4TGa39w5
+BLHGsPhi4lV4HVtyIme0/NMMmszIeNoY+aaDSM2dn0gw29GIq1prZSAQK8BgDU6a
+otU5mWG8J+xABnn75DQ1BHjXZFl4EfjL4mIhMaVY34O+0wG06owvFDUgxRzYnwlb
+y6WEJfTRyv70MF6EIq0zZxW2cMgfyuq8ZEtgYddSr4I/2/xVxACBUDFYNqYbr9AR
+qmJKvzglrSYULaBJ84oY3RnBnDCVUkMW3qYT1mIDop+Jz4wLyMyvHq0QA0wY/BhI
+ByhJTkdQy7xH2N8O2MohQmaVo6x6w01cqsZyIHND1JSL3lAJiMtU8aMl3+edAgMB
+AAGjggeyMIIHrjCCBGcGA1UdEQSCBF4wggRaggdjbm4uY29tgg0qLmFwaS5jbm4u
+Y29tggwqLmFwaS5jbm4uaW+CHSouYXBpLmVsZWN0aW9udHJhY2tlci5jbm4uY29t
+ghYqLmFwaS5wbGF0Zm9ybS5jbm4uY29tghAqLmFyYWJpYy5jbm4uY29tghQqLmFy
+dGVtaXMudHVybmVyLmNvbYIPKi5ibG9ncy5jbm4uY29tghgqLmNsaWVudC5hcHBs
+ZXR2LmNubi5jb22CCSouY25uLmNvbYIIKi5jbm4uaW+CDyouY25uYXJhYmljLmNv
+bYIOKi5jbm5tb25leS5jb22CESouY25ucG9saXRpY3MuY29tghYqLmNvbmZpZy5v
+dXR0dXJuZXIuY29tghEqLmRhdGEuYXBpLmNubi5pb4IRKi5lZGl0aW9uLmNubi5j
+b22CFyouZWRpdGlvbi5pLmNkbi5jbm4uY29tghwqLmVkaXRpb24uc3RhZ2UubmV4
+dC5jbm4uY29tgh0qLmVkaXRpb24uc3RhZ2UyLm5leHQuY25uLmNvbYIdKi5lZGl0
+aW9uLnN0YWdlMy5uZXh0LmNubi5jb22CEyouZWxlY3Rpb25zLmNubi5jb22CGSou
+ZWxlY3Rpb250cmFja2VyLmNubi5jb22CDCouZ28uY25uLmNvbYIPKi5pLmNkbi5j
+bm4uY29tghYqLm1hcmtldHMubW9uZXkuY25uLmlvgg8qLm1vbmV5LmNubi5jb22C
+DioubmV4dC5jbm4uY29tghYqLm9kbS5wbGF0Zm9ybS5jbm4uY29tgg8qLm91dHR1
+cm5lci5jb22CEioucGxhdGZvcm0uY25uLmNvbYIfKi5zZWN0aW9uLWNvbnRlbnQu
+bW9uZXkuY25uLmNvbYIUKi5zdGFnZS5uZXh0LmNubi5jb22CFSouc3RhZ2UyLm5l
+eHQuY25uLmNvbYIVKi5zdGFnZTMubmV4dC5jbm4uY29tghEqLnN0ZWxsYXIuY25u
+LmNvbYIUKi50ZXJyYS5uZXh0LmNubi5jb22CECoudHJhdmVsLmNubi5jb22CEyou
+d3d3LmkuY2RuLmNubi5jb22CD2FwaS5ldHAuY25uLmNvbYIWY2xpZW50LmFwcGxl
+dHYuY25uLmNvbYINY25uYXJhYmljLmNvbYIMY25ubW9uZXkuY29tgg9jbm5wb2xp
+dGljcy5jb22CDWRjZmFuZG9tZS5jb22CHGdyYXBocWwudmVydGljYWxzLmFwaS5j
+bm4uaW+CFGkuY2RuLnRyYXZlbC5jbm4uY29tghlwcmV2aWV3LmRldi5tb25leS5j
+bm4uY29tghhwcmV2aWV3LnFhLm1vbmV5LmNubi5jb22CGXByZXZpZXcucmVmLm1v
+bmV5LmNubi5jb22CG3ByZXZpZXcudHJhaW4ubW9uZXkuY25uLmNvbYIacHJldmll
+dzIucmVmLm1vbmV5LmNubi5jb22CD3VuZGVyc2NvcmVkLmNvbTAOBgNVHQ8BAf8E
+BAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB0GA1UdDgQWBBT9
+Fy8eFhWRk9UjmQVNdVD8lZEhFTBXBgNVHSAEUDBOMAgGBmeBDAECATBCBgorBgEE
+AaAyCgEDMDQwMgYIKwYBBQUHAgEWJmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29t
+L3JlcG9zaXRvcnkvMAwGA1UdEwEB/wQCMAAwgZ4GCCsGAQUFBwEBBIGRMIGOMEAG
+CCsGAQUFBzABhjRodHRwOi8vb2NzcC5nbG9iYWxzaWduLmNvbS9jYS9nc2F0bGFz
+cjNkdnRsc2NhMjAyM3EzMEoGCCsGAQUFBzAChj5odHRwOi8vc2VjdXJlLmdsb2Jh
+bHNpZ24uY29tL2NhY2VydC9nc2F0bGFzcjNkdnRsc2NhMjAyM3EzLmNydDAfBgNV
+HSMEGDAWgBTtoOYBBT40ghqkT1/FvRFBqt/zYTBIBgNVHR8EQTA/MD2gO6A5hjdo
+dHRwOi8vY3JsLmdsb2JhbHNpZ24uY29tL2NhL2dzYXRsYXNyM2R2dGxzY2EyMDIz
+cTMuY3JsMIIBfgYKKwYBBAHWeQIEAgSCAW4EggFqAWgAdQDuzdBk1dsazsVct520
+zROiModGfLzs3sNRSFlGcR+1mwAAAYqK5qvdAAAEAwBGMEQCIE08u4H1qqO/W1OP
+YxuxGftmdYvpngZDDBIKPJtwCB1qAiBjpQIgGnsX7H5wVWzxZtpff+gB6a9V+VGx
+YY6hTg5eSAB2AD8XS0/XIkdYlB1lHIS+DRLtkDd/H4Vq68G/KIXs+GRuAAABiorm
+rCoAAAQDAEcwRQIhAKgfE42oSB7890qz2OJXfydLzubHcsHtPNbO43Z3IsczAiBX
+bvuajpVoxMlYmMHhiVS4/qF9Wd1nACXQBy3KaTen8AB3AHb/iD8KtvuVUcJhzPWH
+ujS0pM27KdxoQgqf5mdMWjp0AAABiormrGkAAAQDAEgwRgIhAOCBs1ExXErb1s3+
+mI53aclpYutFJSWHmbnxbw5lULlEAiEAsrJQzWT2E4w5xcoeC0Zt+nMubTJG2BG7
+2KKQnHPiNlswDQYJKoZIhvcNAQELBQADggEBAGMUNah4Pw60DYWQbtlH0jFYdvNM
+s+Vsh27OQEYbhE2itGWs0JvvQUDst7Y+jMHPre5NZtdmr1RnmQFoVofTvwxQxtJ4
+VOqJfh2X1LTv4VrZI9m6lBLN729CDO/TKeVP9hiflVqe7faAXT8KBEFwPWE5If+z
+VqSx3vPmDx+RM7OXYrVzhEmhVVjRq7yANUF+oxW64zK4zsNzYGUAyp1gmInaXKN5
+XSRklj10ZrVHcd0XLuAME/9+54Bm7TvRfI46hfCfu6FbQPIX3gg+5j+MZJSdIuQJ
+dzXhMVAQYlpu27381/Ts2SuDx6v/cZ8lV8D5o/xTtCpWAnLxM2bxSyVnYbk=
+-----END CERTIFICATE-----';
+
+        $x509 = new X509();
+        $cert = $x509->loadX509($cert);
+
+        $this->assertTrue($x509->validateURL('https://asdf.cnn.com/'));
+        $this->assertFalse($x509->validateURL('https://asdf.cnn2.com/'));
+    }
+
+    /**
+     * @group github1943
+     */
+    public function testWeirdCharsCert(): void
+    {
+        $cert = '-----BEGIN CERTIFICATE-----
+MIIDtTCCAp2gAwIBAgICECEwDQYJKoZIhvcNAQELBQAwYzELMAkGA1UEBhMCVVMx
+ITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
+RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0xNjAyMDcx
+NzI0MDBaFw0yNDAxMDYwNjQ0NThaMHkxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJD
+QTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4x
+GDAWBgNVBAsTD0dvb2dsZSBSZXNlYXJjaDEVMBMGA1UEAxQMKi5nb29nbGUuY29t
+MIIBIDANBgkqhkiG9w0BAQEFAAOCAQ0AMIIBCAKCAQEAxUWTaM/RKjoA8urhPYXr
+Nh2Oz9HA88XkFIxhD3pm80wBlTTTnymSJJVWKpEJO7OyengVFRIv7U19VAFd8VCh
+TCiFl7a4hsiWWQi3zh/NYgj0BnweNriblknBKTze6te1DP8otZ22qBUmhCR27aER
+MWE9urWLwMIuJN/hxK234MljS9lBB3fv52RrZzSftga/P5zK34ZOlbnGcLbtoKR3
+p0uWakBZM8u/665hQ4u4+YkA2kJy5YSF6wXpYKl29/mj1w9ODJTUFj3KmliiGXeo
+2IhYLu4Pq52D7OKjDvKZRKK6tOM8Pii1c310ljlCewCuF/Oy/ygbNmaJG7J8/jTA
+pwIBA6NfMF0wDAYDVR0TAQH/BAIwADANBgNVHREEBjAEggJhKzAdBgNVHQ4EFgQU
+Zd/yRfldVXIxnAKzGaO6vZrb2XswHwYDVR0jBBgwFoAU4J1tAjJyIZ/+BvOatp4W
+N1Fo5MMwDQYJKoZIhvcNAQELBQADggEBAAcwSIxKQegRqCs7adDb3VbqP1Ld0dA6
+FydwendbN1P4NaqqdM89NhpOVZ5g60eM4sc08m5oZIMWqjwp3Gyf2pqM2FMQ02zi
+1lMRb+t9rtjtZXCdcTjuwySYXw7M7NM0Lxhv7yN9+Vben1RTBWFghk8y4t6sai5L
+68hFu+fkQzKIpHE/9cdBS+rtqyCrNit3kvqVhVpGECTS2flTBHnCe7mINojSTOsB
+JYhGgW6KsKViE0hzQB8dSAcNcfwQPSKzOd02crXdJ7uYvZZK9prN83Oe1iDaizeA
+1ntA2AzsC0OGg/ekAnAlxia3mzcJv0PgxRpSG7xjWSL+FVFTTs2I/wk=
+-----END CERTIFICATE-----';
+
+        $x509 = new X509();
+        $cert = $x509->loadX509($cert);
+
+        $this->assertFalse($x509->validateURL('https://aa'));
+    }
+
+    public function testLargeInteger(): void
+    {
+        // cert has an elliptic curve public key with a specified curve (vs a named curve) with
+        // an excessively large integer value
+        $cert = file_get_contents(__DIR__ . '/mal-cert-01.der');
+
+        $x509 = new X509();
+        $x509->loadX509($cert);
+        $this->expectException(\RuntimeException::class);
+        $x509->getPublicKey();
+    }
+
+    /**
+     * @group github2051
+     */
+    public function testRSACertWithECSDASig()
+    {
+        // a secp256r1 key
+        $CAPrivKey = PublicKeyLoader::load('-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgYZs/Y9XurjuN8SQ5
+7Fyy1mTgHjFsdt0/3mOH7pfUbh6hRANCAASnmS1cmSu9dHOYrBg9aJRBs3PLPK62
+u0s8T1gmnGIpKMyrHC3Sh6V2UczDODqpMXYiAsP6iPhiaq/3MmuhA0UA
+-----END PRIVATE KEY-----');
+        $CAPubKey = $CAPrivKey->getPublicKey();
+
+        $CASubject = new X509();
+        $CASubject->setDNProp('id-at-organizationName', 'phpseclib CA cert');
+        $CASubject->setPublicKey($CAPubKey);
+
+        $CAIssuer = new X509();
+        $CAIssuer->setPrivateKey($CAPrivKey);
+        $CAIssuer->setDN($CASubject->getDN());
+
+        $x509 = new X509();
+        $x509->setEndDate('lifetime');
+        $x509->makeCA();
+        $result = $x509->sign($CAIssuer, $CASubject);
+
+        // a 2048-bit private key
+        $privKey = PublicKeyLoader::load('-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDCgThSXWv0segP
+h6PkuQOp8Hl7vB/M6KBrpY+igKOG5IbXO6Fkhw/1nmgswa4tUu9b8Co9/HPDX/0X
+owHoZuriLQluPdFAl9TJsiL4Etjui/vCzmvtAHlC6N8MjhpXJj/1gdX3sEwhTfnw
+zAqQrR7SxIcoX4zHxHfQxsbR9my6x4HYSKVOEmJtDcTenaDXVqrHfzsc7FIAouSd
+UL2TxrgalyrKZce50iF/1SoXLvD0XxXgJZhVkMzcsycNMf4a5+xDQOaAl31DeSYT
+/x2CamRVBE3F+Tg1cegXBm6Dxhl5+TXgAhduFlBqlp8BMGlpE2lDdNpBYbDKGJs7
+LMdV+pN7AgMBAAECggEADHgvTax6ks3jBDfcbHnl/7uQdjvJyB+zxSLwkejwUuIM
+uPi0MJcuET+OCyyBh5tVCA5eDupD26coOR80rJsIfOaJP72L0DnLpQCcGE5RBP4J
+zmRAbAnHPGBkiFAF5Udo+0rPFlmBj/MJToQuOzc2DioWRiLWCiqQydwse+Jx9wld
+rJQ5WJfDGWV1T4nm88uzCDoMST6/7drwXNtyAEUHglcxnTj76t5AJ9YfI6FTiK64
+8tTjBr2f7D0uTsCw7ueDynNTTwGIvyH1UaLTfrdTq/Cfki8ztyCvPgBItgVlgAD5
+s85XXE4hqWKRgxJTG0OExyxeSLMpvbsVU/60Y/PcuQKBgQDlr2x77yuz3tIkXO+j
+50exlhCH5/iuAQ9vw8QUQlde63B86U9/Y8SYS0kd1CdmHPNaeve4frmleY1iWAfC
+AUAUaccKONlNbcVgcBzv7HXK+QmhRCb7EGGKFeb1O3oc1t8F1FRCa3hCtPchAVbu
+PGIL6E3VwO36XYDXfS+jAZVIQwKBgQDYyfd+WYCM6YixDKZAGgfLSU/1sdt4lDGe
+elObx0XeO+8kylqbk41WI92a4pQRnpZgHiyx48dsfa0vEO0zkGmfANxO/g6RxUTZ
+zW3qGj8njhtsY6ymmHj+Ncu9/lnY6EpfCVSelxsVz+5XufjZfWNHj8mdEWDzFkuZ
+BmcjQPlQaQKBgQDHfv3wC4Xe/ktx8BLpPuojkh8bnF1/7UXWIqh9nD29ISwcIp29
+HQ/V45ZHRU1PQRgR37qoUdG3q4MlByb92A4rbNDHzSbZPN3x7I8FyVFqkbJOkx50
+dP7zbCClohpnUC54Jrtk0WmsLvhzf3FdDa9vfj+UyLUq/+n3wTEOGULrdwKBgAGT
+FfUY+VIMsC15BgwZJE1Zrvb937Y0fVfFU64h+GPw03/U6GuQ2snxYL6rPqASIs13
+6qMwIFatYwCggtiJB/tbqj34omp0oFdkopO8tRC4e4KCBtL+8IIIKf6rRkPJDCE8
+lBzCxDOYWwbQFvqdaocuiCxX3/hkBRCLd1xOMIFhAoGAanaZkg7wogxseU0CDQWr
+ek+8xhvMsVmSs20JhR0WWUxNxZblKCJOMTzDnNxTajl8OeGfHLJER20aubB08/Fh
+3XTCUzLk69tfwhvGTVorZ+bQTAM1X18nzD89J03g/IaHxxR/nyB39Yq8yqNvuP0D
+Zf+6b317dHQhk60gz+CIt8s=
+-----END PRIVATE KEY-----');
+        $privKey = $privKey->withPadding(RSA::SIGNATURE_PKCS1);
+        $pubKey = $privKey->getPublicKey();
+
+        $subject = new X509();
+        $subject->setDomain('whatever.com');
+        $subject->setPublicKey($pubKey);
+
+        $x509 = new X509();
+        $x509->setEndDate('lifetime');
+        $result = $x509->sign($CAIssuer, $subject);
+        $cert = $x509->saveX509($result);
+
+        $x509 = new X509();
+        $cert = $x509->loadX509($cert);
+
+        $this->assertFalse(isset($cert['signatureAlgorithm']['parameters']));
+        $this->assertFalse(isset($cert['tbsCertificate']['signature']['parameters']));
     }
 }
diff --git a/tests/Unit/File/X509/crl.bin b/tests/Unit/File/X509/crl.bin
new file mode 100644
index 000000000..ef6d3ee19
Binary files /dev/null and b/tests/Unit/File/X509/crl.bin differ
diff --git a/tests/Unit/File/X509/mal-cert-01.der b/tests/Unit/File/X509/mal-cert-01.der
new file mode 100644
index 000000000..3219ccd49
Binary files /dev/null and b/tests/Unit/File/X509/mal-cert-01.der differ
diff --git a/tests/Unit/Math/BigInteger/BCMathTest.php b/tests/Unit/Math/BigInteger/BCMathTest.php
index 691d40316..a155ee406 100644
--- a/tests/Unit/Math/BigInteger/BCMathTest.php
+++ b/tests/Unit/Math/BigInteger/BCMathTest.php
@@ -1,20 +1,34 @@
 <?php
+
 /**
  * @author    Andreas Fischer <bantu@phpbb.com>
  * @copyright 2013 Andreas Fischer
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-class Unit_Math_BigInteger_BCMathTest extends Unit_Math_BigInteger_TestCase
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Math\BigInteger;
+
+use phpseclib3\Math\BigInteger\Engines\BCMath;
+
+class BCMathTest extends TestCase
 {
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
-        if (!extension_loaded('bcmath')) {
+        if (!BCMath::isValidEngine()) {
             self::markTestSkipped('BCMath extension is not available.');
         }
+        BCMath::setModExpEngine('DefaultEngine');
+    }
 
-        parent::setUpBeforeClass();
+    public function getInstance($x = 0, $base = 10): BCMath
+    {
+        return new BCMath($x, $base);
+    }
 
-        self::ensureConstant('MATH_BIGINTEGER_MODE', \phpseclib\Math\BigInteger::MODE_BCMATH);
+    public static function getStaticClass(): string
+    {
+        return 'phpseclib3\Math\BigInteger\Engines\BCMath';
     }
 }
diff --git a/tests/Unit/Math/BigInteger/DefaultTest.php b/tests/Unit/Math/BigInteger/DefaultTest.php
new file mode 100644
index 000000000..219ee5df2
--- /dev/null
+++ b/tests/Unit/Math/BigInteger/DefaultTest.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * @author    Andreas Fischer <bantu@phpbb.com>
+ * @copyright 2013 Andreas Fischer
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Math\BigInteger;
+
+use phpseclib3\Math\BigInteger;
+
+class DefaultTest extends TestCase
+{
+    public function getInstance($x = 0, $base = 10): BigInteger
+    {
+        return new BigInteger($x, $base);
+    }
+
+    public static function getStaticClass(): string
+    {
+        return 'phpseclib3\Math\BigInteger';
+    }
+}
diff --git a/tests/Unit/Math/BigInteger/GMPTest.php b/tests/Unit/Math/BigInteger/GMPTest.php
index f344a4e88..f81cc3c96 100644
--- a/tests/Unit/Math/BigInteger/GMPTest.php
+++ b/tests/Unit/Math/BigInteger/GMPTest.php
@@ -1,20 +1,34 @@
 <?php
+
 /**
  * @author    Andreas Fischer <bantu@phpbb.com>
  * @copyright 2013 Andreas Fischer
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-class Unit_Math_BigInteger_GMPTest extends Unit_Math_BigInteger_TestCase
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Math\BigInteger;
+
+use phpseclib3\Math\BigInteger\Engines\GMP;
+
+class GMPTest extends TestCase
 {
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
-        if (!extension_loaded('gmp')) {
+        if (!GMP::isValidEngine()) {
             self::markTestSkipped('GNU Multiple Precision (GMP) extension is not available.');
         }
+        GMP::setModExpEngine('DefaultEngine');
+    }
 
-        parent::setUpBeforeClass();
+    public function getInstance($x = 0, $base = 10): GMP
+    {
+        return new GMP($x, $base);
+    }
 
-        self::ensureConstant('MATH_BIGINTEGER_MODE', \phpseclib\Math\BigInteger::MODE_GMP);
+    public static function getStaticClass(): string
+    {
+        return 'phpseclib3\Math\BigInteger\Engines\GMP';
     }
 }
diff --git a/tests/Unit/Math/BigInteger/InternalOpenSSLTest.php b/tests/Unit/Math/BigInteger/InternalOpenSSLTest.php
deleted file mode 100644
index d5056b877..000000000
--- a/tests/Unit/Math/BigInteger/InternalOpenSSLTest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * @author    Andreas Fischer <bantu@phpbb.com>
- * @copyright 2013 Andreas Fischer
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- */
-
-class Unit_Math_BigInteger_InternalOpenSSLTest extends Unit_Math_BigInteger_TestCase
-{
-    public static function setUpBeforeClass()
-    {
-        if (!extension_loaded('openssl')) {
-            self::markTestSkipped('openssl_public_encrypt() function is not available.');
-        }
-
-        parent::setUpBeforeClass();
-
-        self::ensureConstant('MATH_BIGINTEGER_MODE', \phpseclib\Math\BigInteger::MODE_INTERNAL);
-    }
-}
diff --git a/tests/Unit/Math/BigInteger/InternalTest.php b/tests/Unit/Math/BigInteger/InternalTest.php
deleted file mode 100644
index 599d94aea..000000000
--- a/tests/Unit/Math/BigInteger/InternalTest.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * @author    Andreas Fischer <bantu@phpbb.com>
- * @copyright 2013 Andreas Fischer
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- */
-
-class Unit_Math_BigInteger_InternalTest extends Unit_Math_BigInteger_TestCase
-{
-    public static function setUpBeforeClass()
-    {
-        parent::setUpBeforeClass();
-
-        self::ensureConstant('MATH_BIGINTEGER_MODE', \phpseclib\Math\BigInteger::MODE_INTERNAL);
-        self::ensureConstant('MATH_BIGINTEGER_OPENSSL_DISABLE', true);
-    }
-
-    public function testInternalRepresentation()
-    {
-        $x = new \phpseclib\Math\BigInteger('FFFFFFFFFFFFFFFFC90FDA', 16);
-        $y = new \phpseclib\Math\BigInteger("$x");
-        $this->assertSame($x->value, $y->value);
-    }
-}
diff --git a/tests/Unit/Math/BigInteger/PHP32Test.php b/tests/Unit/Math/BigInteger/PHP32Test.php
new file mode 100644
index 000000000..755e7a318
--- /dev/null
+++ b/tests/Unit/Math/BigInteger/PHP32Test.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @author    Andreas Fischer <bantu@phpbb.com>
+ * @copyright 2013 Andreas Fischer
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Math\BigInteger;
+
+use phpseclib3\Math\BigInteger\Engines\PHP32;
+
+class PHP32Test extends TestCase
+{
+    public static function setUpBeforeClass(): void
+    {
+        if (version_compare(PHP_VERSION, '7.0.0') < 0) {
+            self::markTestSkipped('32-bit integers slow things down too much on PHP 5.6');
+        }
+
+        PHP32::setModExpEngine('DefaultEngine');
+    }
+
+    public function getInstance($x = 0, $base = 10): PHP32
+    {
+        return new PHP32($x, $base);
+    }
+
+    public function testInternalRepresentation(): void
+    {
+        $x = new PHP32('FFFFFFFFFFFFFFFFC90FDA', 16);
+        $y = new PHP32("$x");
+
+        $this->assertEquals(self::getVar($x, 'value'), self::getVar($y, 'value'));
+    }
+
+    public static function getStaticClass(): string
+    {
+        return 'phpseclib3\Math\BigInteger\Engines\PHP32';
+    }
+}
diff --git a/tests/Unit/Math/BigInteger/PHP64OpenSSLTest.php b/tests/Unit/Math/BigInteger/PHP64OpenSSLTest.php
new file mode 100644
index 000000000..0239cc133
--- /dev/null
+++ b/tests/Unit/Math/BigInteger/PHP64OpenSSLTest.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @author    Andreas Fischer <bantu@phpbb.com>
+ * @copyright 2013 Andreas Fischer
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Math\BigInteger;
+
+use phpseclib3\Exception\BadConfigurationException;
+use phpseclib3\Math\BigInteger\Engines\PHP64;
+
+class PHP64OpenSSLTest extends TestCase
+{
+    public static function setUpBeforeClass(): void
+    {
+        if (!PHP64::isValidEngine()) {
+            self::markTestSkipped('64-bit integers are not available.');
+        }
+
+        try {
+            PHP64::setModExpEngine('OpenSSL');
+        } catch (BadConfigurationException $e) {
+            self::markTestSkipped('openssl_public_encrypt() function is not available.');
+        }
+    }
+
+    public function getInstance($x = 0, $base = 10): PHP64
+    {
+        return new PHP64($x, $base);
+    }
+
+    public function testInternalRepresentation(): void
+    {
+        $x = new PHP64('FFFFFFFFFFFFFFFFC90FDA', 16);
+        $y = new PHP64("$x");
+
+        $this->assertSame(self::getVar($x, 'value'), self::getVar($y, 'value'));
+    }
+
+    public static function getStaticClass(): string
+    {
+        return 'phpseclib3\Math\BigInteger\Engines\PHP64';
+    }
+}
diff --git a/tests/Unit/Math/BigInteger/PHP64Test.php b/tests/Unit/Math/BigInteger/PHP64Test.php
new file mode 100644
index 000000000..f7d510bb5
--- /dev/null
+++ b/tests/Unit/Math/BigInteger/PHP64Test.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * @author    Andreas Fischer <bantu@phpbb.com>
+ * @copyright 2013 Andreas Fischer
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Math\BigInteger;
+
+use phpseclib3\Math\BigInteger\Engines\PHP64;
+
+class PHP64Test extends TestCase
+{
+    public static function setUpBeforeClass(): void
+    {
+        if (!PHP64::isValidEngine()) {
+            self::markTestSkipped('64-bit integers are not available.');
+        }
+        PHP64::setModExpEngine('DefaultEngine');
+    }
+
+    public function getInstance($x = 0, $base = 10): PHP64
+    {
+        return new PHP64($x, $base);
+    }
+
+    public function testInternalRepresentation(): void
+    {
+        $x = new PHP64('FFFFFFFFFFFFFFFFC90FDA', 16);
+        $y = new PHP64("$x");
+
+        $this->assertSame(self::getVar($x, 'value'), self::getVar($y, 'value'));
+    }
+
+    public static function getStaticClass(): string
+    {
+        return 'phpseclib3\Math\BigInteger\Engines\PHP64';
+    }
+}
diff --git a/tests/Unit/Math/BigInteger/TestCase.php b/tests/Unit/Math/BigInteger/TestCase.php
index f352e7ed6..8a9b7ee8b 100644
--- a/tests/Unit/Math/BigInteger/TestCase.php
+++ b/tests/Unit/Math/BigInteger/TestCase.php
@@ -1,63 +1,66 @@
 <?php
+
 /**
  * @author    Andreas Fischer <bantu@phpbb.com>
  * @copyright 2012 Andreas Fischer
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-abstract class Unit_Math_BigInteger_TestCase extends PhpseclibTestCase
-{
-    public static function setUpBeforeClass()
-    {
-        parent::setUpBeforeClass();
-        self::reRequireFile('Math/BigInteger.php');
-    }
+declare(strict_types=1);
 
-    public function getInstance($x = 0, $base = 10)
-    {
-        return new \phpseclib\Math\BigInteger($x, $base);
-    }
+namespace phpseclib3\Tests\Unit\Math\BigInteger;
 
-    public function testConstructorBase2()
+use phpseclib3\Tests\PhpseclibTestCase;
+
+abstract class TestCase extends PhpseclibTestCase
+{
+    public function testConstructorBase2(): void
     {
         // 2**65 = 36893488147419103232
         $this->assertSame('36893488147419103232', (string) $this->getInstance('1' . str_repeat('0', 65), 2));
     }
 
-    public function testConstructorBase10()
+    public function testConstructorBase10(): void
     {
         $this->assertSame('18446744073709551616', (string) $this->getInstance('18446744073709551616'));
     }
 
-    public function testConstructorBase16()
+    public function testConstructorBase16(): void
+    {
+        $this->assertSame('50', (string) $this->getInstance('0x32', 16));
+        $this->assertSame('12345678910', (string) $this->getInstance('0x2DFDC1C3E', 16));
+        $this->assertSame('18446744073709551615', (string) $this->getInstance('0xFFFFFFFFFFFFFFFF', 16));
+        $this->assertSame('18446744073709551616', (string) $this->getInstance('0x10000000000000000', 16));
+    }
+
+    public function testConstructorBase256(): void
     {
-        $this->assertSame('50',                        (string) $this->getInstance('0x32', 16));
-        $this->assertSame('12345678910',            (string) $this->getInstance('0x2DFDC1C3E', 16));
-        $this->assertSame('18446744073709551615',    (string) $this->getInstance('0xFFFFFFFFFFFFFFFF', 16));
-        $this->assertSame('18446744073709551616',    (string) $this->getInstance('0x10000000000000000', 16));
+        $this->assertSame('-128', (string) $this->getInstance("\x80", -256));
     }
 
-    public function testToBytes()
+    public function testToBytes(): void
     {
         $this->assertSame(chr(65), $this->getInstance('65')->toBytes());
     }
 
-    public function testToBytesTwosCompliment()
+    public function testToBytesTwosCompliment(): void
     {
         $this->assertSame(chr(126), $this->getInstance('01111110', 2)->toBytes(true));
     }
 
-    public function testToHex()
+    public function testToHex(): void
     {
         $this->assertSame('41', $this->getInstance('65')->toHex());
     }
 
-    public function testToBits()
+    public function testToBits(): void
     {
         $this->assertSame('1000001', $this->getInstance('65')->toBits());
+        $this->assertSame('10', $this->getInstance('-2')->toBits());
+        $this->assertSame('11111110', $this->getInstance('-2')->toBits(true));
     }
 
-    public function testAdd()
+    public function testAdd(): void
     {
         $x = $this->getInstance('18446744073709551615');
         $y = $this->getInstance('100000000000');
@@ -72,14 +75,14 @@ public function testAdd()
         $this->assertSame('18446744173709551615', (string) $b);
     }
 
-    public function testSubtract()
+    public function testSubtract(): void
     {
         $x = $this->getInstance('18446744073709551618');
         $y = $this->getInstance('4000000000000');
         $this->assertSame('18446740073709551618', (string) $x->subtract($y));
     }
 
-    public function testMultiply()
+    public function testMultiply(): void
     {
         $x = $this->getInstance('8589934592');                // 2**33
         $y = $this->getInstance('36893488147419103232');    // 2**65
@@ -94,18 +97,34 @@ public function testMultiply()
         $this->assertSame('316912650057057350374175801344', (string) $b);
     }
 
-    public function testDivide()
+    public function testDivide(): void
     {
         $x = $this->getInstance('1180591620717411303425');    // 2**70 + 1
         $y = $this->getInstance('12345678910');
 
-        list($q, $r) = $x->divide($y);
+        [$q, $r] = $x->divide($y);
 
         $this->assertSame('95627922070', (string) $q);
         $this->assertSame('10688759725', (string) $r);
+
+        $x = $this->getInstance('3369993333393829974333376885877453834204643052817571560137951281152');
+        $y = $this->getInstance('4294967296');
+
+        [$q, $r] = $x->divide($y);
+
+        $this->assertSame('784637716923335095479473677900958302012794430558004314112', (string) $q);
+        $this->assertSame('0', (string) $r);
+
+        $x = $this->getInstance('3369993333393829974333376885877453834204643052817571560137951281153');
+        $y = $this->getInstance('4294967296');
+
+        [$q, $r] = $x->divide($y);
+
+        $this->assertSame('784637716923335095479473677900958302012794430558004314112', (string) $q);
+        $this->assertSame('1', (string) $r);
     }
 
-    public function testModPow()
+    public function testModPow(): void
     {
         $a = $this->getInstance('10');
         $b = $this->getInstance('20');
@@ -115,7 +134,7 @@ public function testModPow()
         $this->assertSame('10', (string) $d);
     }
 
-    public function testModInverse()
+    public function testModInverse(): void
     {
         $a = $this->getInstance(30);
         $b = $this->getInstance(17);
@@ -124,11 +143,11 @@ public function testModInverse()
         $this->assertSame('4', (string) $c);
 
         $d = $a->multiply($c);
-        list($q, $r) = $d->divide($b);
+        [$q, $r] = $d->divide($b);
         $this->assertSame('1', (string) $r);
     }
 
-    public function testExtendedGCD()
+    public function testExtendedGCD(): void
     {
         $a = $this->getInstance(693);
         $b = $this->getInstance(609);
@@ -139,14 +158,14 @@ public function testExtendedGCD()
         $this->assertSame(21, $a->toString() * $arr['x']->toString() + $b->toString() * $arr['y']->toString());
     }
 
-    public function testGCD()
+    public function testGCD(): void
     {
         $x = $this->getInstance(693);
         $y = $this->getInstance(609);
         $this->assertSame('21', (string) $x->gcd($y));
     }
 
-    public function testAbs()
+    public function testAbs(): void
     {
         $x = $this->getInstance('-18446744073709551617');
         $y = $x->abs();
@@ -155,7 +174,7 @@ public function testAbs()
         $this->assertSame('18446744073709551617', (string) $y);
     }
 
-    public function testEquals()
+    public function testEquals(): void
     {
         $x = $this->getInstance('18446744073709551616');
         $y = $this->getInstance('18446744073709551616');
@@ -164,7 +183,7 @@ public function testEquals()
         $this->assertTrue($y->equals($x));
     }
 
-    public function testCompare()
+    public function testCompare(): void
     {
         $a = $this->getInstance('-18446744073709551616');
         $b = $this->getInstance('36893488147419103232');
@@ -182,9 +201,12 @@ public function testCompare()
         // c < d
         $this->assertLessThan(0, $c->compare($d));
         $this->assertGreaterThan(0, $d->compare($c));
+
+        $this->assertSame(-1, $this->getInstance(-999)->compare($this->getInstance(370)));
+        $this->assertSame(1, $this->getInstance(999)->compare($this->getInstance(-700)));
     }
 
-    public function testBitwiseAND()
+    public function testBitwiseAND(): void
     {
         $x = $this->getInstance('66666666666666666666666', 16);
         $y = $this->getInstance('33333333333333333333333', 16);
@@ -193,33 +215,67 @@ public function testBitwiseAND()
         $this->assertSame($z->toHex(), $x->bitwise_AND($y)->toHex());
     }
 
-    public function testBitwiseOR()
+    public function testBitwiseOR(): void
     {
         $x = $this->getInstance('11111111111111111111111', 16);
         $y = $this->getInstance('EEEEEEEEEEEEEEEEEEEEEEE', 16);
         $z = $this->getInstance('FFFFFFFFFFFFFFFFFFFFFFF', 16);
 
         $this->assertSame($z->toHex(), $x->bitwise_OR($y)->toHex());
+
+        $x = $this->getInstance('AFAFAFAFAFAFAFAFAFAFAFAF', 16);
+        $y = $this->getInstance('133713371337133713371337', 16);
+        $z = $this->getInstance('BFBFBFBFBFBFBFBFBFBFBFBF', 16);
+
+        $this->assertSame($z->toHex(), $x->bitwise_OR($y)->toHex());
+
+        $x = -0xFFFF;
+        $y = 2;
+        $z = $x ^ $y;
+
+        $x = $this->getInstance($x);
+        $y = $this->getInstance($y);
+        $z = $this->getInstance($z);
+
+        $this->assertSame($z->toString(), $x->bitwise_OR($y)->toString());
+        $this->assertSame($z->toString(), $y->bitwise_OR($x)->toString());
     }
 
-    public function testBitwiseXOR()
+    public function testBitwiseXOR(): void
     {
         $x = $this->getInstance('AFAFAFAFAFAFAFAFAFAFAFAF', 16);
         $y = $this->getInstance('133713371337133713371337', 16);
         $z = $this->getInstance('BC98BC98BC98BC98BC98BC98', 16);
 
         $this->assertSame($z->toHex(), $x->bitwise_XOR($y)->toHex());
+
+        // @group github1245
+
+        $a = $this->getInstance(1);
+        $b = $this->getInstance(-2);
+        $c = $a->bitwise_xor($b);
+        $this->assertSame("$c", '-1');
+
+        $a = $this->getInstance('-6725760161961546982');
+        $b = $this->getInstance(51);
+        $c = $a->bitwise_xor($b);
+        $this->assertSame("$c", '-6725760161961546967');
     }
 
-    public function testBitwiseNOT()
+    public function testBitwiseNOT(): void
     {
         $x = $this->getInstance('EEEEEEEEEEEEEEEEEEEEEEE', 16);
         $z = $this->getInstance('11111111111111111111111', 16);
 
         $this->assertSame($z->toHex(), $x->bitwise_NOT()->toHex());
+
+        $a = $this->getInstance(0);
+        $a->bitwise_not();
+
+        $this->assertSame($a->toString(), '0');
     }
 
-    public function testBitwiseLeftShift()
+    public function testBitwiseLeftShift(): void
     {
         $x = $this->getInstance('0x0000000FF0000000', 16);
         $y = $this->getInstance('0x000FF00000000000', 16);
@@ -227,7 +283,7 @@ public function testBitwiseLeftShift()
         $this->assertSame($y->toHex(), $x->bitwise_LeftShift(16)->toHex());
     }
 
-    public function testBitwiseRightShift()
+    public function testBitwiseRightShift(): void
     {
         $x = $this->getInstance('0x0000000FF0000000', 16);
         $y = $this->getInstance('0x00000000000FF000', 16);
@@ -239,7 +295,7 @@ public function testBitwiseRightShift()
         $this->assertSame($n->toHex(), $x->bitwise_RightShift(36)->toHex());
     }
 
-    public function testSerializable()
+    public function testSerializable(): void
     {
         $x = $this->getInstance('18446744073709551616');
         $y = unserialize(serialize($x));
@@ -251,7 +307,7 @@ public function testSerializable()
         $this->assertSame('18446744073709551616', (string) $y);
     }
 
-    public function testClone()
+    public function testClone(): void
     {
         $x = $this->getInstance('18446744073709551616');
         $y = clone $x;
@@ -263,47 +319,24 @@ public function testClone()
         $this->assertSame('18446744073709551616', (string) $y);
     }
 
-    public function testRandomTwoArgument()
+    public function testRandomTwoArgument(): void
     {
         $min = $this->getInstance(0);
         $max = $this->getInstance('18446744073709551616');
 
-        $rand1 = $min->random($min, $max);
+        $class = static::getStaticClass();
+        $rand1 = $class::randomRange($min, $max);
         // technically $rand1 can equal $min but with the $min and $max we've
         // chosen it's just not that likely
         $this->assertTrue($rand1->compare($min) > 0);
         $this->assertTrue($rand1->compare($max) < 0);
     }
 
-    public function testRandomOneArgument()
-    {
-        $min = $this->getInstance(0);
-        $max = $this->getInstance('18446744073709551616');
-
-        $rand1 = $min->random($max);
-        $this->assertTrue($rand1->compare($min) > 0);
-        $this->assertTrue($rand1->compare($max) < 0);
-
-        $rand2 = $max->random($min);
-        $this->assertTrue($rand2->compare($min) > 0);
-        $this->assertTrue($rand2->compare($max) < 0);
-
-        $this->assertFalse($rand1->equals($rand2));
-    }
-
     /**
      * @group github279
      */
-    public function testDiffieHellmanKeyAgreement()
-    {
-        if (getenv('TRAVIS') && PHP_VERSION === '5.3.3'
-            && MATH_BIGINTEGER_MODE === \phpseclib\Math\BigInteger::MODE_INTERNAL
-        ) {
-            $this->markTestIncomplete(
-                'This test hangs on PHP 5.3.3 using internal mode.'
-            );
-        }
-
+    public function testDiffieHellmanKeyAgreement(): void
+    {
         // "Oakley Group 14" 2048-bit modular exponentiation group as used in
         // SSH2 diffie-hellman-group14-sha1
         $prime = $this->getInstance(
@@ -324,10 +357,11 @@ public function testDiffieHellmanKeyAgreement()
 
         /*
         Code for generation of $alicePrivate and $bobPrivate.
+        $class = static::getStaticClass();
         $one = $this->getInstance(1);
         $max = $one->bitwise_leftShift(512)->subtract($one);
-        $alicePrivate = $one->random($one, $max);
-        $bobPrivate = $one->random($one, $max);
+        $alicePrivate = $static::randomRange($one, $max);
+        $bobPrivate = $static::randomRange($one, $max);
         var_dump($alicePrivate->toHex(), $bobPrivate->toHex());
         */
 
@@ -356,14 +390,140 @@ public function testDiffieHellmanKeyAgreement()
         );
     }
 
-    /**
-     * @requires PHP 5.6
-     */
-    public function testDebugInfo()
+    public function testDebugInfo(): void
     {
         $num = $this->getInstance(50);
         $str = print_r($num, true);
-        $this->assertContains('[value] => 0x32', $str);
-        return $str;
+        $this->assertStringContainsString('[value] => 0x32', $str);
+    }
+
+    public function testPrecision(): void
+    {
+        $a = $this->getInstance(51);
+        $this->assertSame($a->getPrecision(), -1);
+        $b = $a;
+        $c = clone $a;
+        $b->setPrecision(1);
+        $this->assertSame($a->getPrecision(), 1);
+        $this->assertSame("$a", '1');
+        $this->assertSame($b->getPrecision(), 1);
+        $this->assertSame("$b", '1');
+        $this->assertSame($c->getPrecision(), -1);
+        $this->assertSame("$c", '51');
+    }
+
+    /**
+     * @group github954
+     */
+    public function testSlidingWindow(): void
+    {
+        $e = $this->getInstance(str_repeat('1', 1794), 2);
+        $x = $this->getInstance(1);
+        $n = $this->getInstance(2);
+        self::assertSame('1', $x->powMod($e, $n)->toString());
+    }
+
+    public function testRoot(): void
+    {
+        $bigInteger = $this->getInstance('64000000'); // (20^2)^3
+        $bigInteger = $bigInteger->root();
+        $this->assertSame('8000', (string) $bigInteger);
+        $bigInteger = $bigInteger->root(3);
+        $this->assertSame('20', (string) $bigInteger);
+    }
+
+    public function testPow(): void
+    {
+        $bigInteger = $this->getInstance('20');
+        $two = $this->getInstance('2');
+        $three = $this->getInstance('3');
+        $bigInteger = $bigInteger->pow($two);
+        $this->assertSame('400', (string) $bigInteger);
+        $bigInteger = $bigInteger->pow($three);
+        $this->assertSame('64000000', (string) $bigInteger); // (20^2)^3
+    }
+
+    public function testMax(): void
+    {
+        $class = static::getStaticClass();
+        $min = $this->getInstance('20');
+        $max = $this->getInstance('20000');
+        $this->assertSame((string) $max, (string) $class::max($min, $max));
+        $this->assertSame((string) $max, (string) $class::max($max, $min));
+    }
+
+    public function testMin(): void
+    {
+        $class = static::getStaticClass();
+        $min = $this->getInstance('20');
+        $max = $this->getInstance('20000');
+        $this->assertSame((string) $min, (string) $class::min($min, $max));
+        $this->assertSame((string) $min, (string) $class::min($max, $min));
+    }
+
+    public function testRandomPrime(): void
+    {
+        $class = static::getStaticClass();
+        $prime = $class::randomPrime(128);
+        $this->assertSame(128, $prime->getLength());
+    }
+
+    /**
+     * @group github1260
+     */
+    public function testZeros(): void
+    {
+        $a = $this->getInstance();
+        $b = $this->getInstance('00', 16);
+        $this->assertTrue($a->equals($b));
+    }
+
+    /**
+     * @group github1264
+     */
+    public function test48ToHex(): void
+    {
+        $temp = $this->getInstance(48);
+        $this->assertSame($temp->toHex(true), '30');
+    }
+
+    public function testZeroBase10(): void
+    {
+        $temp = $this->getInstance('00');
+        $this->assertSame($temp->toString(), '0');
+
+        $temp = $this->getInstance('-0');
+        $this->assertSame($temp->toString(), '0');
+    }
+
+    public function testNegativePrecision(): void
+    {
+        $vals = [
+            '-9223372036854775808', // eg. 8000 0000 0000 0000
+            '-1',
+        ];
+        foreach ($vals as $val) {
+            $x = $this->getInstance($val);
+            $x->setPrecision(64); // ie. 8 bytes
+            $this->assertSame($val, "$x");
+            $r = $x->toBytes(true);
+            $this->assertSame(8, strlen($r));
+            $x2 = $this->getInstance($r, -256);
+            $this->assertSame(0, $x->compare($x2));
+        }
+    }
+
+    public function testHexWithNewLines(): void
+    {
+        $x = $this->getInstance('0xE932AC92252F585B3A80A4DD76A897C8B7652952FE788F6EC8DD640587A1EE5647670A8AD
+4C2BE0F9FA6E49C605ADF77B5174230AF7BD50E5D6D6D6D28CCF0A886A514CC72E51D209CC7
+72A52EF419F6A953F3135929588EBE9B351FCA61CED78F346FE00DBB6306E5C2A4C6DFC3779
+AF85AB417371CF34D8387B9B30AE46D7A5FF5A655B8D8455F1B94AE736989D60A6F2FD5CADB
+FFBD504C5A756A2E6BB5CECC13BCA7503F6DF8B52ACE5C410997E98809DB4DC30D943DE4E81
+2A47553DCE54844A78E36401D13F77DC650619FED88D8B3926E3D8E319C80C744779AC5D6AB
+E252896950917476ECE5E8FC27D5F053D6018D91B502C4787558A002B9283DA7', 16);
+
+        $y = $this->getInstance('0xE932AC92252F585B3A80A4DD76A897C8B7652952FE788F6EC8DD640587A1EE5647670A8AD', 16);
+        $this->assertSame("$x", "$y");
     }
 }
diff --git a/tests/Unit/Math/PrimeFieldTest.php b/tests/Unit/Math/PrimeFieldTest.php
new file mode 100644
index 000000000..bda14e849
--- /dev/null
+++ b/tests/Unit/Math/PrimeFieldTest.php
@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Math;
+
+use phpseclib3\Math\BigInteger;
+use phpseclib3\Math\PrimeField;
+use phpseclib3\Tests\PhpseclibTestCase;
+
+class PrimeFieldTest extends PhpseclibTestCase
+{
+    public function testPrimeFieldWithCompositeNumbers(): void
+    {
+        $this->expectException('UnexpectedValueException');
+
+        $a = new BigInteger('65', 10);
+        $p = new BigInteger('126', 10); // 126 isn't a prime
+
+        $num = new PrimeField($p);
+        $num2 = $num->newInteger($a);
+
+        $num2->squareRoot();
+    }
+
+    public function testPrimeFieldWithPrimeNumbers(): void
+    {
+        $a = new BigInteger('65', 10);
+        $p = new BigInteger('127', 10);
+
+        $num = new PrimeField($p);
+        $num2 = $num->newInteger($a);
+
+        $this->assertFalse($num2->squareRoot());
+    }
+
+    /**
+     * @group github1929
+     */
+    public function testGarbageCollectedToBytes(): void
+    {
+        $blob = base64_decode('BFgsTFQeqKr0toyURbtT43INMDS7FTHjz3yn3MR1/Yv/pb2b9ZCYNQ/Tafe5hQpEJ4TpZOKfikP/hWZvFL8QCPgqbIGqw/KTfA==');
+        $public = "\0" . substr($blob, 0, 49);
+        $private = substr($blob, -24);
+
+        $point = \phpseclib3\Crypt\EC\Formats\Keys\PKCS1::extractPoint(
+            $public,
+            new \phpseclib3\Crypt\EC\Curves\secp192r1()
+        );
+
+        $this->assertIsString($point[0]->toBytes());
+    }
+}
diff --git a/tests/Unit/Net/SFTPStreamTest.php b/tests/Unit/Net/SFTPStreamUnitTest.php
similarity index 66%
rename from tests/Unit/Net/SFTPStreamTest.php
rename to tests/Unit/Net/SFTPStreamUnitTest.php
index 6f98bb0cb..9bb930387 100644
--- a/tests/Unit/Net/SFTPStreamTest.php
+++ b/tests/Unit/Net/SFTPStreamUnitTest.php
@@ -1,22 +1,28 @@
 <?php
+
 /**
  * @author    Andreas Fischer <bantu@phpbb.com>
  * @copyright 2014 Andreas Fischer
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use phpseclib\Net\SFTP\Stream;
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Net;
+
+use phpseclib3\Net\SFTP\Stream;
+use phpseclib3\Tests\PhpseclibTestCase;
 
-class Unit_Net_SFTPStreamTest extends PhpseclibTestCase
+class SFTPStreamUnitTest extends PhpseclibTestCase
 {
-    public function testRegisterWithoutArgument()
+    public function testRegisterWithoutArgument(): void
     {
         $this->assertTrue(Stream::register());
         $this->assertContains('sftp', stream_get_wrappers());
         $this->assertTrue(stream_wrapper_unregister('sftp'));
     }
 
-    public function testRegisterWithArgument()
+    public function testRegisterWithArgument(): void
     {
         $protocol = 'sftptest';
         $this->assertTrue(Stream::register($protocol));
diff --git a/tests/Unit/Net/SSH1Test.php b/tests/Unit/Net/SSH1Test.php
deleted file mode 100644
index 6073e1ffa..000000000
--- a/tests/Unit/Net/SSH1Test.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * @author    Marc Scholten <marc@pedigital.de>
- * @copyright 2013 Marc Scholten
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- */
-
-class Unit_Net_SSH1Test extends PhpseclibTestCase
-{
-    public function formatLogDataProvider()
-    {
-        return array(
-            array(
-                array('hello world'),
-                array('<--'),
-                "<--\r\n00000000  68:65:6c:6c:6f:20:77:6f:72:6c:64                 hello world\r\n\r\n"
-            ),
-            array(
-                array('hello', 'world'),
-                array('<--', '<--'),
-                "<--\r\n00000000  68:65:6c:6c:6f                                   hello\r\n\r\n" .
-                "<--\r\n00000000  77:6f:72:6c:64                                   world\r\n\r\n"
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider formatLogDataProvider
-     */
-    public function testFormatLog(array $message_log, array $message_number_log, $expected)
-    {
-        $ssh = $this->getMockBuilder('phpseclib\Net\SSH1')
-            ->disableOriginalConstructor()
-            ->setMethods(null)
-            ->getMock();
-
-        $result = $ssh->_format_log($message_log, $message_number_log);
-
-        $this->assertEquals($expected, $result);
-    }
-}
diff --git a/tests/Unit/Net/SSH2Test.php b/tests/Unit/Net/SSH2Test.php
deleted file mode 100644
index 1d3c64391..000000000
--- a/tests/Unit/Net/SSH2Test.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-/**
- * @author    Marc Scholten <marc@pedigital.de>
- * @copyright 2013 Marc Scholten
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- */
-
-class Unit_Net_SSH2Test extends PhpseclibTestCase
-{
-    public function formatLogDataProvider()
-    {
-        return array(
-            array(
-                array('hello world'),
-                array('<--'),
-                "<--\r\n00000000  68:65:6c:6c:6f:20:77:6f:72:6c:64                 hello world\r\n\r\n"
-            ),
-            array(
-                array('hello', 'world'),
-                array('<--', '<--'),
-                "<--\r\n00000000  68:65:6c:6c:6f                                   hello\r\n\r\n" .
-                "<--\r\n00000000  77:6f:72:6c:64                                   world\r\n\r\n"
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider formatLogDataProvider
-     */
-    public function testFormatLog(array $message_log, array $message_number_log, $expected)
-    {
-        $ssh = $this->createSSHMock();
-
-        $result = $ssh->_format_log($message_log, $message_number_log);
-        $this->assertEquals($expected, $result);
-    }
-
-    public function testGenerateIdentifier()
-    {
-        $identifier = $this->createSSHMock()->_generate_identifier();
-        $this->assertStringStartsWith('SSH-2.0-phpseclib_2.0', $identifier);
-
-        if (extension_loaded('libsodium')) {
-            $this->assertContains('libsodium', $identifier);
-        }
-
-        if (extension_loaded('openssl')) {
-            $this->assertContains('openssl', $identifier);
-            $this->assertNotContains('mcrypt', $identifier);
-        } elseif (extension_loaded('mcrypt')) {
-            $this->assertNotContains('openssl', $identifier);
-            $this->assertContains('mcrypt', $identifier);
-        } else {
-            $this->assertNotContains('openssl', $identifier);
-            $this->assertNotContains('mcrypt', $identifier);
-        }
-
-        if (extension_loaded('gmp')) {
-            $this->assertContains('gmp', $identifier);
-            $this->assertNotContains('bcmath', $identifier);
-        } elseif (extension_loaded('bcmath')) {
-            $this->assertNotContains('gmp', $identifier);
-            $this->assertContains('bcmath', $identifier);
-        } else {
-            $this->assertNotContains('gmp', $identifier);
-            $this->assertNotContains('bcmath', $identifier);
-        }
-    }
-
-    public function testGetExitStatusIfNotConnected()
-    {
-        $ssh = $this->createSSHMock();
-
-        $this->assertFalse($ssh->getExitStatus());
-    }
-
-    public function testPTYIDefaultValue()
-    {
-        $ssh = $this->createSSHMock();
-        $this->assertFalse($ssh->isPTYEnabled());
-    }
-
-    public function testEnablePTY()
-    {
-        $ssh = $this->createSSHMock();
-
-        $ssh->enablePTY();
-        $this->assertTrue($ssh->isPTYEnabled());
-
-        $ssh->disablePTY();
-        $this->assertFalse($ssh->isPTYEnabled());
-    }
-
-    public function testQuietModeDefaultValue()
-    {
-        $ssh = $this->createSSHMock();
-
-        $this->assertFalse($ssh->isQuietModeEnabled());
-    }
-
-    public function testEnableQuietMode()
-    {
-        $ssh = $this->createSSHMock();
-
-        $ssh->enableQuietMode();
-        $this->assertTrue($ssh->isQuietModeEnabled());
-
-        $ssh->disableQuietMode();
-        $this->assertFalse($ssh->isQuietModeEnabled());
-    }
-
-    public function testGetConnectionByResourceId()
-    {
-        $ssh = new \phpseclib\Net\SSH2('localhost');
-        $this->assertSame($ssh, \phpseclib\Net\SSH2::getConnectionByResourceId($ssh->getResourceId()));
-    }
-
-    public function testGetResourceId()
-    {
-        $ssh = new \phpseclib\Net\SSH2('localhost');
-        $this->assertSame('{' . spl_object_hash($ssh) . '}', $ssh->getResourceId());
-    }
-
-    /**
-     * @return \phpseclib\Net\SSH2
-     */
-    protected function createSSHMock()
-    {
-        return $this->getMockBuilder('phpseclib\Net\SSH2')
-            ->disableOriginalConstructor()
-            ->setMethods(array('__destruct'))
-            ->getMock();
-    }
-}
diff --git a/tests/Unit/Net/SSH2UnitTest.php b/tests/Unit/Net/SSH2UnitTest.php
new file mode 100644
index 000000000..b329c6ca2
--- /dev/null
+++ b/tests/Unit/Net/SSH2UnitTest.php
@@ -0,0 +1,432 @@
+<?php
+
+/**
+ * @author    Marc Scholten <marc@pedigital.de>
+ * @copyright 2013 Marc Scholten
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+declare(strict_types=1);
+
+namespace phpseclib3\Tests\Unit\Net;
+
+use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Exception\InsufficientSetupException;
+use phpseclib3\Exception\TimeoutException;
+use phpseclib3\Net\SSH2;
+use phpseclib3\Tests\PhpseclibTestCase;
+
+class SSH2UnitTest extends PhpseclibTestCase
+{
+    public static function formatLogDataProvider(): array
+    {
+        return [
+            [
+                ['hello world'],
+                ['<--'],
+                "<--\r\n00000000  68:65:6c:6c:6f:20:77:6f:72:6c:64                 hello world\r\n\r\n",
+            ],
+            [
+                ['hello', 'world'],
+                ['<--', '<--'],
+                "<--\r\n00000000  68:65:6c:6c:6f                                   hello\r\n\r\n" .
+                "<--\r\n00000000  77:6f:72:6c:64                                   world\r\n\r\n",
+            ],
+        ];
+    }
+
+    /**
+     * @requires PHPUnit < 10
+     * Verify that MASK_* constants remain distinct
+     */
+    public function testBitmapMasks(): void
+    {
+        $reflection = new \ReflectionClass(SSH2::class);
+        $masks = array_filter($reflection->getConstants(), fn ($k) => str_starts_with($k, 'MASK_'), ARRAY_FILTER_USE_KEY);
+        $bitmap = 0;
+        foreach ($masks as $mask => $bit) {
+            $this->assertEquals(0, $bitmap & $bit, "Got unexpected mask {$mask}");
+            $bitmap |= $bit;
+            $this->assertEquals($bit, $bitmap & $bit, "Absent expected mask {$mask}");
+        }
+    }
+
+    /**
+     * @dataProvider formatLogDataProvider
+     * @requires PHPUnit < 10
+     */
+    public function testFormatLog(array $message_log, array $message_number_log, $expected): void
+    {
+        $ssh = $this->createSSHMock();
+
+        $result = self::callFunc($ssh, 'format_log', [$message_log, $message_number_log]);
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * @requires PHPUnit < 10
+     */
+    public function testGenerateIdentifier(): void
+    {
+        $identifier = self::callFunc($this->createSSHMock(), 'generate_identifier');
+        $this->assertStringStartsWith('SSH-2.0-phpseclib_3.0', $identifier);
+
+        if (function_exists('sodium_crypto_sign_keypair')) {
+            $this->assertStringContainsString('libsodium', $identifier);
+        }
+
+        if (extension_loaded('openssl')) {
+            $this->assertStringContainsString('openssl', $identifier);
+        } else {
+            $this->assertStringNotContainsString('openssl', $identifier);
+        }
+
+        if (extension_loaded('gmp')) {
+            $this->assertStringContainsString('gmp', $identifier);
+            $this->assertStringNotContainsString('bcmath', $identifier);
+        } elseif (extension_loaded('bcmath')) {
+            $this->assertStringNotContainsString('gmp', $identifier);
+            $this->assertStringContainsString('bcmath', $identifier);
+        } else {
+            $this->assertStringNotContainsString('gmp', $identifier);
+            $this->assertStringNotContainsString('bcmath', $identifier);
+        }
+    }
+
+    /**
+     * @requires PHPUnit < 10
+     */
+    public function testGetExitStatusIfNotConnected(): void
+    {
+        $ssh = $this->createSSHMock();
+
+        $this->assertFalse($ssh->getExitStatus());
+    }
+
+    /**
+     * @requires PHPUnit < 10
+     */
+    public function testPTYIDefaultValue(): void
+    {
+        $ssh = $this->createSSHMock();
+        $this->assertFalse($ssh->isPTYEnabled());
+    }
+
+    /**
+     * @requires PHPUnit < 10
+     */
+    public function testEnablePTY(): void
+    {
+        $ssh = $this->createSSHMock();
+
+        $ssh->enablePTY();
+        $this->assertTrue($ssh->isPTYEnabled());
+
+        $ssh->disablePTY();
+        $this->assertFalse($ssh->isPTYEnabled());
+    }
+
+    /**
+     * @requires PHPUnit < 10
+     */
+    public function testQuietModeDefaultValue(): void
+    {
+        $ssh = $this->createSSHMock();
+
+        $this->assertFalse($ssh->isQuietModeEnabled());
+    }
+
+    /**
+     * @requires PHPUnit < 10
+     */
+    public function testEnableQuietMode(): void
+    {
+        $ssh = $this->createSSHMock();
+
+        $ssh->enableQuietMode();
+        $this->assertTrue($ssh->isQuietModeEnabled());
+
+        $ssh->disableQuietMode();
+        $this->assertFalse($ssh->isQuietModeEnabled());
+    }
+
+    public function testGetConnectionByResourceId(): void
+    {
+        $ssh = new SSH2('localhost');
+        $this->assertSame($ssh, SSH2::getConnectionByResourceId($ssh->getResourceId()));
+    }
+
+    public function testGetResourceId(): void
+    {
+        $ssh = new SSH2('localhost');
+        $this->assertSame('{' . spl_object_hash($ssh) . '}', $ssh->getResourceId());
+    }
+
+    /**
+     * @requires PHPUnit < 10
+     */
+    public function testReadUnauthenticated(): void
+    {
+        $this->expectException(InsufficientSetupException::class);
+        $this->expectExceptionMessage('Operation disallowed prior to login()');
+
+        $ssh = $this->createSSHMock();
+
+        $ssh->read();
+    }
+
+    /**
+     * @requires PHPUnit < 10
+     */
+    public function testWriteUnauthenticated(): void
+    {
+        $this->expectException(InsufficientSetupException::class);
+        $this->expectExceptionMessage('Operation disallowed prior to login()');
+
+        $ssh = $this->createSSHMock();
+
+        $ssh->write('');
+    }
+
+    /**
+     * @requires PHPUnit < 10
+     */
+    public function testWriteOpensShell(): void
+    {
+        $ssh = $this->getMockBuilder(SSH2::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['__destruct', 'isAuthenticated', 'openShell', 'send_channel_packet'])
+            ->getMock();
+        $ssh->expects($this->once())
+            ->method('isAuthenticated')
+            ->willReturn(true);
+        $ssh->expects($this->once())
+            ->method('openShell')
+            ->willReturn(true);
+        $ssh->expects($this->once())
+            ->method('send_channel_packet')
+            ->with(SSH2::CHANNEL_SHELL, 'hello');
+
+        $ssh->write('hello');
+    }
+
+    /**
+     * @requires PHPUnit < 10
+     */
+    public function testOpenShellWhenOpen(): void
+    {
+        $ssh = $this->getMockBuilder(SSH2::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['__destruct'])
+            ->getMock();
+
+        $this->expectException(InsufficientSetupException::class);
+        $this->expectExceptionMessage('Operation disallowed prior to login()');
+
+        $this->assertFalse($ssh->openShell());
+    }
+
+    public function testGetTimeout(): void
+    {
+        $ssh = new SSH2('localhost');
+        $this->assertEquals(10, $ssh->getTimeout());
+        $ssh->setTimeout(0);
+        $this->assertEquals(0, $ssh->getTimeout());
+        $ssh->setTimeout(20);
+        $this->assertEquals(20, $ssh->getTimeout());
+    }
+
+    /**
+     * @requires PHPUnit < 10
+     */
+    public function testGetStreamTimeout(): void
+    {
+        $default = ini_get('default_socket_timeout');
+        // no curTimeout, no keepAlive
+        $ssh = $this->createSSHMock();
+        $this->assertEquals([$default, 0], self::callFunc($ssh, 'get_stream_timeout'));
+
+        // curTimeout, no keepAlive
+        $ssh = $this->createSSHMock();
+        $ssh->setTimeout(1);
+        $this->assertEquals([1, 0], self::callFunc($ssh, 'get_stream_timeout'));
+
+        // no curTimeout, keepAlive
+        $ssh = $this->createSSHMock();
+        $ssh->setKeepAlive(2);
+        self::setVar($ssh, 'last_packet', microtime(true));
+        [$sec, $usec] = self::callFunc($ssh, 'get_stream_timeout');
+        $this->assertGreaterThanOrEqual(1, $sec);
+        $this->assertLessThanOrEqual(2, $sec);
+
+        // smaller curTimeout, keepAlive
+        $ssh = $this->createSSHMock();
+        $ssh->setTimeout(1);
+        $ssh->setKeepAlive(2);
+        self::setVar($ssh, 'last_packet', microtime(true));
+        $this->assertEquals([1, 0], self::callFunc($ssh, 'get_stream_timeout'));
+
+        // curTimeout, smaller keepAlive
+        $ssh = $this->createSSHMock();
+        $ssh->setTimeout(5);
+        $ssh->setKeepAlive(2);
+        self::setVar($ssh, 'last_packet', microtime(true));
+        [$sec, $usec] = self::callFunc($ssh, 'get_stream_timeout');
+        $this->assertGreaterThanOrEqual(1, $sec);
+        $this->assertLessThanOrEqual(2, $sec);
+
+        // no curTimeout, keepAlive, no last_packet
+        $ssh = $this->createSSHMock();
+        $ssh->setKeepAlive(2);
+        $this->assertEquals([0, 0], self::callFunc($ssh, 'get_stream_timeout'));
+
+        // no curTimeout, keepAlive, last_packet exceeds keepAlive
+        $ssh = $this->createSSHMock();
+        $ssh->setKeepAlive(2);
+        self::setVar($ssh, 'last_packet', microtime(true) - 2);
+        $this->assertEquals([0, 0], self::callFunc($ssh, 'get_stream_timeout'));
+    }
+
+    /**
+     * @requires PHPUnit < 10
+     */
+    public function testSendChannelPacketNoBufferedData(): void
+    {
+        $ssh = $this->getMockBuilder('phpseclib3\Net\SSH2')
+            ->disableOriginalConstructor()
+            ->setMethods(['get_channel_packet', 'send_binary_packet'])
+            ->getMock();
+        $ssh->expects($this->once())
+            ->method('get_channel_packet')
+            ->with(-1)
+            ->willReturnCallback(function () use ($ssh): void {
+                self::setVar($ssh, 'window_size_client_to_server', [1 => 0x7FFFFFFF]);
+            });
+        $ssh->expects($this->once())
+            ->method('send_binary_packet')
+            ->with(Strings::packSSH2('CNs', SSH2\MessageType::CHANNEL_DATA, 1, 'hello world'));
+        self::setVar($ssh, 'server_channels', [1 => 1]);
+        self::setVar($ssh, 'packet_size_client_to_server', [1 => 0x7FFFFFFF]);
+        self::setVar($ssh, 'window_size_client_to_server', [1 => 0]);
+        self::setVar($ssh, 'window_size_server_to_client', [1 => 0x7FFFFFFF]);
+
+        self::callFunc($ssh, 'send_channel_packet', [1, 'hello world']);
+        $this->assertEmpty(self::getVar($ssh, 'channel_buffers_write'));
+    }
+
+    /**
+     * @requires PHPUnit < 10
+     */
+    public function testSendChannelPacketBufferedData(): void
+    {
+        $ssh = $this->getMockBuilder('phpseclib3\Net\SSH2')
+            ->disableOriginalConstructor()
+            ->setMethods(['get_channel_packet', 'send_binary_packet'])
+            ->getMock();
+        $ssh->expects($this->once())
+            ->method('get_channel_packet')
+            ->with(-1)
+            ->willReturnCallback(function () use ($ssh): void {
+                self::setVar($ssh, 'window_size_client_to_server', [1 => 0x7FFFFFFF]);
+            });
+        $ssh->expects($this->once())
+            ->method('send_binary_packet')
+            ->with(Strings::packSSH2('CNs', SSH2\MessageType::CHANNEL_DATA, 1, ' world'));
+        self::setVar($ssh, 'channel_buffers_write', [1 => 'hello']);
+        self::setVar($ssh, 'server_channels', [1 => 1]);
+        self::setVar($ssh, 'packet_size_client_to_server', [1 => 0x7FFFFFFF]);
+        self::setVar($ssh, 'window_size_client_to_server', [1 => 0]);
+        self::setVar($ssh, 'window_size_server_to_client', [1 => 0x7FFFFFFF]);
+
+        self::callFunc($ssh, 'send_channel_packet', [1, 'hello world']);
+        $this->assertEmpty(self::getVar($ssh, 'channel_buffers_write'));
+    }
+
+    /**
+     * @requires PHPUnit < 10
+     */
+    public function testSendChannelPacketTimeout(): void
+    {
+        $this->expectException(TimeoutException::class);
+        $this->expectExceptionMessage('Timed out waiting for server');
+
+        $ssh = $this->getMockBuilder('phpseclib3\Net\SSH2')
+            ->disableOriginalConstructor()
+            ->setMethods(['get_channel_packet', 'send_binary_packet'])
+            ->getMock();
+        $ssh->expects($this->once())
+            ->method('get_channel_packet')
+            ->with(-1)
+            ->willReturnCallback(function () use ($ssh): void {
+                self::setVar($ssh, 'is_timeout', true);
+            });
+        $ssh->expects($this->once())
+            ->method('send_binary_packet')
+            ->with(Strings::packSSH2('CNs', SSH2\MessageType::CHANNEL_DATA, 1, 'hello'));
+        self::setVar($ssh, 'server_channels', [1 => 1]);
+        self::setVar($ssh, 'packet_size_client_to_server', [1 => 0x7FFFFFFF]);
+        self::setVar($ssh, 'window_size_client_to_server', [1 => 5]);
+        self::setVar($ssh, 'window_size_server_to_client', [1 => 0x7FFFFFFF]);
+
+        self::callFunc($ssh, 'send_channel_packet', [1, 'hello world']);
+        $this->assertEquals([1 => 'hello'], self::getVar($ssh, 'channel_buffers_write'));
+    }
+
+    /**
+     * @requires PHPUnit < 10
+     */
+    public function testSendChannelPacketNoWindowAdjustment(): void
+    {
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('Data window was not adjusted');
+
+        $ssh = $this->getMockBuilder('phpseclib3\Net\SSH2')
+            ->disableOriginalConstructor()
+            ->setMethods(['get_channel_packet', 'send_binary_packet'])
+            ->getMock();
+        $ssh->expects($this->once())
+            ->method('get_channel_packet')
+            ->with(-1);
+        $ssh->expects($this->never())
+            ->method('send_binary_packet');
+        self::setVar($ssh, 'server_channels', [1 => 1]);
+        self::setVar($ssh, 'packet_size_client_to_server', [1 => 0x7FFFFFFF]);
+        self::setVar($ssh, 'window_size_client_to_server', [1 => 0]);
+        self::setVar($ssh, 'window_size_server_to_client', [1 => 0x7FFFFFFF]);
+
+        self::callFunc($ssh, 'send_channel_packet', [1, 'hello world']);
+    }
+
+    /**
+     * @requires PHPUnit < 10
+     */
+    public function testDisconnectHelper(): void
+    {
+        $ssh = $this->getMockBuilder('phpseclib3\Net\SSH2')
+            ->disableOriginalConstructor()
+            ->setMethods(['__destruct', 'isConnected', 'send_binary_packet'])
+            ->getMock();
+        $ssh->expects($this->once())
+            ->method('isConnected')
+            ->willReturn(true);
+        $ssh->expects($this->once())
+            ->method('send_binary_packet')
+            ->with($this->isType('string'))
+            ->willReturnCallback(function () use ($ssh): void {
+                self::callFunc($ssh, 'disconnect_helper', [1]);
+                throw new \Exception('catch me');
+            });
+
+        $this->assertEquals(0, self::getVar($ssh, 'bitmap'));
+        self::callFunc($ssh, 'disconnect_helper', [1]);
+        $this->assertEquals(0, self::getVar($ssh, 'bitmap'));
+    }
+
+    protected function createSSHMock(): SSH2
+    {
+        return $this->getMockBuilder('phpseclib3\Net\SSH2')
+            ->disableOriginalConstructor()
+            ->setMethods(['__destruct'])
+            ->getMock();
+    }
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index bb137e4dc..000000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Bootstrapping File for phpseclib Test Suite
- *
- * @license http://www.opensource.org/licenses/mit-license.html MIT License
- */
-
-date_default_timezone_set('UTC');
-
-$loader_path = __DIR__ . '/../vendor/autoload.php';
-if (!file_exists($loader_path)) {
-    echo "Dependencies must be installed using composer:\n\n";
-    echo "php composer.phar install\n\n";
-    echo "See http://getcomposer.org for help with installing composer\n";
-    exit(1);
-}
-
-$loader = include $loader_path;
-$loader->add('', __DIR__);
diff --git a/tests/make_compatible_with_phpunit7.php b/tests/make_compatible_with_phpunit7.php
new file mode 100644
index 000000000..af7ab6b5f
--- /dev/null
+++ b/tests/make_compatible_with_phpunit7.php
@@ -0,0 +1,31 @@
+<?php
+
+/** @var iterable<SplFileInfo> $files */
+$files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(__DIR__));
+foreach ($files as $file) {
+    if ($file->getExtension() === 'php' && $file->getPathname() !== __FILE__) {
+        $fileContents = file_get_contents($file->getPathname());
+        if ($fileContents === false) {
+            throw new RuntimeException('file_get_contents() failed: ' . $file->getPathname());
+        }
+        $patternToReplacementMap = [
+            '~ function setUpBeforeClass\(\)~' => ' function setUpBeforeClass(): void',
+            '~ function setUp\(\)~' => ' function setUp(): void',
+            '~ function tearDown\(\)~' => ' function tearDown(): void',
+            '~ function assertIsArray\(\$actual, \$message = \'\'\)~' => ' function _assertIsArray($actual, string $message = \'\')',
+            '~ function assertIsResource\(\$actual, \$message = \'\'\)~' => ' function _assertIsResource($actual, string $message = \'\')',
+            '~ function assertIsObject\(\$actual, \$message = \'\'\)~' => ' function _assertIsObject($actual, string $message = \'\')',
+            '~ function assertIsString\(\$actual, \$message = \'\'\)~' => ' function _assertIsString($actual, string $message = \'\')',
+            '~ function assertStringContainsString\(\$needle, \$haystack, \$message = \'\'\)~' => ' function _assertStringContainsString(string $needle, string $haystack, string $message = \'\')',
+            '~ function assertStringNotContainsString\(\$needle, \$haystack, \$message = \'\'\)~' => ' function _assertStringNotContainsString(string $needle, string $haystack, string $message = \'\')'
+        ];
+        $updatedFileContents = preg_replace(
+            array_keys($patternToReplacementMap),
+            array_values($patternToReplacementMap),
+            $fileContents
+        );
+        if (file_put_contents($file->getPathname(), $updatedFileContents) === false) {
+            throw new RuntimeException('file_put_contents() failed: ' . $file->getPathname());
+        }
+    }
+}
diff --git a/tests/make_compatible_with_phpunit9.php b/tests/make_compatible_with_phpunit9.php
new file mode 100644
index 000000000..6df2d2eaa
--- /dev/null
+++ b/tests/make_compatible_with_phpunit9.php
@@ -0,0 +1,23 @@
+<?php
+
+/** @var iterable<SplFileInfo> $files */
+$files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(__DIR__));
+foreach ($files as $file) {
+    if ($file->getExtension() === 'php' && $file->getPathname() !== __FILE__) {
+        $fileContents = file_get_contents($file->getPathname());
+        if ($fileContents === false) {
+            throw new RuntimeException('file_get_contents() failed: ' . $file->getPathname());
+        }
+        $patternToReplacementMap = [
+            '~ function assertMatchesRegularExpression\(\$pattern, \$string, \$message = \'\'\)~' => ' function _assertMatchesRegularExpression(string $pattern, string $string, string $message = \'\')',
+        ];
+        $updatedFileContents = preg_replace(
+            array_keys($patternToReplacementMap),
+            array_values($patternToReplacementMap),
+            $fileContents
+        );
+        if (file_put_contents($file->getPathname(), $updatedFileContents) === false) {
+            throw new RuntimeException('file_put_contents() failed: ' . $file->getPathname());
+        }
+    }
+}
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
new file mode 100644
index 000000000..17a9ff831
--- /dev/null
+++ b/tests/phpunit.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+    bootstrap="../vendor/autoload.php"
+    failOnWarning="true"
+    failOnRisky="true"
+    failOnIncomplete="true"
+    failOnEmptyTestSuite="true"
+>
+    <testsuites>
+        <testsuite name="phpseclib Unit Test Suite">
+            <directory>./Unit/</directory>
+        </testsuite>
+        <testsuite name="phpseclib Functional Test Suite">
+            <directory>./Functional/</directory>
+        </testsuite>
+    </testsuites>
+    <coverage>
+        <include>
+            <directory>../phpseclib/</directory>
+        </include>
+    </coverage>
+    <php>
+        <ini name="date.timezone" value="UTC"/>
+    </php>
+</phpunit>
diff --git a/travis/code_coverage_id_rsa b/travis/code_coverage_id_rsa
deleted file mode 100644
index 25d4094ce..000000000
--- a/travis/code_coverage_id_rsa
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-128-CBC,2F15FCF0B21FCFB5A37D709322F9B9EB
-
-JpGgJqRnr0+3mHQoeYXXUzSWeA1wGwMzm6KOPnQLEmA9ztPlBQulzZRh6QJckCwy
-TC7BMo+XRnYVXF3e0rjji0k7cfEk5Gs8saNcxxOa0u0SUOCXelGnZeqzwiT0a6Fe
-qAc7NLgTEo9zul9s+MHsplkVk71Oke+1dL7kksMRT0TdXIaqSvk/+nyAeLzAot04
-wo61T3+Y7/v/8oVxlCbxI5YfYZkm/4jTy7AfbXZBvC0R+F0ZYvIDRCuBe6h6XvcH
-AiYtw5+Qek6FwIa2CFVxsefvsEnZQYaiJpEFAq2xVHlTjQHHYrfd5cgu1koUNsAt
-nX1zpsK7tIregXFa07KfDaBBPxfEBqVJQInzj0Rc8HUt0AZ+MrPldrZ28+YQ4RXk
-/qk5UyKkdHMSKBb4va3mxcpDq1As9HREfeUeOjjduRh1LnNQCJaOhydXBqCFvhFy
-+Q9utDXP6q4OUxeDHCPGQ7K1I7erwiwuTeSXB3BEDZyZywHXABvJpsidkDlD/aNo
-QmM19V8y0IAxEAZvc8N0MIOO8hmd8R9U1RK4S24o9M8mgRrmuXjViJjZd5E3h6tX
-Mgxm8dpOiT77i+NsJwyp2A+MhkAHg2ruwlCIrSCC81zvdphVTfuc/vx3JpXYvhTP
-Xf9R8ppGnDUFauroN7E7odJKDhLVuAbmU1lWwue2iaNEKZ3L/o9dpRz4Td4NzzSf
-HKvKbJR35FCsqZq2krmNVd6ynF5PzWfYmz850yn/qdU8zwnW0fV+iHKS2oXuH9X1
-ZW02/MDdCylpRftNJMntR4Yxim7WEZ5Dif9ZLj8IGRQdWbbIn0WjtiVrFrcUbIfk
-TCP/3GeEcUa/XbE9hO9APw+7rO3sOehGJ84n4tXxFTFSnOJ5ZxTKpLvxRrmC8DaD
-cvqy8bbjPfn1EjZmRpCjanLZ1UJbLitFfpUT55aTrcozS4FMHmFm74X2xZGeBhxC
-CpWQe/agxhWxG+ZXdxt9ExI78ftQCQoGE0Si1KZXH5KQ/xiGmebY9wbtEHWG+q25
-sKqvjQHQsE3NZq7kne3mnyvjzMDDFYPLDlQLgcKInNrLZ3GszyemtzqcVf3YVur4
-N+nN0gu6LCx0vtw3yNRqjjmGN1V6sKMCqmIAtFDh9zRTlDTs7ZUBGPgakmmJLLVM
-ESme0JrRxCP+eEU8JNti9pKlKPGOFVpu4shLjmnmKuDpOytFNpcB/NylkGwZCxvE
-1KI+EQMZOE5VROAfkvwBLE0SsVxMq7H87zSEOtOqr+QN8RoY1V6N/woBVWda9GFk
-HI44PM2ZywQbLGthaQV/Kxwf9YZruJdunNoTfEufZgv2Vp+3VAs+gCTGIsbblTnH
-J8QGfs/lHRBqK1pMZrYy0ubFqifA+b9Xa6VJWToCgcQuWbOVWn1zKQTTXZPksVbB
-qyE8BJkQCDGgoeq4kdxm0XUR5p3UZWQv0HoykQt33U06TCzU9HOcp0z+Glhrzsvd
-rbNBhRK0zXF/BFSNBHwKEg02TNlj7gSFJXmvZqvyCAFo5D6nSDbzqm6ARuscsrF0
-6Zd3toOZTWmrVsKvTlsNPfHXyoGqP3+0NXcTY+kKXG58u4TbEtw8pVyPikuVdh/m
------END RSA PRIVATE KEY-----
diff --git a/travis/install-php-extensions.sh b/travis/install-php-extensions.sh
deleted file mode 100755
index 5244261c8..000000000
--- a/travis/install-php-extensions.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-# This file is part of the phpseclib project.
-#
-# (c) Andreas Fischer <bantu@phpbb.com>
-#
-# For the full copyright and license information, please view the LICENSE
-# file that was distributed with this source code.
-#
-set -e
-
-function install_php_extension
-{
-    cd "$1"
-    phpize
-    ./configure
-    make
-    make install
-    cd ..
-    echo "extension=$1.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
-}
-
-# runkit
-git clone https://github.com/zenovich/runkit.git
-install_php_extension 'runkit'
diff --git a/travis/run-phpunit.sh b/travis/run-phpunit.sh
deleted file mode 100755
index 5ee69d667..000000000
--- a/travis/run-phpunit.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-set -e
-set -x
-
-export PHPSECLIB_SSH_HOSTNAME='localhost'
-export PHPSECLIB_SSH_USERNAME='phpseclib'
-export PHPSECLIB_SSH_PASSWORD='EePoov8po1aethu2kied1ne0'
-export PHPSECLIB_SSH_HOME='/home/phpseclib'
-
-if [ "$TRAVIS_PHP_VERSION" = '5.2' ]
-then
-  PHPUNIT="phpunit"
-else
-  PHPUNIT="$(dirname "$0")/../vendor/bin/phpunit"
-fi
-
-PHPUNIT_ARGS='--verbose'
-if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.4', '<');"` = "1" ]
-then
-  PHPUNIT_ARGS="$PHPUNIT_ARGS -d zend.enable_gc=0"
-fi
-
-if [ "$TRAVIS_PHP_VERSION" = 'hhvm' -o "$TRAVIS_PHP_VERSION" = '7.0' ]
-then
-  find tests -type f -name "*Test.php" | \
-    parallel --gnu --keep-order \
-      "echo '== {} =='; \"$PHPUNIT\" $PHPUNIT_ARGS {};"
-else
-  "$PHPUNIT" \
-    $PHPUNIT_ARGS \
-    --coverage-text \
-    --coverage-clover code_coverage/clover.xml \
-    --coverage-html code_coverage/
-fi
diff --git a/travis/setup-composer.sh b/travis/setup-composer.sh
deleted file mode 100755
index 3416074cc..000000000
--- a/travis/setup-composer.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-composer self-update --no-interaction
-composer install --no-interaction
diff --git a/travis/setup-secure-shell.sh b/travis/setup-secure-shell.sh
deleted file mode 100755
index 22395aa72..000000000
--- a/travis/setup-secure-shell.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# This file is part of the phpseclib project.
-#
-# (c) Andreas Fischer <bantu@phpbb.com>
-#
-# For the full copyright and license information, please view the LICENSE
-# file that was distributed with this source code.
-#
-set -e
-set -x
-
-USERNAME='phpseclib'
-PASSWORD='EePoov8po1aethu2kied1ne0'
-
-# Create phpseclib user and home directory
-sudo useradd --create-home --base-dir /home "$USERNAME"
-
-# Set phpseclib user password
-echo "$USERNAME:$PASSWORD" | sudo chpasswd
-
-# Create a 1024 bit RSA SSH key pair without passphrase for the travis user
-ssh-keygen -t rsa -b 1024 -f "$HOME/.ssh/id_rsa" -q -N ""
-
-# Add the generated private key to SSH agent of travis user
-ssh-add "$HOME/.ssh/id_rsa"
-
-# Allow the private key of the travis user to log in as phpseclib user
-sudo mkdir -p "/home/$USERNAME/.ssh/"
-sudo cp "$HOME/.ssh/id_rsa.pub" "/home/$USERNAME/.ssh/authorized_keys"
-sudo ssh-keyscan -t rsa localhost > "/tmp/known_hosts"
-sudo cp "/tmp/known_hosts" "/home/$USERNAME/.ssh/known_hosts"
-sudo chown "$USERNAME:$USERNAME" "/home/$USERNAME/.ssh/" -R
diff --git a/travis/upload-code-coverage-html.sh b/travis/upload-code-coverage-html.sh
deleted file mode 100755
index 668fb6a28..000000000
--- a/travis/upload-code-coverage-html.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-#
-# This file is part of the phpseclib project.
-#
-# (c) Andreas Fischer <bantu@phpbb.com>
-#
-# For the full copyright and license information, please view the LICENSE
-# file that was distributed with this source code.
-#
-
-USERNAME='phpseclib'
-HOSTNAME='phpseclib.bantux.org'
-HOSTRSAF='09:40:96:14:6a:cd:67:46:17:e5:b4:39:24:24:6e:9d'
-LDIRNAME='code_coverage'
-RDIRNAME='code_coverage'
-ID_RSA='travis/code_coverage_id_rsa'
-
-# Install expect if necessary
-if ! which expect > /dev/null
-then
-	sudo apt-get update -qq
-	sudo apt-get install -qq expect
-fi
-
-# Workaround for rsync not creating target directories with depth > 1
-mv "$LDIRNAME" "x$LDIRNAME"
-RROOT="$RDIRNAME/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER"
-mkdir -p "$RROOT"
-mv "x$LDIRNAME" "$RROOT/PHP-$TRAVIS_PHP_VERSION/"
-
-# Update latest symlink
-ln -s "$TRAVIS_BUILD_NUMBER" "$RDIRNAME/$TRAVIS_BRANCH/latest"
-
-# Stop complaints about world-readable key file.
-chmod 600 "$ID_RSA"
-
-export RSYNC_RSH="ssh -4 -i $ID_RSA -o ConnectTimeout=5"
-RSYNC_OPT="--recursive --times --links --progress"
-
-expect << EOF
-	spawn rsync $RSYNC_OPT "$RDIRNAME/" "$USERNAME@$HOSTNAME:$RDIRNAME/"
-
-	expect "RSA key fingerprint is $HOSTRSAF."
-	send "yes\n"
-
-	expect "Enter passphrase for key '$ID_RSA':"
-	send "$CODE_COVERAGE_PASSPHRASE\n"
-
-	expect eof
-EOF