Update LUKS2 docs.

- update test images for validation fixes
  from previous commits

- erase leftover json data in between secondary
  header and keyslot areas.

.github/workflows/cibuild-setup-ubuntu.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-PACKAGES=(
-	git make autoconf automake autopoint pkg-config libtool libtool-bin
-	gettext libssl-dev libdevmapper-dev libpopt-dev uuid-dev libsepol-dev
-	libjson-c-dev libssh-dev libblkid-dev tar libargon2-0-dev libpwquality-dev
-	sharutils dmsetup jq xxd expect keyutils netcat passwd openssh-client sshpass
-	asciidoctor
-)
-
-COMPILER="${COMPILER:?}"
-COMPILER_VERSION="${COMPILER_VERSION:?}"
-RELEASE="$(lsb_release -cs)"
-
-bash -c "echo 'deb-src http://archive.ubuntu.com/ubuntu/ $RELEASE main restricted universe multiverse' >>/etc/apt/sources.list"
-
-# Latest gcc stack deb packages provided by
-# https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test
-add-apt-repository -y ppa:ubuntu-toolchain-r/test
-PACKAGES+=(gcc-$COMPILER_VERSION)
-
-# scsi_debug, gost crypto
-PACKAGES+=(dkms linux-headers-$(uname -r) linux-modules-extra-$(uname -r) gost-crypto-dkms)
-
-apt-get -y update --fix-missing
-apt-get -y install "${PACKAGES[@]}"
-apt-get -y build-dep cryptsetup

.github/workflows/cibuild.sh

@@ -1,38 +0,0 @@
-#!/bin/bash
-
-PHASES=(${@:-CONFIGURE MAKE CHECK})
-COMPILER="${COMPILER:?}"
-COMPILER_VERSION="${COMPILER_VERSION}"
-CFLAGS=(-O1 -g)
-CXXFLAGS=(-O1 -g)
-
-CC="gcc${COMPILER_VERSION:+-$COMPILER_VERSION}"
-CXX="g++${COMPILER_VERSION:+-$COMPILER_VERSION}"
-
-set -ex
-
-for phase in "${PHASES[@]}"; do
-	case $phase in
-	CONFIGURE)
-		opts=(
-			--enable-libargon2
-		)
-
-		sudo -E git clean -xdf
-
-		./autogen.sh
-		CC="$CC" CXX="$CXX" CFLAGS="${CFLAGS[@]}" CXXFLAGS="${CXXFLAGS[@]}" ./configure "${opts[@]}"
-		;;
-	MAKE)
-		make -j
-		make -j -C tests check-programs
-		;;
-	CHECK)
-		make check
-		;;
-
-	*)
-		echo >&2 "Unknown phase '$phase'"
-		exit 1
-	esac
-done

.github/workflows/cibuild.yml

@@ -1,30 +0,0 @@
-name: Build test
-on:
-  push:
-    branches:
-      - 'main'
-      - 'wip-luks2'
-      - 'v2.3.x'
-      - 'v2.4.x'
-    paths-ignore:
-      - 'docs/**'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    if: github.repository == 'mbroz/cryptsetup'
-    strategy:
-      fail-fast: false
-      matrix:
-        env:
-          - { COMPILER: "gcc", COMPILER_VERSION: "11",  RUN_SSH_PLUGIN_TEST: "1" }
-    env: ${{ matrix.env }}
-    steps:
-      - name: Repository checkout
-        uses: actions/checkout@v1
-      - name: Ubuntu setup
-        run: sudo -E .github/workflows/cibuild-setup-ubuntu.sh
-      - name: Configure & Make
-        run: .github/workflows/cibuild.sh CONFIGURE MAKE
-      - name: Check
-        run: sudo -E .github/workflows/cibuild.sh CHECK

.github/workflows/coverity.yml

@@ -1,48 +0,0 @@
-name: Coverity test
-on:
-  push:
-    branches:
-      - 'coverity_scan'
-    paths-ignore:
-      - 'docs/**'
-
-jobs:
-  latest:
-    runs-on: ubuntu-latest
-    if: github.repository == 'mbroz/cryptsetup'
-    steps:
-      - name: Repository checkout
-        uses: actions/checkout@v1
-      - name: Ubuntu setup
-        run: sudo -E .github/workflows/cibuild-setup-ubuntu.sh
-        env:
-          COMPILER: "gcc"
-          COMPILER_VERSION: "11"
-      - name: Install Coverity
-        run: |
-          wget -q https://scan.coverity.com/download/cxx/linux64 --post-data "token=$TOKEN&project=mbroz/cryptsetup" -O cov-analysis-linux64.tar.gz
-          mkdir cov-analysis-linux64
-          tar xzf cov-analysis-linux64.tar.gz --strip 1 -C cov-analysis-linux64
-        env:
-          TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
-      - name: Run autoconf & configure
-        run: |
-          ./autogen.sh
-          ./configure
-      - name: Run cov-build
-        run: |
-          export PATH=`pwd`/cov-analysis-linux64/bin:$PATH
-          cov-build --dir cov-int make
-      - name: Submit to Coverity Scan
-        run: |
-          tar czvf cryptsetup.tgz cov-int
-          curl \
-            --form project=mbroz/cryptsetup \
-            --form token=$TOKEN \
-            --form email=gmazyland@gmail.com \
-            --form file=@cryptsetup.tgz \
-            --form version=trunk \
-            --form description="`./cryptsetup --version`" \
-            https://scan.coverity.com/builds?project=mbroz/cryptsetup
-        env:
-          TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}

.gitignore

@@ -6,8 +6,6 @@ Makefile.in.in
 *.lo
 *.la
 *.o
-*.so
-*.8
 **/*.dirstamp
 .deps/
 .libs/
@@ -27,7 +25,6 @@ config.sub
 configure
 cryptsetup
 cryptsetup-reencrypt
-cryptsetup-ssh
 depcomp
 install-sh
 integritysetup
@@ -39,6 +36,7 @@ missing
 po/Makevars.template
 po/POTFILES
 po/Rules-quot
+po/*.pot
 po/*.header
 po/*.sed
 po/*.sin
@@ -47,15 +45,3 @@ scripts/cryptsetup.conf
 stamp-h1
 veritysetup
 tests/valglog.*
-*/*.dirstamp
-*-debug-luks2-backup*
-tests/api-test
-tests/api-test-2
-tests/differ
-tests/luks1-images
-tests/tcrypt-images
-tests/unit-utils-io
-tests/vectors-test
-tests/test-symbols-list.h
-tests/all-symbols-test
-tests/fuzz/LUKS2.pb*

.gitlab-ci.yml

@@ -1,22 +0,0 @@
-stages:
-  - test
-
-.dump_kernel_log:
-  after_script:
-    - sudo dmesg > /mnt/artifacts/dmesg.log
-    - sudo journalctl > /mnt/artifacts/journalctl.log
-    - '[ "$(ls -A /var/coredumps)" ] && exit 1 || true'
-
-include:
-  - local: .gitlab/ci/debian.yml
-  - local: .gitlab/ci/fedora.yml
-  - local: .gitlab/ci/rhel.yml
-  - local: .gitlab/ci/centos.yml
-  - local: .gitlab/ci/annocheck.yml
-  - local: .gitlab/ci/csmock.yml
-  - local: .gitlab/ci/gitlab-shared-docker.yml
-  - local: .gitlab/ci/compilation-gcc.gitlab-ci.yml
-  - local: .gitlab/ci/compilation-clang.gitlab-ci.yml
-  - local: .gitlab/ci/alpinelinux.yml
-  - local: .gitlab/ci/ubuntu-32bit.yml
-  - local: .gitlab/ci/cifuzz.yml

.gitlab/ci/alpinelinux.yml

@@ -1,55 +0,0 @@
-.alpinelinux-dependencies:
-  after_script:
-    - sudo dmesg > /mnt/artifacts/dmesg.log
-    - sudo cp /var/log/messages /mnt/artifacts/
-    - '[ "$(ls -A /var/coredumps)" ] && exit 1 || true'
-  before_script:
-    - >
-      sudo apk add
-      lvm2-dev openssl1.1-compat-dev popt-dev util-linux-dev json-c-dev
-      argon2-dev device-mapper which sharutils gettext gettext-dev automake
-      autoconf libtool build-base keyutils tar jq expect git asciidoctor
-    - ./autogen.sh
-    - ./configure --prefix=/usr --libdir=/lib --sbindir=/sbin --disable-static --enable-libargon2 --with-crypto_backend=openssl --disable-external-tokens --disable-ssh-token --enable-asciidoc
-
-test-main-commit-job-alpinelinux:
-  extends:
-    - .alpinelinux-dependencies
-  tags:
-    - libvirt
-    - alpinelinux
-  stage: test
-  interruptible: true
-  variables:
-    RUN_SSH_PLUGIN_TEST: "0"
-  rules:
-    - if: $RUN_SYSTEMD_PLUGIN_TEST != null
-      when: never
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/
-  script:
-    - make -j
-    - make -j -C tests check-programs
-    - sudo -E make check
-
-test-mergerq-job-alpinelinux:
-  extends:
-    - .alpinelinux-dependencies
-  tags:
-    - libvirt
-    - alpinelinux
-  stage: test
-  interruptible: true
-  variables:
-    RUN_SSH_PLUGIN_TEST: "0"
-  rules:
-    - if: $RUN_SYSTEMD_PLUGIN_TEST != null
-      when: never
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-  script:
-    - make -j
-    - make -j -C tests check-programs
-    - sudo -E make check

.gitlab/ci/annocheck.yml

@@ -1,19 +0,0 @@
-test-main-commit-job-annocheck:
-  extends:
-    - .dump_kernel_log
-  tags:
-    - libvirt
-    - rhel9-annocheck
-  stage: test
-  interruptible: true
-  allow_failure: true
-  variables:
-    RUN_SSH_PLUGIN_TEST: "1"
-  rules:
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/
-  script:
-    - /opt/build-rpm-script.sh > /dev/null 2>&1
-    - annocheck /var/lib/mock/rhel-9.0.0-candidate-x86_64/result/*.rpm --profile=el9
-    - annocheck /var/lib/mock/rhel-9.0.0-candidate-x86_64/result/*.rpm --profile=el8

.gitlab/ci/centos.yml

@@ -1,59 +0,0 @@
-.centos-openssl-backend:
-  extends:
-    - .dump_kernel_log
-  before_script:
-    - >
-      sudo dnf -y -q  install
-      autoconf automake device-mapper-devel gcc gettext-devel json-c-devel
-      libblkid-devel libpwquality-devel libselinux-devel libssh-devel libtool
-      libuuid-devel make popt-devel libsepol-devel nc openssh-clients passwd
-      pkgconfig sharutils sshpass tar uuid-devel vim-common device-mapper
-      expect gettext git jq keyutils openssl-devel openssl gem
-    - sudo gem install asciidoctor
-    - sudo -E git clean -xdf
-    - ./autogen.sh
-    - ./configure --enable-fips --enable-pwquality --with-crypto_backend=openssl --enable-asciidoc
-
-# non-FIPS jobs
-
-test-main-commit-centos-stream9:
-  extends:
-    - .centos-openssl-backend
-  tags:
-    - libvirt
-    - centos-stream9
-  stage: test
-  interruptible: true
-  variables:
-    RUN_SSH_PLUGIN_TEST: "1"
-  rules:
-    - if: $RUN_SYSTEMD_PLUGIN_TEST != null
-      when: never
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/
-  script:
-    - make -j
-    - make -j -C tests check-programs
-    - sudo -E make check
-
-test-mergerq-centos-stream9:
-  extends:
-    - .centos-openssl-backend
-  tags:
-    - libvirt
-    - centos-stream9
-  stage: test
-  interruptible: true
-  variables:
-    RUN_SSH_PLUGIN_TEST: "1"
-  rules:
-    - if: $RUN_SYSTEMD_PLUGIN_TEST != null
-      when: never
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-  script:
-    - make -j
-    - make -j -C tests check-programs
-    - sudo -E make check

.gitlab/ci/cibuild-setup-ubuntu.sh

@@ -1,50 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-PACKAGES=(
-	git make autoconf automake autopoint pkg-config libtool libtool-bin
-	gettext libssl-dev libdevmapper-dev libpopt-dev uuid-dev libsepol-dev
-	libjson-c-dev libssh-dev libblkid-dev tar libargon2-0-dev libpwquality-dev
-	sharutils dmsetup jq xxd expect keyutils netcat passwd openssh-client sshpass
-	asciidoctor
-)
-
-COMPILER="${COMPILER:?}"
-COMPILER_VERSION="${COMPILER_VERSION:?}"
-
-grep -E '^deb' /etc/apt/sources.list > /etc/apt/sources.list~
-sed -Ei 's/^deb /deb-src /' /etc/apt/sources.list~
-cat /etc/apt/sources.list~ >> /etc/apt/sources.list
-
-apt-get -y update --fix-missing
-DEBIAN_FRONTEND=noninteractive apt-get -yq install software-properties-common wget lsb-release
-RELEASE="$(lsb_release -cs)"
-
-if [[ $COMPILER == "gcc" ]]; then
-	# Latest gcc stack deb packages provided by
-	# https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test
-	add-apt-repository -y ppa:ubuntu-toolchain-r/test
-	PACKAGES+=(gcc-$COMPILER_VERSION)
-elif [[ $COMPILER == "clang" ]]; then
-	wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
-	add-apt-repository "deb http://apt.llvm.org/${RELEASE}/   llvm-toolchain-${RELEASE}-${COMPILER_VERSION} main"
-
-	# scan-build
-	PACKAGES+=(clang-tools-$COMPILER_VERSION clang-$COMPILER_VERSION lldb-$COMPILER_VERSION lld-$COMPILER_VERSION clangd-$COMPILER_VERSION)
-	PACKAGES+=(perl)
-else
-	exit 1
-fi
-
-apt-get -y update --fix-missing
-DEBIAN_FRONTEND=noninteractive apt-get -yq install "${PACKAGES[@]}"
-apt-get -y build-dep cryptsetup
-
-echo "====================== VERSIONS ==================="
-if [[ $COMPILER == "clang" ]]; then
-	echo "Using scan-build${COMPILER_VERSION:+-$COMPILER_VERSION}"
-fi
-
-${COMPILER}-$COMPILER_VERSION -v
-echo "====================== END VERSIONS ==================="

.gitlab/ci/cifuzz.yml

@@ -1,46 +0,0 @@
-cifuzz:
-  variables:
-    OSS_FUZZ_PROJECT_NAME: cryptsetup
-    CFL_PLATFORM: gitlab
-    CIFUZZ_DEBUG: "True"
-    FUZZ_SECONDS: 300 # 5 minutes per fuzzer
-    ARCHITECTURE: "x86_64"
-    DRY_RUN: "False"
-    LOW_DISK_SPACE: "True"
-    BAD_BUILD_CHECK: "True"
-    LANGUAGE: "c"
-    DOCKER_HOST: "tcp://docker:2375"
-    DOCKER_IN_DOCKER: "true"
-    DOCKER_DRIVER: overlay2
-    DOCKER_TLS_CERTDIR: ""
-  image:
-    name: gcr.io/oss-fuzz-base/cifuzz-base
-    entrypoint: [""]
-  services:
-    - docker:dind
-
-  stage: test
-  parallel:
-    matrix:
-      - SANITIZER: [address, undefined, memory]
-  rules:
-    # Default code change.
-    # - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    #   variables:
-    #     MODE: "code-change"
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $BUILD_AND_RUN_FUZZERS != null
-  before_script:
-    # Get gitlab's container id.
-    - export CFL_CONTAINER_ID=`cut -c9- < /proc/1/cpuset`
-  script:
-    # Will build and run the fuzzers.
-    # We use a hack to override CI_JOB_ID, because otherwise a bad path is used
-    # in GitLab CI environment
-    - CI_JOB_ID="$CI_PROJECT_NAMESPACE/$CI_PROJECT_TITLE" python3 "/opt/oss-fuzz/infra/cifuzz/cifuzz_combined_entrypoint.py"
-  artifacts:
-    # Upload artifacts when a crash makes the job fail.
-    when: always
-    paths:
-      - artifacts/

.gitlab/ci/clang-Wall

@@ -1,49 +0,0 @@
-#!/bin/bash
-# clang -Wall plus other important warnings not included in -Wall
-
-for arg in "$@"
-do
-	case $arg in
-	-O*) Wuninitialized=-Wuninitialized;;  # only makes sense with `-O'
-	esac
-done
-
-CLANG="clang${COMPILER_VERSION:+-$COMPILER_VERSION}"
-
-#PEDANTIC="-std=gnu99"
-#PEDANTIC="-pedantic -std=gnu99"
-#PEDANTIC="-pedantic -std=gnu99 -Wno-variadic-macros"
-#CONVERSION="-Wconversion"
-
-EXTRA="\
- -Wextra \
- -Wsign-compare \
- -Wcast-align
- -Werror-implicit-function-declaration \
- -Wpointer-arith \
- -Wwrite-strings \
- -Wswitch \
- -Wmissing-format-attribute \
- -Winit-self \
- -Wdeclaration-after-statement \
- -Wold-style-definition \
- -Wno-missing-field-initializers \
- -Wno-unused-parameter \
- -Wno-long-long"
-
-exec $CLANG $PEDANTIC $CONVERSION \
-	-Wall $Wuninitialized \
-	-Wno-switch \
-	-Wdisabled-optimization \
-	-Wwrite-strings \
-	-Wpointer-arith \
-	-Wbad-function-cast \
-	-Wmissing-prototypes \
-	-Wmissing-declarations \
-	-Wstrict-prototypes \
-	-Wnested-externs \
-	-Wcomment \
-	-Winline \
-	-Wcast-qual \
-	-Wredundant-decls $EXTRA \
-	"$@"

.gitlab/ci/compilation-clang.gitlab-ci.yml

@@ -1,27 +0,0 @@
-test-clang-compilation:
-  extends:
-    - .gitlab-shared-clang
-  script:
-    - export CFLAGS="-Wall -Werror"
-    - ./configure
-    - make -j
-    - make -j check-programs
-
-test-clang-Wall-script:
-  extends:
-    - .gitlab-shared-clang
-  script:
-    - export CFLAGS="-g -O0"
-    - export CC="$CI_PROJECT_DIR/.gitlab/ci/clang-Wall"
-    - ./configure
-    - make -j CFLAGS="-g -O0 -Werror"
-    - make -j CFLAGS="-g -O0 -Werror" check-programs
-
-test-scan-build:
-  extends:
-    - .gitlab-shared-clang
-  script:
-    - scan-build${COMPILER_VERSION:+-$COMPILER_VERSION} -V ./configure CFLAGS="-g -O0"
-    - make clean
-    - scan-build${COMPILER_VERSION:+-$COMPILER_VERSION} --status-bugs -maxloop 10 make -j
-    - scan-build${COMPILER_VERSION:+-$COMPILER_VERSION} --status-bugs -maxloop 10 make -j check-programs

.gitlab/ci/compilation-gcc.gitlab-ci.yml

@@ -1,27 +0,0 @@
-test-gcc-compilation:
-  extends:
-    - .gitlab-shared-gcc
-  script:
-    - export CFLAGS="-Wall -Werror"
-    - ./configure
-    - make -j
-    - make -j check-programs
-
-test-gcc-Wall-script:
-  extends:
-    - .gitlab-shared-gcc
-  script:
-    - export CFLAGS="-g -O0"
-    - export CC="$CI_PROJECT_DIR/.gitlab/ci/gcc-Wall"
-    - ./configure
-    - make -j CFLAGS="-g -O0 -Werror"
-    - make -j CFLAGS="-g -O0 -Werror" check-programs
-
-test-gcc-fanalyzer:
-  extends:
-    - .gitlab-shared-gcc
-  script:
-    - export CFLAGS="-Wall -Werror -g -O0 -fanalyzer -fdiagnostics-path-format=separate-events"
-    - ./configure
-    - make -j
-    - make -j check-programs

.gitlab/ci/csmock.yml

@@ -1,17 +0,0 @@
-test-commit-job-csmock:
-  extends:
-    - .dump_kernel_log
-  tags:
-    - libvirt
-    - rhel7-csmock
-  stage: test
-  interruptible: true
-  allow_failure: true
-  variables:
-    RUN_SSH_PLUGIN_TEST: "1"
-  rules:
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/ || $CI_PIPELINE_SOURCE == "merge_request_event"
-  script:
-    - /opt/csmock-run-script.sh

.gitlab/ci/debian.yml

@@ -1,56 +0,0 @@
-.debian-prep:
-  extends:
-    - .dump_kernel_log
-  before_script:
-    - >
-      [ -z "$RUN_SYSTEMD_PLUGIN_TEST" ] ||
-      sudo apt-get -y install -y -qq swtpm meson ninja-build python3-jinja2
-      gperf libcap-dev tpm2-tss-engine-dev libmount-dev swtpm-tools
-    - >
-      sudo apt-get -y install -y -qq git gcc make autoconf automake autopoint
-      pkgconf libtool libtool-bin gettext libssl-dev libdevmapper-dev
-      libpopt-dev uuid-dev libsepol-dev libjson-c-dev libssh-dev libblkid-dev
-      tar libargon2-0-dev libpwquality-dev sharutils dmsetup jq xxd expect
-      keyutils netcat passwd openssh-client sshpass asciidoctor
-    - sudo apt-get -y build-dep cryptsetup
-    - sudo -E git clean -xdf
-    - ./autogen.sh
-    - ./configure --enable-libargon2 --enable-asciidoc
-
-test-mergerq-job-debian:
-  extends:
-    - .debian-prep
-  tags:
-    - libvirt
-    - debian11
-  stage: test
-  interruptible: true
-  variables:
-    RUN_SSH_PLUGIN_TEST: "1"
-  rules:
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-  script:
-    - make -j
-    - make -j -C tests check-programs
-    - sudo -E make check
-
-test-main-commit-job-debian:
-  extends:
-    - .debian-prep
-  tags:
-    - libvirt
-    - debian11
-  stage: test
-  interruptible: true
-  variables:
-    RUN_SSH_PLUGIN_TEST: "1"
-  rules:
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/
-  script:
-    - make -j
-    - make -j -C tests check-programs
-    - sudo -E make check

.gitlab/ci/fedora.yml

@@ -1,60 +0,0 @@
-.dnf-openssl-backend:
-  extends:
-    - .dump_kernel_log
-  before_script:
-    - >
-      [ -z "$RUN_SYSTEMD_PLUGIN_TEST" ] ||
-      sudo dnf -y -q install
-      swtpm meson ninja-build python3-jinja2 gperf libcap-devel tpm2-tss-devel
-      libmount-devel swtpm-tools
-    - >
-      sudo dnf -y -q install
-      autoconf automake device-mapper-devel gcc gettext-devel json-c-devel
-      libargon2-devel libblkid-devel libpwquality-devel libselinux-devel
-      libssh-devel libtool libuuid-devel make popt-devel
-      libsepol-devel.x86_64 netcat openssh-clients passwd pkgconfig sharutils
-      sshpass tar uuid-devel vim-common device-mapper expect gettext git jq
-      keyutils openssl-devel openssl asciidoctor
-    - sudo -E git clean -xdf
-    - ./autogen.sh
-    - ./configure --enable-fips --enable-pwquality --enable-libargon2 --with-crypto_backend=openssl --enable-asciidoc
-
-test-main-commit-job-rawhide:
-  extends:
-    - .dnf-openssl-backend
-  tags:
-    - libvirt
-    - fedora-rawhide
-  stage: test
-  interruptible: true
-  allow_failure: true
-  variables:
-    RUN_SSH_PLUGIN_TEST: "1"
-  rules:
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/
-  script:
-    - make -j
-    - make -j -C tests check-programs
-    - sudo -E make check
-
-test-mergerq-job-rawhide:
-  extends:
-    - .dnf-openssl-backend
-  tags:
-    - libvirt
-    - fedora-rawhide
-  stage: test
-  interruptible: true
-  allow_failure: true
-  variables:
-    RUN_SSH_PLUGIN_TEST: "1"
-  rules:
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-  script:
-    - make -j
-    - make -j -C tests check-programs
-    - sudo -E make check

.gitlab/ci/gcc-Wall

@@ -1,57 +0,0 @@
-#!/bin/bash
-# gcc -Wall plus other important warnings not included in -Wall
-
-for arg in "$@"
-do
-	case $arg in
-	-O*) Wuninitialized=-Wuninitialized;;  # only makes sense with `-O'
-	esac
-done
-
-GCC="gcc${COMPILER_VERSION:+-$COMPILER_VERSION}"
-
-#PEDANTIC="-std=gnu99"
-#PEDANTIC="-pedantic -std=gnu99"
-#PEDANTIC="-pedantic -std=gnu99 -Wno-variadic-macros"
-#CONVERSION="-Wconversion"
-# -Wpacked \
-
-# This does more than expected for gcc (mixed code with declarations)
-# -Wdeclaration-after-statement \
-
-EXTRA="-Wextra \
- -Wsign-compare \
- -Werror-implicit-function-declaration \
- -Wpointer-arith \
- -Wwrite-strings \
- -Wswitch \
- -Wmissing-format-attribute \
- -Wstrict-aliasing=3 \
- -Winit-self \
- -Wunsafe-loop-optimizations \
- -Wold-style-definition \
- -Wno-missing-field-initializers \
- -Wno-unused-parameter \
- -Wno-long-long \
- -Wmaybe-uninitialized \
- -Wvla \
- -Wformat-overflow \
- -Wformat-truncation"
-
-exec $GCC $PEDANTIC $CONVERSION \
-	-Wall $Wuninitialized \
-	-Wno-switch \
-	-Wdisabled-optimization \
-	-Wwrite-strings \
-	-Wpointer-arith \
-	-Wbad-function-cast \
-	-Wmissing-prototypes \
-	-Wmissing-declarations \
-	-Wstrict-prototypes \
-	-Wnested-externs \
-	-Wcomment \
-	-Winline \
-	-Wcast-align=strict \
-	-Wcast-qual \
-	-Wredundant-decls $EXTRA \
-	"$@"

.gitlab/ci/gitlab-shared-docker.yml

@@ -1,31 +0,0 @@
-.gitlab-shared-docker:
-  image: ubuntu:focal
-  tags:
-    - gitlab-org-docker
-  stage: test
-  interruptible: true
-  rules:
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/
-  before_script:
-    - .gitlab/ci/cibuild-setup-ubuntu.sh
-    - export CC="${COMPILER}${COMPILER_VERSION:+-$COMPILER_VERSION}"
-    - export CXX="${COMPILER}++${COMPILER_VERSION:+-$COMPILER_VERSION}"
-    - ./autogen.sh
-
-.gitlab-shared-gcc:
-  extends:
-    - .gitlab-shared-docker
-  variables:
-    COMPILER: "gcc"
-    COMPILER_VERSION: "11"
-    RUN_SSH_PLUGIN_TEST: "1"
-
-.gitlab-shared-clang:
-  extends:
-    - .gitlab-shared-docker
-  variables:
-    COMPILER: "clang"
-    COMPILER_VERSION: "13"
-    RUN_SSH_PLUGIN_TEST: "1"

.gitlab/ci/rhel.yml

@@ -1,106 +0,0 @@
-.rhel-openssl-backend:
-  extends:
-    - .dump_kernel_log
-  before_script:
-    - >
-      sudo yum -y -q  install
-      autoconf automake device-mapper-devel gcc gettext-devel json-c-devel
-      libblkid-devel libpwquality-devel libselinux-devel libssh-devel libtool
-      libuuid-devel make popt-devel libsepol-devel nc openssh-clients passwd
-      pkgconfig sharutils sshpass tar uuid-devel vim-common device-mapper
-      expect gettext git jq keyutils openssl-devel openssl gem > /dev/null 2>&1
-    - sudo gem install asciidoctor
-    - sudo -E git clean -xdf
-    - ./autogen.sh
-    - ./configure --enable-fips --enable-pwquality --with-crypto_backend=openssl --enable-asciidoc
-
-# non-FIPS jobs
-
-test-main-commit-rhel8:
-  extends:
-    - .rhel-openssl-backend
-  tags:
-    - libvirt
-    - rhel8
-  stage: test
-  interruptible: true
-  variables:
-    RUN_SSH_PLUGIN_TEST: "1"
-  rules:
-    - if: $RUN_SYSTEMD_PLUGIN_TEST != null
-      when: never
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/
-  script:
-    - make -j
-    - make -j -C tests check-programs
-    - sudo -E make check
-
-test-main-commit-rhel9:
-  extends:
-    - .rhel-openssl-backend
-  tags:
-    - libvirt
-    - rhel9
-  stage: test
-  interruptible: true
-  variables:
-    RUN_SSH_PLUGIN_TEST: "1"
-  rules:
-    - if: $RUN_SYSTEMD_PLUGIN_TEST != null
-      when: never
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/
-  script:
-    - make -j
-    - make -j -C tests check-programs
-    - sudo -E make check
-
-# FIPS jobs
-
-test-main-commit-rhel8-fips:
-  extends:
-    - .rhel-openssl-backend
-  tags:
-    - libvirt
-    - rhel8-fips
-  stage: test
-  interruptible: true
-  variables:
-    RUN_SSH_PLUGIN_TEST: "1"
-  rules:
-    - if: $RUN_SYSTEMD_PLUGIN_TEST != null
-      when: never
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/
-  script:
-    - fips-mode-setup --check || exit 1
-    - make -j
-    - make -j -C tests check-programs
-    - sudo -E make check
-
-test-main-commit-rhel9-fips:
-  extends:
-    - .rhel-openssl-backend
-  tags:
-    - libvirt
-    - rhel9-fips
-  stage: test
-  interruptible: true
-  allow_failure: true
-  variables:
-    RUN_SSH_PLUGIN_TEST: "1"
-  rules:
-    - if: $RUN_SYSTEMD_PLUGIN_TEST != null
-      when: never
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/
-  script:
-    - fips-mode-setup --check || exit 1
-    - make -j
-    - make -j -C tests check-programs
-    - sudo -E make check

.gitlab/ci/ubuntu-32bit.yml

@@ -1,41 +0,0 @@
-test-mergerq-job-ubuntu-32bit:
-  extends:
-    - .debian-prep
-  tags:
-    - libvirt
-    - ubuntu-bionic-32bit
-  stage: test
-  interruptible: true
-  variables:
-    RUN_SSH_PLUGIN_TEST: "1"
-  rules:
-    - if: $RUN_SYSTEMD_PLUGIN_TEST != null
-      when: never
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-  script:
-    - make -j
-    - make -j -C tests check-programs
-    - sudo -E make check
-
-test-main-commit-job-ubuntu-32bit:
-  extends:
-    - .debian-prep
-  tags:
-    - libvirt
-    - ubuntu-bionic-32bit
-  stage: test
-  interruptible: true
-  variables:
-    RUN_SSH_PLUGIN_TEST: "1"
-  rules:
-    - if: $RUN_SYSTEMD_PLUGIN_TEST != null
-      when: never
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/
-  script:
-    - make -j
-    - make -j -C tests check-programs
-    - sudo -E make check

.gitlab/issue_templates/Bug.md

@@ -1,15 +0,0 @@
-### Issue description
-<!-- Please, shortly describe the issue here. -->
-
-### Steps for reproducing the issue
-<!-- How it can be reproduced? Include all important steps. -->
-
-### Additional info
-<!-- Please mention what distribution you are using. -->
-
-### Debug log
-<!-- Paste a debug log of the failing command (add --debug option) between the markers below (to keep raw debug format).-->
-```
-Output with --debug option:
-
-```

.gitlab/issue_templates/Documentation.md

@@ -1,5 +0,0 @@
-### Documentation issue
-<!-- Please, shortly describe the issue in documentation here. -->
-
-### Additional info
-<!-- Please mention what cryptsetup version you are using. -->

.gitlab/issue_templates/Feature.md

@@ -1,5 +0,0 @@
-### New feature description
-<!-- Please, shortly describe the requested feature here. -->
-
-### Additional info
-<!-- Please mention what distribution and cryptsetup version you are using. -->

.lgtm.yml

@@ -1,11 +0,0 @@
-queries:
-  - exclude: cpp/fixme-comment
-  - exclude: cpp/empty-block
-# symver attribute detection cannot be used, disable it for lgtm
-extraction:
-  cpp:
-    configure:
-      command:
-      - "./autogen.sh"
-      - "./configure --enable-external-tokens --enable-ssh-token"
-      - "echo \"#undef HAVE_ATTRIBUTE_SYMVER\" >> config.h"

.travis-functions.sh

@@ -0,0 +1,157 @@
+#!/bin/bash
+#
+# .travis-functions.sh:
+#   - helper functions to be sourced from .travis.yml
+#   - designed to respect travis' environment but testing locally is possible
+#   - modified copy from util-linux project
+#
+
+if [ ! -f "configure.ac" ]; then
+	echo ".travis-functions.sh must be sourced from source dir" >&2
+	return 1 || exit 1
+fi
+
+## some config settings
+# travis docs say we get 1.5 CPUs
+MAKE="make -j2"
+DUMP_CONFIG_LOG="short"
+export TS_OPT_parsable="yes"
+
+function configure_travis
+{
+	./configure "$@"
+	err=$?
+	if [ "$DUMP_CONFIG_LOG" = "short" ]; then
+		grep -B1 -A10000 "^## Output variables" config.log | grep -v "_FALSE="
+	elif [ "$DUMP_CONFIG_LOG" = "full" ]; then
+		cat config.log
+	fi
+	return $err
+}
+
+function check_nonroot
+{
+	local cfg_opts="$1"
+
+	[ -z "$cfg_opts" ] && return
+
+	configure_travis \
+		--enable-python \
+		--enable-cryptsetup-reencrypt \
+		--enable-internal-sse-argon2 \
+		"$cfg_opts" \
+		|| return
+
+	$MAKE || return
+
+	make check
+}
+
+function check_root
+{
+	local cfg_opts="$1"
+
+	[ -z "$cfg_opts" ] && return
+
+    configure_travis \
+		--enable-python \
+		--enable-cryptsetup-reencrypt \
+		--enable-internal-sse-argon2 \
+		"$cfg_opts" \
+		|| return
+
+	$MAKE || return
+
+	# FIXME: we should use -E option here
+	sudo make check
+}
+
+function check_nonroot_compile_only
+{
+	local cfg_opts="$1"
+
+	[ -z "$cfg_opts" ] && return
+
+	configure_travis \
+		--enable-python \
+		--enable-cryptsetup-reencrypt \
+		--enable-internal-sse-argon2 \
+		"$cfg_opts" \
+		|| return
+
+	$MAKE
+}
+
+function travis_install_script
+{
+	# install some packages from Ubuntu's default sources
+	sudo apt-get -qq update
+	sudo apt-get install -qq >/dev/null \
+		python-dev \
+		sharutils \
+		libgcrypt20-dev \
+		libssl-dev \
+		libdevmapper-dev \
+		libpopt-dev \
+		uuid-dev \
+		libsepol1-dev \
+		libtool \
+		dmsetup \
+		autoconf \
+		automake \
+		pkg-config \
+		autopoint \
+		gettext \
+		expect \
+		keyutils \
+		libjson-c-dev \
+		libblkid-dev \
+		|| return
+}
+
+function travis_before_script
+{
+	set -o xtrace
+
+	./autogen.sh
+	ret=$?
+
+	set +o xtrace
+	return $ret
+}
+
+function travis_script
+{
+	local ret
+	set -o xtrace
+
+	case "$MAKE_CHECK" in
+	gcrypt)
+		check_nonroot "--with-crypto_backend=gcrypt" && \
+		check_root "--with-crypto_backend=gcrypt"
+		;;
+	gcrypt_compile)
+		check_nonroot_compile_only "--with-crypto_backend=gcrypt"
+		;;
+	openssl)
+		check_nonroot "--with-crypto_backend=openssl" && \
+		check_root "--with-crypto_backend=openssl"
+		;;
+	openssl_compile)
+		check_nonroot_compile_only "--with-crypto_backend=openssl"
+		;;
+	*)
+		echo "error, check environment (travis.yml)" >&2
+		false
+		;;
+	esac
+
+	ret=$?
+	set +o xtrace
+	return $ret
+}
+
+function travis_after_script
+{
+	return 0
+}

.travis.yml

@@ -0,0 +1,39 @@
+language: c
+
+sudo: required
+dist: trusty
+
+compiler:
+  - gcc
+
+env:
+  - MAKE_CHECK="gcrypt"
+  - MAKE_CHECK="openssl"
+
+branches:
+  only:
+    - master
+    - wip-luks2
+    - v2_0_x
+
+before_install:
+  - uname -a
+  - $CC --version
+  - which $CC
+  # workaround clang not system wide, fail on sudo make install
+  - export CC=`which $CC`
+  # workaround travis-ci issue #5301
+  - unset PYTHON_CFLAGS
+
+install:
+  - source ./.travis-functions.sh
+  - travis_install_script
+
+before_script:
+  - travis_before_script
+
+script:
+  - travis_script
+
+after_script:
+  - travis_after_script

AUTHORS

@@ -1,4 +1,3 @@
 Jana Saout <jana@saout.de>
 Clemens Fruhwirth <clemens@endorphin.org>
 Milan Broz <gmazyland@gmail.com>
-Ondrej Kozina <okozina@redhat.com>

ChangeLog

@@ -0,0 +1,6 @@
+Since version 1.6 this file is no longer maintained.
+
+See docs/*ReleaseNotes for release changes documentation.
+
+See version control history for full commit messages.
+  https://gitlab.com/cryptsetup/cryptsetup/commits/master

INSTALL

@@ -0,0 +1,229 @@
+Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
+
+   This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+   These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes a while.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory.  After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+   By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=PATH' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the `--target=TYPE' option to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+

Makefile.am

@@ -1,5 +1,6 @@
-EXTRA_DIST = README.md COPYING.LGPL FAQ.md docs misc autogen.sh
-SUBDIRS = po tests tests/fuzz
+EXTRA_DIST = COPYING.LGPL FAQ docs misc
+SUBDIRS = po tests
+TESTS =
 CLEANFILES =
 DISTCLEAN_TARGETS =
 
@@ -11,32 +12,21 @@ AM_CPPFLAGS = \
         -DLIBDIR=\""$(libdir)"\"                \
         -DPREFIX=\""$(prefix)"\"                \
         -DSYSCONFDIR=\""$(sysconfdir)"\"        \
-        -DVERSION=\""$(VERSION)"\"              \
-        -DEXTERNAL_LUKS2_TOKENS_PATH=\"${EXTERNAL_LUKS2_TOKENS_PATH}\"
+        -DVERSION=\""$(VERSION)"\"
 AM_CFLAGS = -Wall
-AM_CXXFLAGS = -Wall
 AM_LDFLAGS =
 
-if ENABLE_FUZZ_TARGETS
-AM_CFLAGS += -fsanitize=fuzzer-no-link
-AM_CXXFLAGS += -fsanitize=fuzzer-no-link
-endif
-
-LDADD = $(LTLIBINTL)
-
 tmpfilesddir = @DEFAULT_TMPFILESDIR@
 
-include_HEADERS =
-lib_LTLIBRARIES =
 noinst_LTLIBRARIES =
 sbin_PROGRAMS =
 man8_MANS =
 tmpfilesd_DATA =
-pkgconfig_DATA =
-dist_noinst_DATA =
 
 include man/Makemodule.am
 
+include python/Makemodule.am
+
 include scripts/Makemodule.am
 
 if CRYPTO_INTERNAL_ARGON2
@@ -46,14 +36,13 @@ include lib/crypto_backend/Makemodule.am
 include lib/Makemodule.am
 
 include src/Makemodule.am
-include tokens/Makemodule.am
 
 ACLOCAL_AMFLAGS = -I m4
 
 DISTCHECK_CONFIGURE_FLAGS = 	\
+	--enable-python		\
 	--with-tmpfilesdir=$$dc_install_base/usr/lib/tmpfiles.d \
-	--enable-internal-argon2 --enable-internal-sse-argon2 \
-	--enable-external-tokens --enable-ssh-token --enable-asciidoc
+	--enable-internal-argon2 --enable-internal-sse-argon2
 
 distclean-local:
 	-find . -name \*~ -o -name \*.orig -o -name \*.rej | xargs rm -f
@@ -61,17 +50,3 @@ distclean-local:
 
 clean-local:
 	-rm -rf docs/doxygen_api_docs libargon2.la
-
-install-data-local:
-	$(MKDIR_P) -m 0755 $(DESTDIR)/${EXTERNAL_LUKS2_TOKENS_PATH}
-
-uninstall-local:
-	rmdir $(DESTDIR)/${EXTERNAL_LUKS2_TOKENS_PATH} 2>/dev/null || :
-
-check-programs: libcryptsetup.la
-	$(MAKE) -C tests $@
-
-if ENABLE_FUZZ_TARGETS
-fuzz-targets: libcryptsetup.la libcrypto_backend.la
-	$(MAKE) -C tests/fuzz $@
-endif

NEWS

@@ -0,0 +1 @@
+See docs/* directory for Release Notes.

README

@@ -0,0 +1,31 @@
+
+                        cryptsetup
+
+setup cryptographic volumes for dm-crypt (including LUKS extension)
+
+WEB PAGE:
+
+      https://gitlab.com/cryptsetup/cryptsetup/
+
+FAQ:
+
+      https://gitlab.com/cryptsetup/cryptsetup/wikis/FrequentlyAskedQuestions
+
+MAILING LIST:
+
+      E-MAIL: dm-crypt@saout.de
+      URL:    http://www.saout.de/mailman/listinfo/dm-crypt
+
+DOWNLOAD:
+
+      https://www.kernel.org/pub/linux/utils/cryptsetup/
+
+SOURCE CODE:
+
+      URL: https://gitlab.com/cryptsetup/cryptsetup/tree/master
+      Checkout: git clone https://gitlab.com/cryptsetup/cryptsetup.git
+
+NLS (PO TRANSLATIONS):
+
+      PO files are maintained by:
+          http://translationproject.org/domain/cryptsetup.html

README.md

@@ -2,29 +2,25 @@
 
 What the ...?
 =============
-**Cryptsetup** is a utility used to conveniently set up disk encryption based
-on the [DMCrypt](https://gitlab.com/cryptsetup/cryptsetup/wikis/DMCrypt) kernel module.
+**Cryptsetup** is utility used to conveniently setup disk encryption based
+on [DMCrypt](https://gitlab.com/cryptsetup/cryptsetup/wikis/DMCrypt) kernel module.
 
-These include **plain** **dm-crypt** volumes, **LUKS** volumes, **loop-AES**,
-**TrueCrypt** (including **VeraCrypt** extension), **BitLocker** and **FileVault2** formats.
+These include **plain** **dm-crypt** volumes, **LUKS** volumes, **loop-AES**
+and **TrueCrypt** (including **VeraCrypt** extension) format.
 
-The project also includes a **veritysetup** utility used to conveniently setup
+Project also includes **veritysetup** utility used to conveniently setup
 [DMVerity](https://gitlab.com/cryptsetup/cryptsetup/wikis/DMVerity) block integrity checking kernel module
-and **integritysetup** to setup
+and, since version 2.0,  **integritysetup** to setup
 [DMIntegrity](https://gitlab.com/cryptsetup/cryptsetup/wikis/DMIntegrity) block integrity kernel module.
 
+
 LUKS Design
 -----------
 **LUKS** is the standard for Linux hard disk encryption. By providing a standard on-disk-format, it does not  
 only facilitate compatibility among distributions, but also provides secure management of multiple user passwords.  
 LUKS stores all necessary setup information in the partition header, enabling to transport or migrate data seamlessly.
 
-### Specifications
-
-Last version of the LUKS2 format specification is
-[available here](https://gitlab.com/cryptsetup/LUKS2-docs).
-
-Last version of the LUKS1 format specification is
+Last version of the LUKS format specification is
 [available here](https://www.kernel.org/pub/linux/utils/cryptsetup/LUKS_docs/on-disk-format.pdf).
 
 Why LUKS?
@@ -45,72 +41,64 @@ Download
 --------
 All release tarballs and release notes are hosted on [kernel.org](https://www.kernel.org/pub/linux/utils/cryptsetup/).
 
-**The latest stable cryptsetup release version is 2.6.0**
-  * [cryptsetup-2.6.0.tar.xz](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.6/cryptsetup-2.6.0.tar.xz)
-  * Signature [cryptsetup-2.6.0.tar.sign](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.6/cryptsetup-2.6.0.tar.sign)
+**The latest cryptsetup version is 2.0.5**
+  * [cryptsetup-2.0.5.tar.xz](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-2.0.5.tar.xz)
+  * Signature [cryptsetup-2.0.5.tar.sign](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-2.0.5.tar.sign)
     _(You need to decompress file first to check signature.)_
-  * [Cryptsetup 2.6.0 Release Notes](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.6/v2.6.0-ReleaseNotes).
+  * [Cryptsetup 2.0.5 Release Notes](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/v2.0.5-ReleaseNotes).
 
 Previous versions
- * [Version 2.5.0](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.5/cryptsetup-2.5.0.tar.xz) -
-   [Signature](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.5/cryptsetup-2.5.0.tar.sign) -
-   [Release Notes](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.5/v2.5.0-ReleaseNotes).
+ * [Version 2.0.4](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-2.0.4.tar.xz) -
+   [Signature](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-2.0.4.tar.sign) -
+   [Release Notes](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/v2.0.4-ReleaseNotes).
+ * [Version 2.0.3](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-2.0.3.tar.xz) -
+   [Signature](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-2.0.3.tar.sign) -
+   [Release Notes](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/v2.0.3-ReleaseNotes).
+ * [Version 2.0.2](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-2.0.2.tar.xz) -
+   [Signature](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-2.0.2.tar.sign) -
+   [Release Notes](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/v2.0.2-ReleaseNotes).
+ * [Version 2.0.1](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-2.0.1.tar.xz) -
+   [Signature](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-2.0.1.tar.sign) -
+   [Release Notes](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/v2.0.1-ReleaseNotes).
+ * [Version 2.0.0](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-2.0.0.tar.xz) -
+   [Signature](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-2.0.0.tar.sign) -
+   [Release Notes](https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/v2.0.0-ReleaseNotes).
  * [Version 1.7.5](https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.5.tar.xz) -
    [Signature](https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.5.tar.sign) -
    [Release Notes](https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/v1.7.5-ReleaseNotes).
+ * [Version 1.7.4](https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.4.tar.xz) -
+   [Signature](https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.4.tar.sign) -
+   [Release Notes](https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/v1.7.4-ReleaseNotes).
+ * [Version 1.7.3](https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.3.tar.xz) -
+   [Signature](https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.3.tar.sign) -
+   [Release Notes](https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/v1.7.3-ReleaseNotes).
+ * [Version 1.7.2](https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.2.tar.xz) -
+   [Signature](https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.2.tar.sign) -
+   [Release Notes](https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/v1.7.2-ReleaseNotes).
+ * [Version 1.7.1](https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.1.tar.xz) -
+   [Signature](https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.1.tar.sign) -
+   [Release Notes](https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/v1.7.1-ReleaseNotes).
+ * [Version 1.7.0](https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.0.tar.xz) -
+   [Signature](https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.0.tar.sign) -
+   [Release Notes](https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/v1.7.0-ReleaseNotes).
 
 Source and API docs
 -------------------
 For development version code, please refer to [source](https://gitlab.com/cryptsetup/cryptsetup/tree/master) page,
 mirror on [kernel.org](https://git.kernel.org/cgit/utils/cryptsetup/cryptsetup.git/) or [GitHub](https://github.com/mbroz/cryptsetup).
 
-For libcryptsetup documentation see [libcryptsetup API](https://mbroz.fedorapeople.org/libcryptsetup_API/) page.
+For libcryptsetup documentation see [libcryptsetup API](https://gitlab.com/cryptsetup/cryptsetup/wikis/API/index.html) page.
 
 The libcryptsetup API/ABI changes are tracked in [compatibility report](https://abi-laboratory.pro/tracker/timeline/cryptsetup/).
 
-NLS PO files are maintained by [TranslationProject](https://translationproject.org/domain/cryptsetup.html).
-
-Required packages
------------------
-All distributions provide cryptsetup as distro package. If you need to compile cryptsetup yourself, some packages are required for compilation. Please always prefer distro specific build tools to manually configuring cryptsetup.
-
-Here is the list of packages needed for the compilation of project for particular distributions:
- * For Fedora: `git gcc make autoconf automake gettext-devel pkgconfig openssl-devel popt-devel device-mapper-devel libuuid-devel json-c-devel libblkid-devel findutils libtool libssh-devel tar`. Optionally `libargon2-devel libpwquality-devel`. To run the internal testsuite you also need to install `sharutils device-mapper jq vim-common expect keyutils netcat shadow-utils openssh-clients openssh sshpass`.
-
- * For Debian and Ubuntu: `git gcc make autoconf automake autopoint pkg-config libtool gettext libssl-dev libdevmapper-dev libpopt-dev uuid-dev libsepol1-dev libjson-c-dev libssh-dev libblkid-dev tar`. Optionally `libargon2-0-dev libpwquality-dev`. To run the internal testsuite you also need to install `sharutils dmsetup jq xxd expect keyutils netcat passwd openssh-client sshpass`
-
-Note that the list could change as the distributions evolve.
-
-Compilation
------------
-The cryptsetup project uses **automake** and **autoconf** system to generate all needed files for compilation. If you check it from the git snapshot, use ``./autogen.sh && ./configure && make`` to compile the project. If you use downloaded released ``*.tar.xz`` archive, the configure script is already pre-generated (no need to run ``autoconf.sh``).
-See ``./configure --help`` and use ``--disable-*`` and ``--enable-*`` options.
-
-For running the test suite that come with the project, type ``make check``.
-Note that most tests will need root user privileges and run many dangerous storage fail simulations.
-Do **not** run tests with root privilege on production systems! Some tests will need scsi_debug kernel module to be available.
-
-For more details, please refer to [automake](https://www.gnu.org/software/automake/manual/automake.html) and [autoconf](https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf.html) manuals.
+NLS PO files are maintained by [TranslationProject](http://translationproject.org/domain/cryptsetup.html).
 
 Help!
 -----
+Please always read [FAQ](https://gitlab.com/cryptsetup/cryptsetup/wikis/FrequentlyAskedQuestions) first.
+For cryptsetup and LUKS related questions, please use the dm-crypt mailing list, [dm-crypt@saout.de](mailto:dm-crypt@saout.de).
 
-### Documentation
+If you want to subscribe just send an empty mail to [dm-crypt-subscribe@saout.de](mailto:dm-crypt-subscribe@saout.de).
 
-Please read the following documentation before posting questions in the mailing list.   You will be able to ask better questions and better understand the answers.  
-
-* [FAQ](https://gitlab.com/cryptsetup/cryptsetup/wikis/FrequentlyAskedQuestions) 
-* LUKS Specifications
-* manuals (aka man page, man pages, man-page) 
-
-The FAQ is online and in the source code for the project.  The Specifications are referenced above in this document.  The man pages are in source and should be available after installation using standard man commands.  e.g.  man cryptsetup
-
-### Mailing List
-
-For cryptsetup and LUKS related questions, please use the cryptsetup mailing list [cryptsetup@lists.linux.dev](mailto:cryptsetup@lists.linux.dev), hosted at [kernel.org subspace](https://subspace.kernel.org/lists.linux.dev.html).
-To subscribe send an empty mail to [cryptsetup+subscribe@lists.linux.dev](mailto:cryptsetup+subscribe@lists.linux.dev).
-
-You can also browse and/or search the mailing [list archive](https://lore.kernel.org/cryptsetup/).
-News (NNTP), Atom feed and git access to public inbox is available through [lore.kernel.org](https://lore.kernel.org) service.
-
-The former dm-crypt [list archive](https://lore.kernel.org/dm-crypt/) is also available.
+You can also browse [list archive](http://www.saout.de/pipermail/dm-crypt/) or read it through
+[web interface](https://marc.info/?l=dm-crypt).

SECURITY.md

@@ -1,10 +0,0 @@
-# Reporting a Security Bug in cryptsetup project
-
-If you think you have discovered a security issue, please report it through
-the project issue tracker [New issue](https://gitlab.com/cryptsetup/cryptsetup/issues)
-as a confidential issue (select confidential checkbox).
-
-An alternative is to send PGP encrypted mail to the cryptsetup maintainer.
-Current maintainer is [Milan Broz](mailto:gmazyland@gmail.com), use PGP key
-with fingerprint 2A29 1824 3FDE 4664 8D06 86F9 D9B0 577B D93E 98FC.
-

TODO

@@ -0,0 +1 @@
+Please see issues tracked at https://gitlab.com/cryptsetup/cryptsetup/issues.

autogen.sh

@@ -9,31 +9,25 @@ DIE=0
 (autopoint --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have autopoint installed."
-  echo "Download the appropriate package for your distribution."
+  echo "Download the appropriate package for your distribution,"
+  echo "or see http://www.gnu.org/software/gettext"
   DIE=1
 }
 
-
-(msgfmt --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Warning**: You should have gettext installed."
-  echo "Download the appropriate package for your distribution."
-  echo "To disable translation, you can also use --disable-nls"
-  echo "configure option."
-}
-
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
   echo
-  echo "**Error**: You must have autoconf installed."
-  echo "Download the appropriate package for your distribution."
+  echo "**Error**: You must have autoconf installed to."
+  echo "Download the appropriate package for your distribution,"
+  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
   DIE=1
 }
 
-(grep "^LT_INIT" $srcdir/configure.ac >/dev/null) && {
-  (libtoolize --version) < /dev/null > /dev/null 2>&1 || {
+(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
+  (libtool --version) < /dev/null > /dev/null 2>&1 || {
     echo
-    echo "**Error**: You must have libtoolize installed."
-    echo "Download the appropriate package for your distribution."
+    echo "**Error**: You must have libtool installed."
+    echo "Get ftp://ftp.gnu.org/pub/gnu/"
+    echo "(or a newer version if it is available)"
     DIE=1
   }
 }
@@ -41,7 +35,8 @@ DIE=0
 (automake --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have automake installed."
-  echo "Download the appropriate package for your distribution."
+  echo "Get ftp://ftp.gnu.org/pub/gnu/"
+  echo "(or a newer version if it is available)"
   DIE=1
   NO_AUTOMAKE=yes
 }
@@ -52,6 +47,8 @@ test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: Missing aclocal.  The version of automake"
   echo "installed doesn't appear recent enough."
+  echo "Get ftp://ftp.gnu.org/pub/gnu/"
+  echo "(or a newer version if it is available)"
   DIE=1
 }
 
@@ -74,7 +71,7 @@ autopoint --force $AP_OPTS
 libtoolize --force --copy
 aclocal -I m4 $AL_OPTS
 autoheader $AH_OPTS
-automake --force-missing --add-missing --copy --gnu $AM_OPTS
+automake --add-missing --copy --gnu $AM_OPTS
 autoconf $AC_OPTS
 
 echo

configure.ac

@@ -1,9 +1,9 @@
 AC_PREREQ([2.67])
-AC_INIT([cryptsetup],[2.6.0])
+AC_INIT([cryptsetup],[2.0.6])
 
 dnl library version from <major>.<minor>.<release>[-<suffix>]
 LIBCRYPTSETUP_VERSION=$(echo $PACKAGE_VERSION | cut -f1 -d-)
-LIBCRYPTSETUP_VERSION_INFO=21:0:9
+LIBCRYPTSETUP_VERSION_INFO=15:0:3
 
 AM_SILENT_RULES([yes])
 AC_CONFIG_SRCDIR(src/cryptsetup.c)
@@ -16,7 +16,7 @@ AC_CONFIG_HEADERS([config.h:config.h.in])
 
 # For old automake use this
 #AM_INIT_AUTOMAKE(dist-xz subdir-objects)
-AM_INIT_AUTOMAKE([dist-xz 1.12 serial-tests subdir-objects foreign])
+AM_INIT_AUTOMAKE([dist-xz 1.12 serial-tests subdir-objects])
 
 if test "x$prefix" = "xNONE"; then
 	sysconfdir=/etc
@@ -28,10 +28,8 @@ AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CPP
-AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
-AC_PROG_MKDIR_P
 AC_ENABLE_STATIC(no)
 LT_INIT
 PKG_PROG_PKG_CONFIG
@@ -53,40 +51,14 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
 AS_VAR_IF([$1], [""], [$5], [$4])
 ])
 ])
-dnl ==========================================================================
-dnl AsciiDoc manual pages
-
-AC_ARG_ENABLE([asciidoc],
-	AS_HELP_STRING([--disable-asciidoc], [do not generate man pages from asciidoc]),
-	[], [enable_asciidoc=yes]
-)
-
-AC_PATH_PROG([ASCIIDOCTOR], [asciidoctor])
-if test "x$enable_asciidoc" = xyes -a "x$ASCIIDOCTOR" = x; then
-	AC_MSG_ERROR([Building man pages requires asciidoctor installed.])
-fi
-AM_CONDITIONAL([ENABLE_ASCIIDOC], [test "x$enable_asciidoc" = xyes])
-
-have_manpages=no
-AS_IF([test -f "$srcdir/man/cryptsetup-open.8"], [
-	AC_MSG_NOTICE([re-use already generated man-pages.])
-	have_manpages=yes]
-)
-AM_CONDITIONAL([HAVE_MANPAGES], [test "x$have_manpages" = xyes])
-
 dnl ==========================================================================
 
 AC_C_RESTRICT
 
 AC_HEADER_DIRENT
-AC_CHECK_HEADERS(fcntl.h malloc.h inttypes.h uchar.h sys/ioctl.h sys/mman.h \
+AC_HEADER_STDC
+AC_CHECK_HEADERS(fcntl.h malloc.h inttypes.h sys/ioctl.h sys/mman.h \
 	sys/sysmacros.h sys/statvfs.h ctype.h unistd.h locale.h byteswap.h endian.h stdint.h)
-AC_CHECK_DECLS([O_CLOEXEC],,[AC_DEFINE([O_CLOEXEC],[0], [Defined to 0 if not provided])],
-[[
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-]])
 
 AC_CHECK_HEADERS(uuid/uuid.h,,[AC_MSG_ERROR([You need the uuid library.])])
 AC_CHECK_HEADER(libdevmapper.h,,[AC_MSG_ERROR([You need the device-mapper library.])])
@@ -136,40 +108,6 @@ AC_FUNC_FSEEKO
 AC_PROG_GCC_TRADITIONAL
 AC_FUNC_STRERROR_R
 
-dnl ==========================================================================
-dnl LUKS2 external tokens
-
-AC_ARG_ENABLE([external-tokens],
-	AS_HELP_STRING([--disable-external-tokens], [disable external LUKS2 tokens]),
-	[], [enable_external_tokens=yes])
-if test "x$enable_external_tokens" = "xyes"; then
-	AC_DEFINE(USE_EXTERNAL_TOKENS, 1, [Use external tokens])
-	dnl we need dynamic library loading here
-	saved_LIBS=$LIBS
-	AC_SEARCH_LIBS([dlsym],[dl])
-	AC_CHECK_FUNCS([dlvsym])
-	AC_SUBST(DL_LIBS, $LIBS)
-	LIBS=$saved_LIBS
-fi
-AM_CONDITIONAL(EXTERNAL_TOKENS, test "x$enable_external_tokens" = "xyes")
-
-AC_ARG_ENABLE([ssh-token],
-	AS_HELP_STRING([--disable-ssh-token], [disable LUKS2 ssh-token]),
-	[], [enable_ssh_token=yes])
-AM_CONDITIONAL(SSHPLUGIN_TOKEN, test "x$enable_ssh_token" = "xyes")
-
-if test "x$enable_ssh_token" = "xyes" -a "x$enable_external_tokens" = "xno"; then
-	AC_MSG_ERROR([Requested LUKS2 ssh-token build, but external tokens are disabled.])
-fi
-
-dnl LUKS2 online reencryption
-AC_ARG_ENABLE([luks2-reencryption],
-	AS_HELP_STRING([--disable-luks2-reencryption], [disable LUKS2 online reencryption extension]),
-	[], [enable_luks2_reencryption=yes])
-if test "x$enable_luks2_reencryption" = "xyes"; then
-	AC_DEFINE(USE_LUKS2_REENCRYPTION, 1, [Use LUKS2 online reencryption extension])
-fi
-
 dnl ==========================================================================
 
 AM_GNU_GETTEXT([external],[need-ngettext])
@@ -215,17 +153,6 @@ if test "x$enable_pwquality" = "xyes"; then
 	PWQUALITY_STATIC_LIBS="$PWQUALITY_LIBS -lcrack -lz"
 fi
 
-dnl ==========================================================================
-dnl fuzzers, it requires own static library compilation later
-AC_ARG_ENABLE([fuzz-targets],
-	AS_HELP_STRING([--enable-fuzz-targets], [enable building fuzz targets]))
-AM_CONDITIONAL(ENABLE_FUZZ_TARGETS, test "x$enable_fuzz_targets" = "xyes")
-
-if test "x$enable_fuzz_targets" = "xyes"; then
-	AX_CHECK_COMPILE_FLAG([-fsanitize=fuzzer-no-link],,
-		AC_MSG_ERROR([Required compiler options not supported; use clang.]), [-Werror])
-fi
-
 dnl ==========================================================================
 dnl passwdqc library (cryptsetup CLI only)
 AC_ARG_ENABLE([passwdqc],
@@ -242,15 +169,7 @@ AC_DEFINE_UNQUOTED([PASSWDQC_CONFIG_FILE], ["$use_passwdqc_config"], [passwdqc l
 if test "x$enable_passwdqc" = "xyes"; then
 	AC_DEFINE(ENABLE_PASSWDQC, 1, [Enable password quality checking using passwdqc library])
 
-	saved_LIBS="$LIBS"
-	AC_SEARCH_LIBS([passwdqc_check], [passwdqc])
-	case "$ac_cv_search_passwdqc_check" in
-		no) AC_MSG_ERROR([failed to find passwdqc_check]) ;;
-		-l*) PASSWDQC_LIBS="$ac_cv_search_passwdqc_check" ;;
-		*) PASSWDQC_LIBS= ;;
-	esac
-	AC_CHECK_FUNCS([passwdqc_params_free])
-	LIBS="$saved_LIBS"
+	PASSWDQC_LIBS="-lpasswdqc"
 fi
 
 if test "x$enable_pwquality$enable_passwdqc" = "xyesyes"; then
@@ -266,12 +185,8 @@ AC_DEFUN([CONFIGURE_GCRYPT], [
 	else
 		GCRYPT_REQ_VERSION=1.1.42
 	fi
-
-	dnl libgcrypt rejects to use pkgconfig, use AM_PATH_LIBGCRYPT from gcrypt-devel here.
-	dnl Do not require gcrypt-devel if other crypto backend is used.
-	m4_ifdef([AM_PATH_LIBGCRYPT],[
+	dnl Check if we can use gcrypt PBKDF2 (1.6.0 supports empty password)
 	AC_ARG_ENABLE([gcrypt-pbkdf2],
-		dnl Check if we can use gcrypt PBKDF2 (1.6.0 supports empty password)
 		AS_HELP_STRING([--enable-gcrypt-pbkdf2], [force enable internal gcrypt PBKDF2]),
 		if test "x$enableval" = "xyes"; then
 			[use_internal_pbkdf2=0]
@@ -279,8 +194,7 @@ AC_DEFUN([CONFIGURE_GCRYPT], [
 			[use_internal_pbkdf2=1]
 		fi,
 		[AM_PATH_LIBGCRYPT([1.6.1], [use_internal_pbkdf2=0], [use_internal_pbkdf2=1])])
-	AM_PATH_LIBGCRYPT($GCRYPT_REQ_VERSION,,[AC_MSG_ERROR([You need the gcrypt library.])])],
-	AC_MSG_ERROR([Missing support for gcrypt: install gcrypt and regenerate configure.]))
+	AM_PATH_LIBGCRYPT($GCRYPT_REQ_VERSION,,[AC_MSG_ERROR([You need the gcrypt library.])])
 
 	AC_MSG_CHECKING([if internal cryptsetup PBKDF2 is compiled-in])
 	if test $use_internal_pbkdf2 = 0; then
@@ -290,8 +204,6 @@ AC_DEFUN([CONFIGURE_GCRYPT], [
 		NO_FIPS([])
 	fi
 
-	AC_CHECK_DECLS([GCRY_CIPHER_MODE_XTS], [], [], [#include <gcrypt.h>])
-
 	if test "x$enable_static_cryptsetup" = "xyes"; then
 		saved_LIBS=$LIBS
 		LIBS="$saved_LIBS $LIBGCRYPT_LIBS -static"
@@ -359,7 +271,6 @@ AC_DEFUN([CONFIGURE_KERNEL], [
 AC_DEFUN([CONFIGURE_NETTLE], [
 	AC_CHECK_HEADERS(nettle/sha.h,,
 		[AC_MSG_ERROR([You need Nettle cryptographic library.])])
-	AC_CHECK_HEADERS(nettle/version.h)
 
 	saved_LIBS=$LIBS
 	AC_CHECK_LIB(nettle, nettle_pbkdf2_hmac_sha256,,
@@ -395,6 +306,11 @@ AC_ARG_ENABLE([veritysetup],
 	[], [enable_veritysetup=yes])
 AM_CONDITIONAL(VERITYSETUP, test "x$enable_veritysetup" = "xyes")
 
+AC_ARG_ENABLE([cryptsetup-reencrypt],
+	AS_HELP_STRING([--disable-cryptsetup-reencrypt], [disable cryptsetup-reencrypt tool]),
+	[], [enable_cryptsetup_reencrypt=yes])
+AM_CONDITIONAL(REENCRYPT, test "x$enable_cryptsetup_reencrypt" = "xyes")
+
 AC_ARG_ENABLE([integritysetup],
 	AS_HELP_STRING([--disable-integritysetup], [disable integritysetup support]),
 	[], [enable_integritysetup=yes])
@@ -424,8 +340,6 @@ AC_CHECK_DECLS([dm_task_retry_remove], [], [], [#include <libdevmapper.h>])
 AC_CHECK_DECLS([dm_task_deferred_remove], [], [], [#include <libdevmapper.h>])
 AC_CHECK_DECLS([dm_device_has_mounted_fs], [], [], [#include <libdevmapper.h>])
 AC_CHECK_DECLS([dm_device_has_holders], [], [], [#include <libdevmapper.h>])
-AC_CHECK_DECLS([dm_device_get_name], [], [], [#include <libdevmapper.h>])
-AC_CHECK_DECLS([DM_DEVICE_GET_TARGET_VERSION], [], [], [#include <libdevmapper.h>])
 AC_CHECK_DECLS([DM_UDEV_DISABLE_DISK_RULES_FLAG], [have_cookie=yes], [have_cookie=no], [#include <libdevmapper.h>])
 if test "x$enable_udev" = xyes; then
 	if test "x$have_cookie" = xno; then
@@ -438,24 +352,11 @@ LIBS=$saved_LIBS
 
 dnl Check for JSON-C used in LUKS2
 PKG_CHECK_MODULES([JSON_C], [json-c])
-AC_CHECK_DECLS([json_object_object_add_ex], [], [], [#include <json-c/json.h>])
-AC_CHECK_DECLS([json_object_deep_copy], [], [], [#include <json-c/json.h>])
-
-dnl Check for libssh and argp for SSH plugin
-if test "x$enable_ssh_token" = "xyes"; then
-	PKG_CHECK_MODULES([LIBSSH], [libssh])
-	AC_CHECK_DECLS([ssh_session_is_known_server], [], [], [#include <libssh/libssh.h>])
-	AC_CHECK_HEADER([argp.h], [], AC_MSG_ERROR([You need argp library.]))
-	saved_LIBS=$LIBS
-	AC_SEARCH_LIBS([argp_parse],[argp])
-	AC_SUBST(ARGP_LIBS, $LIBS)
-	LIBS=$saved_LIBS
-fi
 
 dnl Crypto backend configuration.
 AC_ARG_WITH([crypto_backend],
-	AS_HELP_STRING([--with-crypto_backend=BACKEND], [crypto backend (gcrypt/openssl/nss/kernel/nettle) [openssl]]),
-	[], [with_crypto_backend=openssl])
+	AS_HELP_STRING([--with-crypto_backend=BACKEND], [crypto backend (gcrypt/openssl/nss/kernel/nettle) [gcrypt]]),
+	[], [with_crypto_backend=gcrypt])
 
 dnl Kernel crypto API backend needed for benchmark and tcrypt
 AC_ARG_ENABLE([kernel_crypto],
@@ -588,23 +489,6 @@ if test "x$enable_static_cryptsetup" = "xyes"; then
 	PKG_CONFIG=$saved_PKG_CONFIG
 fi
 
-dnl Check compiler support for symver function attribute
-AC_MSG_CHECKING([for symver attribute support])
-saved_CFLAGS=$CFLAGS
-CFLAGS="-O0 -Werror"
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-	void _test_sym(void);
-	__attribute__((__symver__("sym@VERSION_4.2"))) void _test_sym(void) {}
-]],
-[[ _test_sym() ]]
-)],[
-	AC_DEFINE([HAVE_ATTRIBUTE_SYMVER], 1, [Define to 1 to use __attribute__((symver))])
-	AC_MSG_RESULT([yes])
-], [
-	AC_MSG_RESULT([no])
-])
-CFLAGS=$saved_CFLAGS
-
 AC_MSG_CHECKING([for systemd tmpfiles config directory])
 PKG_CHECK_VAR([systemd_tmpfilesdir], [systemd], [tmpfilesdir], [], [systemd_tmpfilesdir=no])
 AC_MSG_RESULT([$systemd_tmpfilesdir])
@@ -625,27 +509,9 @@ AC_SUBST([JSON_C_LIBS])
 AC_SUBST([LIBARGON2_LIBS])
 AC_SUBST([BLKID_LIBS])
 
-AC_SUBST([LIBSSH_LIBS])
-
 AC_SUBST([LIBCRYPTSETUP_VERSION])
 AC_SUBST([LIBCRYPTSETUP_VERSION_INFO])
 
-dnl Set Requires.private for libcryptsetup.pc
-dnl pwquality is used only by tools
-PKGMODULES="uuid devmapper json-c"
-case $with_crypto_backend in
-	gcrypt)  PKGMODULES+=" libgcrypt" ;;
-	openssl) PKGMODULES+=" openssl" ;;
-	nss)     PKGMODULES+=" nss" ;;
-	nettle)  PKGMODULES+=" nettle" ;;
-esac
-if test "x$enable_libargon2" = "xyes"; then
-	PKGMODULES+=" libargon2"
-fi
-if test "x$enable_blkid" = "xyes"; then
-	PKGMODULES+=" blkid"
-fi
-AC_SUBST([PKGMODULES])
 dnl ==========================================================================
 AC_ARG_ENABLE([dev-random],
 	AS_HELP_STRING([--enable-dev-random], [use /dev/random by default for key generation (otherwise use /dev/urandom)]))
@@ -680,6 +546,35 @@ AC_DEFUN([CS_ABSPATH], [
 	esac
 ])
 
+dnl ==========================================================================
+dnl Python bindings
+AC_ARG_ENABLE([python],
+	AS_HELP_STRING([--enable-python], [enable Python bindings]))
+
+AC_ARG_WITH([python_version],
+	AS_HELP_STRING([--with-python_version=VERSION], [required Python version [2.6]]),
+	[PYTHON_VERSION=$withval], [PYTHON_VERSION=2.6])
+
+if test "x$enable_python" = "xyes"; then
+	AM_PATH_PYTHON([$PYTHON_VERSION])
+
+	AC_PATH_PROGS([PYTHON_CONFIG], [python${PYTHON_VERSION}-config python-config], [no])
+	if test "${PYTHON_CONFIG}" = "no"; then
+		AC_MSG_ERROR([cannot find python${PYTHON_VERSION}-config or python-config in PATH])
+	fi
+
+	AC_MSG_CHECKING(for python headers using $PYTHON_CONFIG --includes)
+	PYTHON_INCLUDES=$($PYTHON_CONFIG --includes)
+	AC_MSG_RESULT($PYTHON_INCLUDES)
+	AC_SUBST(PYTHON_INCLUDES)
+
+	AC_MSG_CHECKING(for python libraries using $PYTHON_CONFIG --libs)
+	PYTHON_LIBS=$($PYTHON_CONFIG --libs)
+	AC_MSG_RESULT($PYTHON_LIBS)
+	AC_SUBST(PYTHON_LIBS)
+fi
+AM_CONDITIONAL([PYTHON_CRYPTSETUP], [test "x$enable_python" = "xyes"])
+
 dnl ==========================================================================
 CS_STR_WITH([plain-hash],   [password hashing function for plain mode], [ripemd160])
 CS_STR_WITH([plain-cipher], [cipher for plain mode], [aes])
@@ -691,28 +586,17 @@ CS_STR_WITH([luks1-cipher], [cipher for LUKS1], [aes])
 CS_STR_WITH([luks1-mode],   [cipher mode for LUKS1], [xts-plain64])
 CS_NUM_WITH([luks1-keybits],[key length in bits for LUKS1], [256])
 
-AC_ARG_ENABLE([luks_adjust_xts_keysize], AS_HELP_STRING([--disable-luks-adjust-xts-keysize],
-	[XTS mode requires two keys, double default LUKS keysize if needed]),
-	[], [enable_luks_adjust_xts_keysize=yes])
-if test "x$enable_luks_adjust_xts_keysize" = "xyes"; then
-	AC_DEFINE(ENABLE_LUKS_ADJUST_XTS_KEYSIZE, 1, [XTS mode - double default LUKS keysize if needed])
-fi
-
-CS_STR_WITH([luks2-pbkdf],           [Default PBKDF algorithm (pbkdf2 or argon2i/argon2id) for LUKS2], [argon2id])
+CS_STR_WITH([luks2-pbkdf],           [Default PBKDF algorithm (pbkdf2 or argon2i/argon2id) for LUKS2], [argon2i])
 CS_NUM_WITH([luks1-iter-time],       [PBKDF2 iteration time for LUKS1 (in ms)], [2000])
 CS_NUM_WITH([luks2-iter-time],       [Argon2 PBKDF iteration time for LUKS2 (in ms)], [2000])
 CS_NUM_WITH([luks2-memory-kb],       [Argon2 PBKDF memory cost for LUKS2 (in kB)], [1048576])
 CS_NUM_WITH([luks2-parallel-threads],[Argon2 PBKDF max parallel cost for LUKS2 (if CPUs available)], [4])
 
-CS_STR_WITH([luks2-keyslot-cipher], [fallback cipher for LUKS2 keyslot (if data encryption is incompatible)], [aes-xts-plain64])
-CS_NUM_WITH([luks2-keyslot-keybits],[fallback key size for LUKS2 keyslot (if data encryption is incompatible)], [512])
-
 CS_STR_WITH([loopaes-cipher], [cipher for loop-AES mode], [aes])
 CS_NUM_WITH([loopaes-keybits],[key length in bits for loop-AES mode], [256])
 
 CS_NUM_WITH([keyfile-size-maxkb],[maximum keyfile size (in KiB)], [8192])
-CS_NUM_WITH([integrity-keyfile-size-maxkb],[maximum integritysetup keyfile size (in KiB)], [4])
-CS_NUM_WITH([passphrase-size-max],[maximum passphrase size (in characters)], [512])
+CS_NUM_WITH([passphrase-size-max],[maximum keyfile size (in characters)], [512])
 
 CS_STR_WITH([verity-hash],       [hash function for verity mode], [sha256])
 CS_NUM_WITH([verity-data-block], [data block size for verity mode], [4096])
@@ -740,19 +624,10 @@ test -z "$with_luks2_lock_dir_perms" && with_luks2_lock_dir_perms=0700
 DEFAULT_LUKS2_LOCK_DIR_PERMS=$with_luks2_lock_dir_perms
 AC_SUBST(DEFAULT_LUKS2_LOCK_DIR_PERMS)
 
-CS_STR_WITH([luks2-external-tokens-path], [path to directory with LUKSv2 external token handlers (plugins)], [LIBDIR/cryptsetup])
-if test -n "$with_luks2_external_tokens_path"; then
-	CS_ABSPATH([${with_luks2_external_tokens_path}],[with-luks2-external-tokens-path])
-	EXTERNAL_LUKS2_TOKENS_PATH=$with_luks2_external_tokens_path
-else
-	EXTERNAL_LUKS2_TOKENS_PATH="\${libdir}/cryptsetup"
-fi
-AC_SUBST(EXTERNAL_LUKS2_TOKENS_PATH)
-
 dnl Override default LUKS format version (for cryptsetup or cryptsetup-reencrypt format actions only).
 AC_ARG_WITH([default_luks_format],
-	AS_HELP_STRING([--with-default-luks-format=FORMAT], [default LUKS format version (LUKS1/LUKS2) [LUKS2]]),
-	[], [with_default_luks_format=LUKS2])
+	AS_HELP_STRING([--with-default-luks-format=FORMAT], [default LUKS format version (LUKS1/LUKS2) [LUKS1]]),
+	[], [with_default_luks_format=LUKS1])
 
 case $with_default_luks_format in
 	LUKS1) default_luks=CRYPT_LUKS1 ;;
@@ -768,6 +643,5 @@ lib/libcryptsetup.pc
 po/Makefile.in
 scripts/cryptsetup.conf
 tests/Makefile
-tests/fuzz/Makefile
 ])
 AC_OUTPUT

docs/ChangeLog.old

@@ -74,7 +74,7 @@
 2012-03-16  Milan Broz  <gmazyland@gmail.com>
 	* Add --keyfile-offset and --new-keyfile-offset parameters to API and CLI.
 	* Add repair command and crypt_repair() for known LUKS metadata problems repair.
-	* Allow one to specify --align-payload only for luksFormat.
+	* Allow to specify --align-payload only for luksFormat.
 
 2012-03-16  Milan Broz  <mbroz@redhat.com>
 	* Unify password verification option.
@@ -195,7 +195,7 @@
 
 2011-03-05  Milan Broz  <mbroz@redhat.com>
 	* Add exception to COPYING for binary distribution linked with OpenSSL library.
-	* Set secure data flag (wipe all ioctl buffers) if devmapper library supports it.
+	* Set secure data flag (wipe all ioclt buffers) if devmapper library supports it.
 
 2011-01-29  Milan Broz  <mbroz@redhat.com>
 	* Fix mapping removal if device disappeared but node still exists.
@@ -228,7 +228,7 @@
 	* Fix password callback call.
 	* Fix default plain password entry from terminal in activate_by_passphrase.
 	* Add --dump-master-key option for luksDump to allow volume key dump.
-	* Allow one to activate by internally cached volume key
+	* Allow to activate by internally cached volume key
 	  (format/activate without keyslots active - used for temporary devices).
 	* Initialize volume key from active device in crypt_init_by_name()
 	* Fix cryptsetup binary exitcodes.
@@ -636,7 +636,7 @@
 
 2006-03-15  Clemens Fruhwirth  <clemens@endorphin.org>
 
-	* configure.in: 1.0.3-rc3. Most displease release ever. 
+	* configure.in: 1.0.3-rc3. Most unplease release ever. 
 	* lib/setup.c (__crypt_create_device): More verbose error message.
 
 2006-02-26  Clemens Fruhwirth  <clemens@endorphin.org>

docs/doxyfile

@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.8.8
 
 #---------------------------------------------------------------------------
 # Project related configuration options
@@ -12,7 +12,6 @@ OUTPUT_DIRECTORY       = doxygen_api_docs
 CREATE_SUBDIRS         = NO
 ALLOW_UNICODE_NAMES    = NO
 OUTPUT_LANGUAGE        = English
-OUTPUT_TEXT_DIRECTION  = None
 BRIEF_MEMBER_DESC      = YES
 REPEAT_BRIEF           = YES
 ABBREVIATE_BRIEF       =
@@ -23,47 +22,40 @@ STRIP_FROM_PATH        =
 STRIP_FROM_INC_PATH    =
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = NO
-JAVADOC_BANNER         = NO
 QT_AUTOBRIEF           = NO
 MULTILINE_CPP_IS_BRIEF = NO
-PYTHON_DOCSTRING       = YES
 INHERIT_DOCS           = YES
 SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 8
 ALIASES                =
+TCL_SUBST              =
 OPTIMIZE_OUTPUT_FOR_C  = YES
 OPTIMIZE_OUTPUT_JAVA   = NO
 OPTIMIZE_FOR_FORTRAN   = NO
 OPTIMIZE_OUTPUT_VHDL   = NO
-OPTIMIZE_OUTPUT_SLICE  = NO
 EXTENSION_MAPPING      =
 MARKDOWN_SUPPORT       = YES
-TOC_INCLUDE_HEADINGS   = 5
 AUTOLINK_SUPPORT       = YES
 BUILTIN_STL_SUPPORT    = NO
 CPP_CLI_SUPPORT        = NO
 SIP_SUPPORT            = NO
 IDL_PROPERTY_SUPPORT   = YES
 DISTRIBUTE_GROUP_DOC   = NO
-GROUP_NESTED_COMPOUNDS = NO
 SUBGROUPING            = YES
 INLINE_GROUPED_CLASSES = NO
 INLINE_SIMPLE_STRUCTS  = NO
 TYPEDEF_HIDES_STRUCT   = YES
 LOOKUP_CACHE_SIZE      = 0
-NUM_PROC_THREADS       = 1
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
 EXTRACT_ALL            = NO
 EXTRACT_PRIVATE        = NO
-EXTRACT_PRIV_VIRTUAL   = NO
 EXTRACT_PACKAGE        = NO
 EXTRACT_STATIC         = NO
 EXTRACT_LOCAL_CLASSES  = YES
 EXTRACT_LOCAL_METHODS  = NO
 EXTRACT_ANON_NSPACES   = NO
-RESOLVE_UNNAMED_PARAMS = YES
 HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -71,7 +63,6 @@ HIDE_IN_BODY_DOCS      = NO
 INTERNAL_DOCS          = NO
 CASE_SENSE_NAMES       = YES
 HIDE_SCOPE_NAMES       = NO
-HIDE_COMPOUND_REFERENCE= NO
 SHOW_INCLUDE_FILES     = YES
 SHOW_GROUPED_MEMB_INC  = NO
 FORCE_LOCAL_INCLUDES   = NO
@@ -102,14 +93,13 @@ WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = NO
-WARN_AS_ERROR          = NO
 WARN_FORMAT            = "$file:$line: $text"
 WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # Configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = doxygen_index.h \
-                         ../lib/libcryptsetup.h
+INPUT                  = "doxygen_index.h" \
+                         "../lib/libcryptsetup.h"
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          =
 RECURSIVE              = NO
@@ -117,7 +107,7 @@ EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       =
 EXCLUDE_SYMBOLS        =
-EXAMPLE_PATH           = examples
+EXAMPLE_PATH           = "examples"
 EXAMPLE_PATTERNS       =
 EXAMPLE_RECURSIVE      = NO
 IMAGE_PATH             =
@@ -139,13 +129,12 @@ SOURCE_TOOLTIPS        = YES
 USE_HTAGS              = NO
 VERBATIM_HEADERS       = YES
 CLANG_ASSISTED_PARSING = NO
-CLANG_ADD_INC_PATHS    = YES
 CLANG_OPTIONS          =
-CLANG_DATABASE_PATH    =
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 ALPHABETICAL_INDEX     = YES
+COLS_IN_ALPHA_INDEX    = 5
 IGNORE_PREFIX          =
 #---------------------------------------------------------------------------
 # Configuration options related to the HTML output
@@ -162,7 +151,6 @@ HTML_COLORSTYLE_HUE    = 220
 HTML_COLORSTYLE_SAT    = 100
 HTML_COLORSTYLE_GAMMA  = 80
 HTML_TIMESTAMP         = YES
-HTML_DYNAMIC_MENUS     = YES
 HTML_DYNAMIC_SECTIONS  = NO
 HTML_INDEX_NUM_ENTRIES = 100
 GENERATE_DOCSET        = NO
@@ -192,10 +180,8 @@ GENERATE_TREEVIEW      = NO
 ENUM_VALUES_PER_LINE   = 4
 TREEVIEW_WIDTH         = 250
 EXT_LINKS_IN_WINDOW    = NO
-HTML_FORMULA_FORMAT    = png
 FORMULA_FONTSIZE       = 10
 FORMULA_TRANSPARENT    = YES
-FORMULA_MACROFILE      =
 USE_MATHJAX            = NO
 MATHJAX_FORMAT         = HTML-CSS
 MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
@@ -215,13 +201,11 @@ GENERATE_LATEX         = YES
 LATEX_OUTPUT           = latex
 LATEX_CMD_NAME         = latex
 MAKEINDEX_CMD_NAME     = makeindex
-LATEX_MAKEINDEX_CMD    = makeindex
 COMPACT_LATEX          = NO
 PAPER_TYPE             = a4
 EXTRA_PACKAGES         =
 LATEX_HEADER           =
 LATEX_FOOTER           =
-LATEX_EXTRA_STYLESHEET =
 LATEX_EXTRA_FILES      =
 PDF_HYPERLINKS         = YES
 USE_PDFLATEX           = YES
@@ -229,8 +213,6 @@ LATEX_BATCHMODE        = NO
 LATEX_HIDE_INDICES     = NO
 LATEX_SOURCE_CODE      = NO
 LATEX_BIB_STYLE        = plain
-LATEX_TIMESTAMP        = NO
-LATEX_EMOJI_DIRECTORY  =
 #---------------------------------------------------------------------------
 # Configuration options related to the RTF output
 #---------------------------------------------------------------------------
@@ -240,7 +222,6 @@ COMPACT_RTF            = NO
 RTF_HYPERLINKS         = NO
 RTF_STYLESHEET_FILE    =
 RTF_EXTENSIONS_FILE    =
-RTF_SOURCE_CODE        = NO
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -255,7 +236,6 @@ MAN_LINKS              = NO
 GENERATE_XML           = NO
 XML_OUTPUT             = xml
 XML_PROGRAMLISTING     = YES
-XML_NS_MEMB_FILE_SCOPE = NO
 #---------------------------------------------------------------------------
 # Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
@@ -293,10 +273,12 @@ GENERATE_TAGFILE       =
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
 EXTERNAL_PAGES         = YES
+PERL_PATH              =
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 CLASS_DIAGRAMS         = YES
+MSCGEN_PATH            =
 DIA_PATH               =
 HIDE_UNDOC_RELATIONS   = YES
 HAVE_DOT               = NO
@@ -309,8 +291,6 @@ COLLABORATION_GRAPH    = YES
 GROUP_GRAPHS           = YES
 UML_LOOK               = NO
 UML_LIMIT_NUM_FIELDS   = 10
-DOT_UML_DETAILS        = NO
-DOT_WRAP_THRESHOLD     = 17
 TEMPLATE_RELATIONS     = NO
 INCLUDE_GRAPH          = YES
 INCLUDED_BY_GRAPH      = YES
@@ -325,8 +305,6 @@ DOTFILE_DIRS           =
 MSCFILE_DIRS           =
 DIAFILE_DIRS           =
 PLANTUML_JAR_PATH      =
-PLANTUML_CFG_FILE      =
-PLANTUML_INCLUDE_PATH  =
 DOT_GRAPH_MAX_NODES    = 50
 MAX_DOT_GRAPH_DEPTH    = 0
 DOT_TRANSPARENT        = NO

docs/examples/crypt_log_usage.c

@@ -1,7 +1,7 @@
 /*
- * libcryptsetup API log example
+ * An example of using logging through libcryptsetup API
  *
- * Copyright (C) 2011-2022 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2011-2018, Red Hat, Inc. All rights reserved.
  *
  * This file is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -25,8 +25,10 @@
 #include <libcryptsetup.h>
 
 /*
- * This is an example of crypt_set_log_callback API callback.
+ * This is an example of function that can be registered using crypt_set_log_callback API.
  *
+ * Its prototype is void (*log)(int level, const char *msg, void *usrptr) as defined
+ * in crypt_set_log_callback
  */
 static void simple_syslog_wrapper(int level, const char *msg, void *usrptr)
 {
@@ -69,7 +71,7 @@ int main(void)
 		return 2;
 	}
 
-	/* crypt_set_log_callback() - register a log callback for crypt context */
+	/* crypt_set_log_callback() - register a log function for crypt context */
 	crypt_set_log_callback(cd, &simple_syslog_wrapper, (void *)usrprefix);
 
 	/* send messages ithrough the crypt_log() interface */
@@ -81,7 +83,7 @@ int main(void)
 	/* release crypt context */
 	crypt_free(cd);
 
-	/* Initialize default (global) log callback */
+	/* Initialize default (global) log function */
 	crypt_set_log_callback(NULL, &simple_syslog_wrapper, NULL);
 
 	crypt_log(NULL, CRYPT_LOG_NORMAL, "This is normal log message");

docs/examples/crypt_luks_usage.c

@@ -1,7 +1,7 @@
 /*
- *  libcryptsetup API - using LUKS device example
+ * An example of using LUKS device through libcryptsetup API
  *
- * Copyright (C) 2011-2022 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2011-2018, Red Hat, Inc. All rights reserved.
  *
  * This file is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -29,18 +29,23 @@
 static int format_and_add_keyslots(const char *path)
 {
 	struct crypt_device *cd;
+	struct crypt_params_luks1 params;
 	int r;
 
 	/*
-	 * The crypt_init() call is used  to initialize crypt_device context,
-	 * The path parameter specifies a device path.
+	 * crypt_init() call precedes most of operations of cryptsetup API. The call is used
+	 * to initialize crypt device context stored in structure referenced by _cd_ in
+	 * the example. Second parameter is used to pass underlaying device path.
 	 *
-	 * For path, you can use either link to a file or block device.
-	 * The loopback device will be detached automatically.
+	 * Note:
+	 * If path refers to a regular file it'll be attached to a first free loop device.
+	 * crypt_init() operation fails in case there's no more loop device available.
+	 * Also, loop device will have the AUTOCLEAR flag set, so the file loopback will
+	 * be detached automatically.
 	 */
 
 	r = crypt_init(&cd, path);
-	if (r < 0) {
+	if (r < 0 ) {
 		printf("crypt_init() failed for %s.\n", path);
 		return r;
 	}
@@ -48,37 +53,73 @@ static int format_and_add_keyslots(const char *path)
 	printf("Context is attached to block device %s.\n", crypt_get_device_name(cd));
 
 	/*
-	 * So far, no data were written to the device.
+	 * So far no data were written on your device. This will change with call of
+	 * crypt_format() only if you specify CRYPT_LUKS1 as device type.
 	 */
-	printf("Device %s will be formatted as a LUKS device after 5 seconds.\n"
+	printf("Device %s will be formatted to LUKS device after 5 seconds.\n"
 	       "Press CTRL+C now if you want to cancel this operation.\n", path);
 	sleep(5);
 
+
+	/*
+	 * Prepare LUKS format parameters
+	 *
+	 * hash parameter defines PBKDF2 hash algorithm used in LUKS header.
+	 * For compatibility reason we use SHA1 here.
+	 */
+	params.hash = "sha1";
+
+	/*
+	 * data_alignment parameter is relevant only in case of the luks header
+	 * and the payload are both stored on same device.
+	 *
+	 * if you set data_alignment = 0, cryptsetup will autodetect
+	 * data_alignment according to underlaying device topology.
+	 */
+	params.data_alignment = 0;
+
+	/*
+	 * data_device parameter defines that no external device
+	 * for luks header will be used
+	 */
+	params.data_device = NULL;
+
 	/*
 	 * NULLs for uuid and volume_key means that these attributes will be
-	 * generated during crypt_format().
+	 * generated during crypt_format(). Volume key is generated with respect
+	 * to key size parameter passed to function.
+	 *
+	 * crypt_format() checks device size (LUKS header must fit there).
 	 */
 	r = crypt_format(cd,		/* crypt context */
-			 CRYPT_LUKS2,	/* LUKS2 is a new LUKS format; use CRYPT_LUKS1 for LUKS1 */
+			 CRYPT_LUKS1,	/* LUKS1 is standard LUKS header */
 			 "aes",		/* used cipher */
-			 "xts-plain64",	/* used block mode and IV */
+			 "xts-plain64",	/* used block mode and IV generator*/
 			 NULL,		/* generate UUID */
 			 NULL,		/* generate volume key from RNG */
-			 512 / 8,	/* 512bit key - here AES-256 in XTS mode, size is in bytes */
-			 NULL);		/* default parameters */
+			 256 / 8,	/* 256bit key - here AES-128 in XTS mode, size is in bytes */
+			 &params);	/* parameters above */
 
-	if (r < 0) {
+	if(r < 0) {
 		printf("crypt_format() failed on device %s\n", crypt_get_device_name(cd));
 		crypt_free(cd);
 		return r;
 	}
 
 	/*
-	 * The device now contains a LUKS header, but there is no active keyslot.
+	 * The device now contains LUKS1 header, but there is
+	 * no active keyslot with encrypted volume key yet.
+	 */
+
+	/*
+	 * cryptt_kesylot_add_* call stores volume_key in encrypted form into keyslot.
+	 * Without keyslot you can't manipulate with LUKS device after the context will be freed.
 	 *
-	 * crypt_keyslot_add_* call stores the volume_key in the encrypted form into the keyslot.
+	 * To create a new keyslot you need to supply the existing one (to get the volume key from) or
+	 * you need to supply the volume key.
 	 *
-	 * After format, the volume key is stored internally.
+	 * After format, we have volume key stored internally in context so add new keyslot
+	 * using this internal volume key.
 	 */
 	r = crypt_keyslot_add_by_volume_key(cd,			/* crypt context */
 					    CRYPT_ANY_SLOT,	/* just use first free slot */
@@ -96,8 +137,8 @@ static int format_and_add_keyslots(const char *path)
 	printf("The first keyslot is initialized.\n");
 
 	/*
-	 * Add another keyslot, now authenticating with the first keyslot.
-	 * It decrypts the volume key from the first keyslot and creates a new one with the specified passphrase.
+	 * Add another keyslot, now using the first keyslot.
+	 * It will decrypt volume key from the first keyslot and creates new one with another passphrase.
 	 */
 	r = crypt_keyslot_add_by_passphrase(cd,			/* crypt context */
 					    CRYPT_ANY_SLOT,	/* just use first free slot */
@@ -123,18 +164,21 @@ static int activate_and_check_status(const char *path, const char *device_name)
 
 	/*
 	 * LUKS device activation example.
+	 * It's sequence of sub-steps: device initialization, LUKS header load
+	 * and the device activation itself.
 	 */
 	r = crypt_init(&cd, path);
-	if (r < 0) {
+	if (r < 0 ) {
 		printf("crypt_init() failed for %s.\n", path);
 		return r;
 	}
 
 	/*
-	 * crypt_load() is used to load existing LUKS header from a block device
+	 * crypt_load() is used to load the LUKS header from block device
+	 * into crypt_device context.
 	 */
 	r = crypt_load(cd,		/* crypt context */
-		       CRYPT_LUKS,	/* requested type - here LUKS of any type */
+		       CRYPT_LUKS1,	/* requested type */
 		       NULL);		/* additional parameters (not used) */
 
 	if (r < 0) {
@@ -144,11 +188,11 @@ static int activate_and_check_status(const char *path, const char *device_name)
 	}
 
 	/*
-	 * Device activation creates a device-mapper device with the specified name.
+	 * Device activation creates device-mapper devie mapping with name device_name.
 	 */
 	r = crypt_activate_by_passphrase(cd,		/* crypt context */
 					 device_name,	/* device name to activate */
-					 CRYPT_ANY_SLOT,/* the keyslot use (try all here) */
+					 CRYPT_ANY_SLOT,/* which slot use (ANY - try all) */
 					 "foo", 3,	/* passphrase */
 					 CRYPT_ACTIVATE_READONLY); /* flags */
 	if (r < 0) {
@@ -157,13 +201,13 @@ static int activate_and_check_status(const char *path, const char *device_name)
 		return r;
 	}
 
-	printf("%s device %s/%s is active.\n", crypt_get_type(cd), crypt_get_dir(), device_name);
+	printf("LUKS device %s/%s is active.\n", crypt_get_dir(), device_name);
 	printf("\tcipher used: %s\n", crypt_get_cipher(cd));
 	printf("\tcipher mode: %s\n", crypt_get_cipher_mode(cd));
 	printf("\tdevice UUID: %s\n", crypt_get_uuid(cd));
 
 	/*
-	 * Get info about the active device.
+	 * Get info about active device (query DM backend)
 	 */
 	r = crypt_get_active_device(cd, device_name, &cad);
 	if (r < 0) {
@@ -191,7 +235,7 @@ static int handle_active_device(const char *device_name)
 	int r;
 
 	/*
-	 * crypt_init_by_name() initializes context by an active device-mapper name
+	 * crypt_init_by_name() initializes device context and loads LUKS header from backing device
 	 */
 	r = crypt_init_by_name(&cd, device_name);
 	if (r < 0) {
@@ -208,7 +252,7 @@ static int handle_active_device(const char *device_name)
 	}
 
 	/*
-	 * crypt_deactivate() is used to deactivate a device
+	 * crypt_deactivate() is used to deactivate device
 	 */
 	r = crypt_deactivate(cd, device_name);
 	if (r < 0) {

docs/v1.2.0-ReleaseNotes

@@ -85,7 +85,7 @@ Libcryptsetup API additions:
 
  * Fix optional password callback handling.
 
- * Allow one to activate by internally cached volume key immediately after
+ * Allow to activate by internally cached volume key immediately after
  crypt_format() without active slot (for temporary devices with
  on-disk metadata)
 

docs/v1.4.2-ReleaseNotes

@@ -24,7 +24,7 @@ Changes since version 1.4.1
 * Fix header check to support old (cryptsetup 1.0.0) header alignment.
   (Regression in 1.4.0)
 
-* Allow one to specify --align-payload only for luksFormat.
+* Allow to specify --align-payload only for luksFormat.
 
 * Add --master-key-file option to luksOpen (open using volume key).
 

docs/v1.4.3-ReleaseNotes

@@ -32,7 +32,7 @@ Changes since version 1.4.2
   Device-mapper now retry removal if device is busy.
 
 * Allow "private" activation (skip some udev global rules) flag.
-  Cryptsetup library API now allows one to specify CRYPT_ACTIVATE_PRIVATE,
+  Cryptsetup library API now allows to specify CRYPT_ACTIVATE_PRIVATE,
   which means that some udev rules are not processed.
   (Used for temporary devices, like internal keyslot mappings where
   it is not desirable to run any device scans.)

docs/v1.5.0-ReleaseNotes

@@ -46,7 +46,7 @@ Side effect of reencryption is that final device will contain
 only ciphertext (for all sectors) so even if device was not properly
 wiped by random data, after reencryption you cannot distinguish
 which sectors are used.
-(Reencryption is done always for the whole device.)
+(Reecryption is done always for the whole device.)
 
 There are for sure bugs, please TEST IT IN TEST ENVIRONMENT before
 use for your data.

docs/v1.6.0-ReleaseNotes

@@ -4,7 +4,7 @@ Cryptsetup 1.6.0 Release Notes
 Changes since version 1.6.0-rc1
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
- * Change LUKS default cipher to use XTS encryption mode,
+ * Change LUKS default cipher to to use XTS encryption mode,
    aes-xts-plain64 (i.e. using AES128-XTS).
 
    XTS mode becomes standard in hard disk encryption.
@@ -209,7 +209,7 @@ Important changes
 
      WARNING: these tests do not use dmcrypt, only crypto API.
      You have to benchmark the whole device stack and you can get completely
-     different results. But it is usable for basic comparison.
+     different results. But is is usable for basic comparison.
      (Note for example AES-NI decryption optimization effect in example above.)
 
 Features

docs/v1.6.2-ReleaseNotes

@@ -8,7 +8,7 @@ Changes since version 1.6.1
 * Fix cipher specification string parsing (found by gcc -fsanitize=address option).
 
 * Try to map TCRYPT system encryption through partition
-  (allows one to activate mapping when other partition on the same device is mounted).
+  (allows to activate mapping when other partition on the same device is mounted).
 
 * Print a warning if system encryption is used and device is a partition.
   (TCRYPT system encryption uses whole device argument.)

docs/v1.6.4-ReleaseNotes

@@ -25,7 +25,7 @@ Changes since version 1.6.3
 
   Please refer to cryptsetup FAQ for detail how to fix this situation.
 
-* Allow one to use --disable-gcrypt-pbkdf2 during configuration
+* Allow to use --disable-gcrypt-pbkdf2 during configuration
   to force use internal PBKDF2 code.
 
 * Require gcrypt 1.6.1 for imported implementation of PBKDF2

docs/v1.6.5-ReleaseNotes

@@ -38,7 +38,7 @@ Changes since version 1.6.4
   The command "cryptsetup status" will print basic info, even if you
   do not provide detached header argument.
 
-* Allow one to specify ECB mode in cryptsetup benchmark.
+* Allow to specify ECB mode in cryptsetup benchmark.
 
 * Add some LUKS images for regression testing.
   Note that if image with Whirlpool fails, the most probable cause is that

docs/v1.6.7-ReleaseNotes

@@ -35,14 +35,14 @@ Changes since version 1.6.6
 * Support permanent device decryption for cryptsetup-reencrypt.
   To remove LUKS encryption from a device, you can now use --decrypt option.
 
-* Allow one to use --header option in all LUKS commands.
+* Allow to use --header option in all LUKS commands.
   The --header always takes precedence over positional device argument.
 
 * Allow luksSuspend without need to specify a detached header.
 
 * Detect if O_DIRECT is usable on a device allocation.
   There are some strange storage stack configurations which wrongly allows
-  one to open devices with direct-io but fails on all IO operations later.
+  to open devices with direct-io but fails on all IO operations later.
 
   Cryptsetup now tries to read the device first sector to ensure it can use
   direct-io.

docs/v1.6.8-ReleaseNotes

@@ -30,7 +30,7 @@ Changes since version 1.6.7
   cryptsetup resize will try to resize underlying loop device as well.
   (It can be used to grow up file-backed device in one step.)
 
-* Cryptsetup now allows one to use empty password through stdin pipe.
+* Cryptsetup now allows to use empty password through stdin pipe.
   (Intended only for testing in scripts.)
 
 Cryptsetup API NOTE:

docs/v1.7.4-ReleaseNotes

@@ -3,7 +3,7 @@ Cryptsetup 1.7.4 Release Notes
 
 Changes since version 1.7.3
 
-* Allow one to specify LUKS1 hash algorithm in Python luksFormat wrapper.
+* Allow to specify LUKS1 hash algorithm in Python luksFormat wrapper.
 
 * Use LUKS1 compiled-in defaults also in Python wrapper.
 

docs/v2.0.0-ReleaseNotes

@@ -89,7 +89,7 @@ Important features
 
   Integritysetup is intended to be used for settings that require
   non-cryptographic data integrity protection with no data encryption.
-  For setting integrity protected encrypted devices, see disk authenticated
+  Fo setting integrity protected encrypted devices, see disk authenticated
   encryption below.
 
   Note that after formatting the checksums need to be initialized;
@@ -583,7 +583,7 @@ Unfinished things & TODO for next releases
   in kernel (more on this later).
   NOTE: Currently available authenticated modes (GCM, Chacha20-poly1305)
   in kernel have too small 96-bit nonces that are problematic with
-  randomly generated IVs (the collision probability is not negligible).
+  randomly generated IVs (the collison probability is not negligible).
   For the GCM, nonce collision is a fatal problem.
 
 * Authenticated encryption do not set encryption for dm-integrity journal.

docs/v2.0.2-ReleaseNotes

@@ -30,7 +30,7 @@ Changes since version 2.0.1
 
 * Add LUKS2 specific options for cryptsetup-reencrypt.
   Tokens and persistent flags are now transferred during reencryption;
-  change of PBKDF keyslot parameters is now supported and allows one
+  change of PBKDF keyslot parameters is now supported and allows
   to set precalculated values (no benchmarks).
 
 * Do not allow LUKS2 --persistent and --test-passphrase cryptsetup flags

docs/v2.0.3-ReleaseNotes

@@ -28,7 +28,7 @@ Changes since version 2.0.2
 
 * New API extensions for unbound keyslots (LUKS2 only)
   crypt_keyslot_get_key_size() and crypt_volume_key_get()
-  These functions allow one to get key and key size for unbound keyslots.
+  These functions allow to get key and key size for unbound keyslots.
 
 * New enum value CRYPT_SLOT_UNBOUND for keyslot status (LUKS2 only).
 

docs/v2.1.0-ReleaseNotes

@@ -1,210 +0,0 @@
-Cryptsetup 2.1.0 Release Notes
-==============================
-Stable release with new features and bug fixes.
-
-Cryptsetup 2.1 version uses a new on-disk LUKS2 format as the default
-LUKS format and increases default LUKS2 header size.
-
-The legacy LUKS (referenced as LUKS1) will be fully supported forever
-as well as a traditional and fully backward compatible format.
-
-When upgrading a stable distribution, please use configure option
---with-default-luks-format=LUKS1 to maintain backward compatibility.
-
-This release also switches to OpenSSL as a default cryptographic
-backend for LUKS header processing. Use --with-crypto_backend=gcrypt
-configure option if you need to preserve legacy libgcrypt backend.
-
-Please do not use LUKS2 without properly configured backup or
-in production systems that need to be compatible with older systems.
-
-Changes since version 2.0.6
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* The default for cryptsetup LUKS format action is now LUKS2.
-  You can use LUKS1 with cryptsetup option --type luks1.
-
-* The default size of the LUKS2 header is increased to 16 MB.
-  It includes metadata and the area used for binary keyslots;
-  it means that LUKS header backup is now 16MB in size.
-
-  Note, that used keyslot area is much smaller, but this increase
-  of reserved space allows implementation of later extensions
-  (like online reencryption).
-  It is fully compatible with older cryptsetup 2.0.x versions.
-  If you require to create LUKS2 header with the same size as
-  in the 2.0.x version, use --offset 8192 option for luksFormat
-  (units are in 512-bytes sectors; see notes below).
-
-* Cryptsetup now doubles LUKS default key size if XTS mode is used
-  (XTS mode uses two internal keys). This does not apply if key size
-  is explicitly specified on the command line and it does not apply
-  for the plain mode.
-  This fixes a confusion with AES and 256bit key in XTS mode where
-  code used AES128 and not AES256 as often expected.
-
-  Also, the default keyslot encryption algorithm (if cannot be derived
-  from data encryption algorithm) is now available as configure
-  options --with-luks2-keyslot-cipher and --with-luks2-keyslot-keybits.
-  The default is aes-xts-plain64 with 2 * 256-bits key.
-
-* Default cryptographic backend used for LUKS header processing is now
-  OpenSSL. For years, OpenSSL provided better performance for PBKDF.
-
-  NOTE: Cryptsetup/libcryptsetup supports several cryptographic
-  library backends. The fully supported are libgcrypt, OpenSSL and
-  kernel crypto API. FIPS mode extensions are maintained only for
-  libgcrypt and OpenSSL. Nettle and NSS are usable only for some
-  subset of algorithms and cannot provide full backward compatibility.
-  You can always switch to other backends by using a configure switch,
-  for libgcrypt (compatibility for older distributions) use:
-  --with-crypto_backend=gcrypt
-
-* The Python bindings are no longer supported and the code was removed
-  from cryptsetup distribution. Please use the libblockdev project
-  that already covers most of the libcryptsetup functionality
-  including LUKS2.
-
-* Cryptsetup now allows using --offset option also for luksFormat.
-  It means that the specified offset value is used for data offset.
-  LUKS2 header areas are automatically adjusted according to this value.
-  (Note units are in 512-byte sectors due to the previous definition
-  of this option in plain mode.)
-  This option can replace --align-payload with absolute alignment value.
-
-* Cryptsetup now supports new refresh action (that is the alias for
-  "open --refresh").
-  It allows changes of parameters for an active device (like root
-  device mapping), for example, it can enable or disable TRIM support
-  on-the-fly.
-  It is supported for LUKS1, LUKS2, plain and loop-AES devices.
-
-* Integritysetup now supports mode with detached data device through
-  new --data-device option.
-  Since kernel 4.18 there is a possibility to specify external data
-  device for dm-integrity that stores all integrity tags.
-
-* Integritysetup now supports automatic integrity recalculation
-  through new --integrity-recalculate option.
-  Linux kernel since version 4.18 supports automatic background
-  recalculation of integrity tags for dm-integrity.
-
-Other changes and fixes
-~~~~~~~~~~~~~~~~~~~~~~~
-
-* Fix for crypt_wipe call to allocate space if the header is backed
-  by a file. This means that if you use detached header file, it will
-  now have always the full size after luksFormat, even if only
-  a few keyslots are used.
-
-* Fixes to offline cryptsetup-reencrypt to preserve LUKS2 keyslots
-  area sizes after reencryption and fixes for some other issues when
-  creating temporary reencryption headers.
-
-* Added some FIPS mode workarounds. We cannot (yet) use Argon2 in
-  FIPS mode, libcryptsetup now fallbacks to use PBKDF2 in FIPS mode.
-
-* Rejects conversion to LUKS1 if PBKDF2 hash algorithms
-  in keyslots differ.
-
-* The hash setting on command line now applies also to LUKS2 PBKDF2
-  digest. In previous versions, the LUKS2 key digest used PBKDF2-SHA256
-  (except for converted headers).
-
-* Allow LUKS2 keyslots area to increase if data offset allows it.
-  Cryptsetup can fine-tune LUKS2 metadata area sizes through
-  --luks2-metadata-size=BYTES and --luks2-keyslots-size=BYTES.
-  Please DO NOT use these low-level options until you need it for
-  some very specific additional feature.
-  Also, the code now prints these LUKS2 header area sizes in dump
-  command.
-
-* For LUKS2, keyslot can use different encryption that data with
-  new options --keyslot-key-size=BITS and --keyslot-cipher=STRING
-  in all commands that create new LUKS keyslot.
-  Please DO NOT use these low-level options until you need it for
-  some very specific additional feature.
-
-* Code now avoids data flush when reading device status through
-  device-mapper.
-
-* The Nettle crypto backend and the userspace kernel crypto API
-  backend were enhanced to allow more available hash functions
-  (like SHA3 variants).
-
-* Upstream code now does not require libgcrypt-devel
-  for autoconfigure, because OpenSSL is the default.
-  The libgcrypt does not use standard pkgconfig detection and
-  requires specific macro (part of libgcrypt development files)
-  to be always present during autoconfigure.
-  With other crypto backends, like OpenSSL, this makes no sense,
-  so this part of autoconfigure is now optional.
-
-* Cryptsetup now understands new --debug-json option that allows
-  an additional dump of some JSON information. These are no longer
-  present in standard debug output because it could contain some
-  specific LUKS header parameters.
-
-* The luksDump contains the hash algorithm used in Anti-Forensic
-  function.
-
-* All debug messages are now sent through configured log callback
-  functions, so an application can easily use own debug messages
-  handling. In previous versions debug messages were printed directly
-  to standard output.)
-
-Libcryptsetup API additions
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-These new calls are now exported, for details see libcryptsetup.h:
-
- * crypt_init_data_device
- * crypt_get_metadata_device_name
-     functions to init devices with separate metadata and data device
-     before a format function is called.
-
- * crypt_set_data_offset
-     sets the data offset for LUKS to the specified value
-     in 512-byte sectors.
-     It should replace alignment calculation in LUKS param structures.
-
- * crypt_get_metadata_size
- * crypt_set_metadata_size
-     allows one to set/get area sizes in LUKS header
-     (according to specification).
-
- * crypt_get_default_type
-     get default compiled-in LUKS type (version).
-
- * crypt_get_pbkdf_type_params
-     allows one to get compiled-in PBKDF parameters.
-
- * crypt_keyslot_set_encryption
- * crypt_keyslot_get_encryption
-     allows one to set/get per-keyslot encryption algorithm for LUKS2.
-
- * crypt_keyslot_get_pbkdf
-     allows one to get PBKDF parameters per-keyslot.
-
- and these new defines:
- * CRYPT_LOG_DEBUG_JSON (message type for JSON debug)
- * CRYPT_DEBUG_JSON (log level for JSON debug)
- * CRYPT_ACTIVATE_RECALCULATE (dm-integrity recalculate flag)
- * CRYPT_ACTIVATE_REFRESH (new open with refresh flag)
-
-All existing API calls should remain backward compatible.
-
-Unfinished things & TODO for next releases
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* Optional authenticated encryption is still an experimental feature
-  and can have performance problems for high-speed devices and device
-  with larger IO blocks (like RAID).
-
-* Authenticated encryption does not use encryption for a dm-integrity
-  journal. While it does not influence data confidentiality or
-  integrity protection, an attacker can get some more information
-  from data journal or cause that system will corrupt sectors after
-  journal replay. (That corruption will be detected though.)
-
-* The LUKS2 metadata area increase is mainly needed for the new online
-  reencryption as the major feature for the next release.

docs/v2.2.0-ReleaseNotes

@@ -1,279 +0,0 @@
-Cryptsetup 2.2.0 Release Notes
-==============================
-Stable release with new experimental features and bug fixes.
-
-Cryptsetup 2.2 version introduces a new LUKS2 online reencryption
-extension that allows reencryption of mounted LUKS2 devices
-(device in use) in the background.
-
-Online reencryption is a complex feature. Please be sure you
-have a full data backup before using this feature.
-
-Changes since version 2.1.0
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-LUKS2 online reencryption
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The reencryption is intended to provide a reliable way to change
-volume key or an algorithm change while the encrypted device is still
-in use.
-
-It is based on userspace-only approach (no kernel changes needed)
-that uses the device-mapper subsystem to remap active devices on-the-fly
-dynamically. The device is split into several segments (encrypted by old
-key, new key and so-called hotzone, where reencryption is actively running).
-
-The flexible LUKS2 metadata format is used to store intermediate states
-(segment mappings) and both version of keyslots (old and new keys).
-Also, it provides a binary area (in the unused keyslot area space)
-to provide recovery metadata in the case of unexpected failure during
-reencryption. LUKS2 header is during the reencryption marked with
-"online-reencryption" keyword. After the reencryption is finished,
-this keyword is removed, and the device is backward compatible with all
-older cryptsetup tools (that support LUKS2).
-
-The recovery supports three resilience modes:
-
-  - checksum: default mode, where individual checksums of ciphertext hotzone
-    sectors are stored, so the recovery process can detect which sectors were
-    already reencrypted. It requires that the device sector write is atomic.
-
-  - journal: the hotzone is journaled in the binary area
-    (so the data are written twice)
-
-  - none: performance mode; there is no protection
-    (similar to old offline reencryption)
-
-These resilience modes are not available if reencryption uses data shift.
-
-Note: until we have full documentation (both of the process and metadata),
-please refer to Ondrej's slides (some slight details are no longer relevant)
-https://okozina.fedorapeople.org/online-disk-reencryption-with-luks2-compact.pdf
-
-The offline reencryption tool (cryptsetup-reencrypt) is still supported
-for both LUKS1 and LUKS2 format.
-
-Cryptsetup examples for reencryption
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The reencryption feature is integrated directly into cryptsetup utility
-as the new "reencrypt" action (command).
-
-There are three basic modes - to perform reencryption (change of already
-existing LUKS2 device), to add encryption to plaintext device and to remove
-encryption from a device (decryption).
-
-In all cases, if existing LUKS2 metadata contains information about
-the ongoing reencryption process, following reencrypt command continues
-with the ongoing reencryption process until it is finished.
-
-You can activate a device with ongoing reencryption as the standard LUKS2
-device, but the reencryption process will not continue until the cryptsetup
-reencrypt command is issued.
-
-
-1) Reencryption
-~~~~~~~~~~~~~~~
-This mode is intended to change any attribute of the data encryption
-(change of the volume key, algorithm or sector size).
-Note that authenticated encryption is not yet supported.
-
-You can start the reencryption process by specifying a LUKS2 device or with
-a detached LUKS2 header.
-The code should automatically recognize if the device is in use (and if it
-should use online mode of reencryption).
-
-If you do not specify parameters, only volume key is changed
-(a new random key is generated).
-
-# cryptsetup reencrypt <device> [--header <hdr>]
-
-You can also start reencryption using active mapped device name:
-  # cryptsetup reencrypt --active-name <name>
-
-You can also specify the resilience mode (none, checksum, journal) with
---resilience=<mode> option, for checksum mode also the hash algorithm with
---resilience-hash=<alg> (only hash algorithms supported by cryptographic
-backend are available).
-
-The maximal size of reencryption hotzone can be limited by
---hotzone-size=<size> option and applies to all reencryption modes.
-Note that for checksum and journal mode hotzone size is also limited
-by available space in binary keyslot area.
-
-2) Encryption
-~~~~~~~~~~~~~
-This mode provides a way to encrypt a plaintext device to LUKS2 format.
-This option requires reduction of device size (for LUKS2 header) or new
-detached header.
-
-  # cryptsetup reencrypt <device> --encrypt --reduce-device-size <size>
-
-Or with detached header:
-  # cryptsetup reencrypt <device> --encrypt --header <hdr>
-
-3) Decryption
-~~~~~~~~~~~~~
-This mode provides the removal of existing LUKS2 encryption and replacing
-a device with plaintext content only.
-For now, we support only decryption with a detached header.
-
-  # cryptsetup reencrypt <device> --decrypt --header <hdr>
-
-For all three modes, you can split the process to metadata initialization
-(prepare keyslots and segments but do not run reencryption yet) and the data
-reencryption step by using --init-only option.
-
-Prepares metadata:
-  # cryptsetup reencrypt --init-only <parameters>
-
-Starts the data processing:
-  # cryptsetup reencrypt <device>
-
-Please note, that due to the Linux kernel limitation, the encryption or
-decryption process cannot be run entirely online - there must be at least
-short offline window where operation adds/removes device-mapper crypt (LUKS2) layer.
-This step should also include modification of /etc/crypttab and fstab UUIDs,
-but it is out of the scope of cryptsetup tools.
-
-Limitations
-~~~~~~~~~~~
-Most of these limitations will be (hopefully) fixed in next versions.
-
-* Only one active keyslot is supported (all old keyslots will be removed
-  after reencryption).
-
-* Only block devices are now supported as parameters. As a workaround
-  for images in a file, please explicitly map a loop device over the image
-  and use the loop device as the parameter.
-
-* Devices with authenticated encryption are not supported. (Later it will
-  be limited by the fixed per-sector metadata, per-sector metadata size
-  cannot be changed without a new device format operation.)
-
-* The reencryption uses userspace crypto library, with fallback to
-  the kernel (if available). There can be some specific configurations
-  where the fallback does not provide optimal performance.
-
-* There are no translations of error messages until the final release
-  (some messages can be rephrased as well).
-
-* The repair command is not finished; the recovery of interrupted
-  reencryption is made automatically on the first device activation.
-
-* Reencryption triggers too many udev scans on metadata updates (on closing
-  write enabled file descriptors). This has a negative performance impact on the whole
-  reencryption and generates excessive I/O load on the system.
-
-New libcryptsetup reencryption API
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The libcryptsetup contains new API calls that are used to setup and
-run the reencryption.
-
-Note that there can be some changes in API implementation of these functions
-and/or some new function can be introduced in final cryptsetup 2.2 release.
-
-New API symbols (see documentation in libcryptsetup.h)
-* struct crypt_params_reencrypt - reencryption parameters
-
-* crypt_reencrypt_init_by_passphrase
-* crypt_reencrypt_init_by_keyring
-  - function to configure LUKS2 metadata for reencryption;
-    if metadata already exists, it configures the context from this metadata
-
-* crypt_reencrypt
-  - run the reencryption process (processing the data)
-  - the optional callback function can be used to interrupt the reencryption
-    or report the progress.
-
-* crypt_reencrypt_status
-  - function to query LUKS2 metadata about the reencryption state
-
-Other changes and fixes
-~~~~~~~~~~~~~~~~~~~~~~~
-* Add optional global serialization lock for memory hard PBKDF.
-  (The --serialize-memory-hard-pbkdf option in cryptsetup and
-  CRYPT_ACTIVATE_SERIALIZE_MEMORY_HARD_PBKDF in activation flag.)
-
-  This is an "ugly" optional workaround for a situation when multiple devices
-  are being activated in parallel (like systemd crypttab activation).
-  The system instead of returning ENOMEM (no memory available) starts
-  out-of-memory (OOM) killer to kill processes randomly.
-
-  Until we find a reliable way how to work with memory-hard function
-  in these situations, cryptsetup provide a way how to serialize memory-hard
-  unlocking among parallel cryptsetup instances to workaround this problem.
-  This flag is intended to be used only in very specific situations,
-  never use it directly :-)
-
-* Abort conversion to LUKS1 with incompatible sector size that is
-  not supported in LUKS1.
-
-* Report error (-ENOENT) if no LUKS keyslots are available. User can now
-  distinguish between a wrong passphrase and no keyslot available.
-
-* Fix a possible segfault in detached header handling (double free).
-
-* Add integritysetup support for bitmap mode introduced in Linux kernel 5.2.
-  Integritysetup now supports --integrity-bitmap-mode option and
-  --bitmap-sector-per-bit and --bitmap-flush-time commandline options.
-
-  In the bitmap operation mode, if a bit in the bitmap is 1, the corresponding
-  region's data and integrity tags are not synchronized - if the machine
-  crashes, the unsynchronized regions will be recalculated.
-  The bitmap mode is faster than the journal mode because we don't have
-  to write the data twice, but it is also less reliable, because if data
-  corruption happens when the machine crashes, it may not be detected.
-  This can be used only for standalone devices, not with dm-crypt.
-
-* The libcryptsetup now keeps all file descriptors to underlying device
-  open during the whole lifetime of crypt device context to avoid excessive
-  scanning in udev (udev run scan on every descriptor close).
-
-* The luksDump command now prints more info for reencryption keyslot
-  (when a device is in-reencryption).
-
-* New --device-size parameter is supported for LUKS2 reencryption.
-  It may be used to encrypt/reencrypt only the initial part of the data
-  device if the user is aware that the rest of the device is empty.
-
-  Note: This change causes API break since the last rc0 release
-  (crypt_params_reencrypt structure contains additional field).
-
-* New --resume-only parameter is supported for LUKS2 reencryption.
-  This flag resumes reencryption process if it exists (not starting
-  new reencryption).
-
-* The repair command now tries LUKS2 reencryption recovery if needed.
-
-* If reencryption device is a file image, an interactive dialog now
-  asks if reencryption should be run safely in offline mode
-  (if autodetection of active devices failed).
-
-* Fix activation through a token where dm-crypt volume key was not
-  set through keyring (but using old device-mapper table parameter mode).
-
-* Online reencryption can now retain all keyslots (if all passphrases
-  are provided). Note that keyslot numbers will change in this case.
-
-* Allow volume key file to be used if no LUKS2 keyslots are present.
-  If all keyslots are removed, LUKS2 has no longer information about
-  the volume key size (there is only key digest present).
-  Please use --key-size option to open the device or add a new keyslot
-  in these cases.
-
-* Print a warning if online reencrypt is called over LUKS1 (not supported).
-
-* Fix TCRYPT KDF failure in FIPS mode.
-  Some crypto backends support plain hash in FIPS mode but not for PBKDF2.
-
-* Remove FIPS mode restriction for crypt_volume_key_get.
-  It is an application responsibility to use this API in the proper context.
-
-* Reduce keyslots area size in luksFormat when the header device is too small.
-  Unless user explicitly asks for keyslots areas size  (either via
-  --luks2-keyslots-size or --offset) reduce keyslots size so that it fits
-  in metadata device.
-
-* Make resize action accept --device-size parameter (supports units suffix).

docs/v2.2.1-ReleaseNotes

@@ -1,36 +0,0 @@
-Cryptsetup 2.2.1 Release Notes
-==============================
-Stable bug-fix release.
-
-This version contains a fix for a possible data corruption bug
-on 32-bit platforms.
-All users of cryptsetup 2.1 and 2.2 should upgrade to this version.
-
-Changes since version 2.2.0
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* Fix possible data length and IV offset overflow on 32bit architectures.
-  Other 64-bit architectures are not affected.
-
-  The flawed helper function prototypes (introduced in version 2.1.0) used
-  size_t type, that is 32-bit integer on 32-bit systems.
-  This patch fixes the problem to properly use 64-bit types.
-
-  If the offset parameter addresses devices larger than 2TB, the value
-  overflows and stores incorrect information in the metadata.
-  For example, integrity device is smaller than expected size if used
-  over large disk on 32-bit architecture.
-
-  This issue is not present with the standard LUKS1/LUKS2 devices without
-  integrity extensions.
-
-* Fix a regression in TrueCrypt/VeraCrypt system partition activation.
-
-* Reinstate missing backing file hint for loop device.
-
-  If the encrypted device is backed by a file (loopback), cryptsetup now
-  shows the path to the backing file in passphrase query (as in 1.x version).
-
-* LUKS2 reencryption block size is now aligned to reported optimal IO size.
-  This change eliminates possible non-aligned device warnings in kernel log
-  during reencryption.

docs/v2.2.2-ReleaseNotes

@@ -1,56 +0,0 @@
-Cryptsetup 2.2.2 Release Notes
-==============================
-Stable bug-fix release.
-
-All users of cryptsetup 2.1 and 2.2 should upgrade to this version.
-
-Changes since version 2.2.1
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* Print error message if a keyslot open failed for a different reason
-  than wrong passwords (for example there is not enough memory).
-  Only an exit code was present in this case.
-
-* The progress function switches unit sizes (B/s to GiB/s) according
-  to the actual speed. Also, it properly calculates speed in the case
-  of a resumed reencryption operation.
-
-* The --version now supports short -V short option and better handles
-  common option priorities.
-
-* If cryptsetup wipes signatures during format actions through blkid,
-  it also prints signature device offsets.
-
-* Compilation now properly uses LTLIBINTL gettext setting in Makefiles.
-
-* Device-mapper backend now supports new DM_GET_TARGET_VERSION ioctl
-  (available since Linux kernel 5.4).
-  This should help to detect some kernel/userspace incompatibilities
-  earlier later after a failed device activation.
-
-* Fixes LUKS2 reencryption on systems without kernel keyring.
-
-* Fixes unlocking prompt for partitions mapped through loop devices
-  (to properly show the backing device).
-
-* For LUKS2 decryption, a device is now marked for deferred removal
-  to be automatically deactivated.
-
-* Reencryption now limits hotzone size to be maximal 1 GiB or 1/4
-  system memory (if lower).
-
-* Reencryption now retains activation flags during online reencryption.
-
-* Reencryption now allows LUKS2 device to activate device right after
-  LUKS2 encryption is initialized through optional active device name
-  for cryptsetup reencrypt --encrypt command.
-  This could help with automated encryption during boot.
-
-  NOTE: It means that part of the device is still not encrypted during
-  activation. Use with care!
-
-* Fixes failure in resize and plain format activation if activated device
-  size was not aligned to underlying logical device size.
-
-* Fixes conversion to LUKS2 format with detached header if a detached
-  header size was smaller than the expected aligned LUKS1 header size.

docs/v2.3.0-ReleaseNotes

@@ -1,209 +0,0 @@
-Cryptsetup 2.3.0 Release Notes
-==============================
-Stable release with new experimental features and bug fixes.
-
-Cryptsetup 2.3 version introduces support for BitLocker-compatible
-devices (BITLK format). This format is used in Windows systems,
-and in combination with a filesystem driver, cryptsetup now provides
-native read-write access to BitLocker Full Disk Encryption devices.
-
-The BITLK implementation is based on publicly available information
-and it is an independent and opensource implementation that allows
-one to access this proprietary disk encryption.
-
-Changes since version 2.2.2
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* BITLK (Windows BitLocker compatible) device access
-
-  BITLK userspace implementation is based on the master thesis and code
-  provided by Vojtech Trefny. Also, thanks to other opensource projects
-  like libbde (that provide alternative approach to decode this format)
-  we were able to verify cryptsetup implementation.
-
-  NOTE: Support for the BITLK device is EXPERIMENTAL and will require
-  a lot of testing. If you get some error message (mainly unsupported
-  metadata in the on-disk header), please help us by submitting an issue
-  to cryptsetup project, so we can fix it. Thank you!
-
-  Cryptsetup supports BITLK activation through passphrase or recovery
-  passphrase for existing devices (BitLocker and Bitlocker to Go).
-
-  Activation through TPM, SmartCard, or any other key protector
-  is not supported. And in some situations, mainly for TPM bind to some
-  PCR registers, it could be even impossible on Linux in the future.
-
-  All metadata (key protectors) are handled read-only, cryptsetup cannot
-  create or modify them. Except for old devices (created in old Vista
-  systems), all format variants should be recognized.
-
-  Data devices can be activated read-write (followed by mounting through
-  the proper filesystem driver). To access filesystem on the decrypted device
-  you need properly installed driver (vfat, NTFS or exFAT).
-
-  Foe AES-XTS, activation is supported on all recent Linux kernels.
-
-  For older AES-CBC encryption, Linux Kernel version 5.3 is required
-  (support for special IV variant); for AES-CBC with Elephant diffuser,
-  Linux Kernel 5.6 is required.
-
-  Please note that CBC variants are legacy, and we provide it only
-  for backward compatibility (to be able to access old drives).
-
-  Cryptsetup command now supports the new "bitlk" format and implement dump,
-  open, status, and close actions.
-
-  To activate a BITLK device, use
-
-    # cryptsetup open --type bitlk <device> <name>
-      or with alias
-    # cryptsetup bitlkOpen <device> <name>
-
-  Then with properly installed fs driver (usually NTFS, vfat or exFAT),
-  you can mount the plaintext device /dev/mapper<name> device as a common
-  filesystem.
-
- To print metadata information about BITLK device, use
-   # crypotsetup bitlkDump <device>
-
- To print information about the active device, use
-   # cryptsetup status <name>
-
- Example (activation of disk image):
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  # Recent blkid recognizes BitLocker device,just to verity
-  # blkid bitlocker_xts_ntfs.img
-    bitlocker_xts_ntfs.img: TYPE="BitLocker"
-
-  # Print visible metadata information (on-disk, form the image)
-  # cryptsetup bitlkDump bitlocker_xts_ntfs.img
-    Info for BITLK device bitlocker_xts_ntfs.img.
-    Version:        2
-    GUID:           ...
-    Created:        Wed Oct 23 17:38:15 2019
-    Description:    DESKTOP-xxxxxxx E: 23.10.2019
-    Cipher name:    aes
-    Cipher mode:    xts-plain64
-    Cipher key:     128 bits
-
-    Keyslots:
-     0: VMK
-            GUID:           ...
-            Protection:     VMK protected with passphrase
-            Salt:           ...
-            Key data size:  44 [bytes]
-     1: VMK
-            GUID:           ...
-            Protection:     VMK protected with recovery passphrase
-            Salt:           ...
-            Key data size:  44 [bytes]
-     2: FVEK
-           Key data size:  44 [bytes]
-
-  # Activation (recovery passphrase works the same as password)
-  # cryptsetup bitlkOpen bitlocker_xts_ntfs.img test -v
-    Enter passphrase for bitlocker_xts_ntfs.img:
-    Command successful.
-
-  # Information about the active device
-  # cryptsetup status test
-    /dev/mapper/test is active.
-    type:    BITLK
-    cipher:  aes-xts-plain64
-    keysize: 128 bits
-    ...
-
-  # Plaintext device should now contain decrypted NTFS filesystem
-  # blkid /dev/mapper/test
-    /dev/mapper/test: UUID="..." TYPE="ntfs"
-
-  # And can be mounted
-  # mount /dev/mapper/test /mnt/tst
-
-  # Deactivation
-  # umount /mnt/tst
-  # cryptsetup close test
-
-* Veritysetup now supports activation with additional PKCS7 signature
-  of root hash through --root-hash-signature option.
-  The signature uses an in-kernel trusted key to validate the signature
-  of the root hash during activation. This option requires Linux kernel
-  5.4 with DM_VERITY_VERIFY_ROOTHASH_SIG option.
-
-  Verity devices activated with signature now has a special flag
-  (with signature) active in device status (veritysetup status <name>).
-
-  Usage:
-  # veritysetup open <data_device> name <hash_device> <root_hash> \
-    --root-hash-signature=<roothash_p7_sig_file>
-
-* Integritysetup now calculates hash integrity size according to algorithm
-  instead of requiring an explicit tag size.
-
-  Previously, when integritysetup formats a device with hash or
-  HMAC integrity checksums, it required explicitly tag size entry from
-  a user (or used default value).
-  This led to confusion and unexpected shortened tag sizes.
-
-  Now, libcryptsetup calculates tag size according to real hash output.
-  Tag size can also be specified, then it warns if these values differ.
-
-* Integritysetup now supports fixed padding for dm-integrity devices.
-
-  There was an in-kernel bug that wasted a lot of space when using metadata
-  areas for integrity-protected devices if a larger sector size than
-  512 bytes was used.
-  This problem affects both stand-alone dm-integrity and also LUKS2 with
-  authenticated encryption and larger sector size.
-
-  The new extension to dm-integrity superblock is needed, so devices
-  with the new optimal padding cannot be activated on older systems.
-
-  Integritysetup/Cryptsetup will use new padding automatically if it
-  detects the proper kernel. To create a compatible device with
-  the old padding, use --integrity-legacy-padding option.
-
-* A lot of fixes to online LUKS2 reecryption.
-
-* Add crypt_resume_by_volume_key() function to libcryptsetup.
-  If a user has a volume key available, the LUKS device can be resumed
-  directly using the provided volume key.
-  No keyslot derivation is needed, only the key digest is checked.
-
-* Implement active device suspend info.
-  Add CRYPT_ACTIVATE_SUSPENDED bit to crypt_get_active_device() flags
-  that informs the caller that device is suspended (luksSuspend).
-
-* Allow --test-passphrase for a detached header.
-  Before this fix, we required a data device specified on the command
-  line even though it was not necessary for the passphrase check.
-
-* Allow --key-file option in legacy offline encryption.
-  The option was ignored for LUKS1 encryption initialization.
-
-* Export memory safe functions.
-  To make developing of some extensions simpler, we now export
-  functions to handle memory with proper wipe on deallocation.
-
-* Fail crypt_keyslot_get_pbkdf for inactive LUKS1 keyslot.
-
-Libcryptsetup API extensions
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The libcryptsetup API is backward compatible for existing symbols.
-
-New symbols
- crypt_set_compatibility
- crypt_get_compatibility;
- crypt_resume_by_volume_key;
- crypt_activate_by_signed_key;
- crypt_safe_alloc;
- crypt_safe_realloc;
- crypt_safe_free;
- crypt_safe_memzero;
-
-New defines introduced :
-  CRYPT_BITLK "BITLK" - BITLK (BitLocker-compatible mode
-  CRYPT_COMPAT_LEGACY_INTEGRITY_PADDING - dm-integrity legacy padding
-  CRYPT_VERITY_ROOT_HASH_SIGNATURE - dm-verity root hash signature
-  CRYPT_ACTIVATE_SUSPENDED - device suspended info flag

docs/v2.3.1-ReleaseNotes

@@ -1,45 +0,0 @@
-Cryptsetup 2.3.1 Release Notes
-==============================
-Stable bug-fix release.
-
-All users of cryptsetup 2.x should upgrade to this version.
-
-Changes since version 2.3.0
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* Support VeraCrypt 128 bytes passwords.
-  VeraCrypt now allows passwords of maximal length 128 bytes
-  (compared to legacy TrueCrypt where it was limited by 64 bytes).
-
-* Strip extra newline from BitLocker recovery keys
-  There might be a trailing newline added by the text editor when
-  the recovery passphrase was passed using the --key-file option.
-
-* Detect separate libiconv library.
-  It should fix compilation issues on distributions with iconv
-  implemented in a separate library.
-
-* Various fixes and workarounds to build on old Linux distributions.
-
-* Split lines with hexadecimal digest printing for large key-sizes.
-
-* Do not wipe the device with no integrity profile.
-  With --integrity none we performed useless full device wipe.
-
-* Workaround for dm-integrity kernel table bug.
-  Some kernels show an invalid dm-integrity mapping table
-  if superblock contains the "recalculate" bit. This causes
-  integritysetup to not recognize the dm-integrity device.
-  Integritysetup now specifies kernel options such a way that
-  even on unpatched kernels mapping table is correct.
-
-* Print error message if LUKS1 keyslot cannot be processed.
-  If the crypto backend is missing support for hash algorithms
-  used in PBKDF2, the error message was not visible.
-
-* Properly align LUKS2 keyslots area on conversion.
-  If the LUKS1 payload offset (data offset) is not aligned
-  to 4 KiB boundary, new LUKS2 keyslots area in now aligned properly.
-
-* Validate LUKS2 earlier on conversion to not corrupt the device
-  if binary keyslots areas metadata are not correct.

docs/v2.3.2-ReleaseNotes

@@ -1,42 +0,0 @@
-Cryptsetup 2.3.2 Release Notes
-==============================
-Stable bug-fix release.
-
-All users of cryptsetup 2.x should upgrade to this version.
-
-Changes since version 2.3.1
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* Support compilation with json-c library version 0.14.
-
-* Update FAQ document for some LUKS2 specific information.
-
-* Add option to dump content of LUKS2 unbound keyslot:
-    cryptsetup luksDump --unbound -S <slot> <device>
-  or optionally with --master-key-file option.
-
-  The slot number --key-slot (-S) option is mandatory here.
-
-  An unbound keyslot store a key is that is not assigned to data
-  area on disk (LUKS2 allows one to store arbitrary keys).
-
-* Rephrase some error messages and remove redundant end-of-lines.
-
-* Add support for discards (TRIM) for standalone dm-integrity devices.
-  Linux kernel 5.7 adds support for optional discard/TRIM operation
-  over dm-integrity devices.
-
-  It is now supported through --allow-discards integritysetup option.
-  Note you need to add this flag in all activation calls.
-
-  Note that this option cannot be used for LUKS2 authenticated encryption
-  (that uses dm-integrity for storing additional per-sector metadata).
-
-* Fix cryptsetup-reencrypt to work on devices that do not allow
-  direct-io device access.
-
-* Fix a crash in the BitLocker-compatible code error path.
-
-* Fix Veracrypt compatible support for longer (>64 bytes) passphrases.
-  It allows some older images to be correctly opened again.
-  The issue was introduced in version 2.3.1.

docs/v2.3.3-ReleaseNotes

@@ -1,42 +0,0 @@
-Cryptsetup 2.3.3 Release Notes
-==============================
-Stable bug-fix release.
-
-All users of cryptsetup 2.x should upgrade to this version.
-
-Changes since version 2.3.2
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* Fix BitLocker compatible device access that uses native 4kB sectors.
-
-  Devices formatted with storage that natively support 4096-bytes
-  sectors can also use this sector size for encryption units.
-
-* Support large IV count (--iv-large-sectors) cryptsetup option
-  for plain device mapping.
-
-  The large IV count is supported in dm-crypt together with larger
-  sector encryption. It counts the Initialization Vector (IV) in
-  a larger sector size instead of 512-bytes sectors.
-
-  This option does not have any performance or security impact,
-  but it can be used for accessing incompatible existing disk images
-  from other systems.
-
-  Only open action with plain device type and sector size > 512 bytes
-  are supported.
-
-* Fix a memory leak in BitLocker compatible handling.
-
-* Allow EBOIV (Initialization Vector algorithm) use.
-
-  The EBOIV initialization vector is intended to be used internally
-  with BitLocker devices (for CBC mode). It can now be used also
-  outside of the BitLocker compatible code.
-
-* Require both keyslot cipher and key size options.
-
-  If these LUKS2 keyslot parameters were not specified together,
-  cryptsetup silently failed.
-
-* Update to man pages and FAQ.

docs/v2.3.4-ReleaseNotes

@@ -1,112 +0,0 @@
-Cryptsetup 2.3.4 Release Notes
-==============================
-Stable bug-fix release with a security fix (32-bit only).
-
-All users of cryptsetup 2.2.x and later should upgrade to this version.
-
-Changes since version 2.3.3
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* Fix a possible out-of-bounds memory write while validating LUKS2 data
-  segments metadata (CVE-2020-14382).
-
-  This problem can be triggered only on 32-bit builds (64-bit systems
-  are not affected).
-
-  LUKS2 format validation code contains a bug in segments validation code
-  where the code does not check for possible overflow on memory allocation.
-
-  Due to the bug, the libcryptsetup can be tricked to expect such allocation
-  was successful. Later it may read data from image crafted by an attacker and
-  actually write such data beyond allocated memory.
-
-  The bug was introduced in cryptsetup 2.2.0. All later releases until 2.3.4
-  are affected.
-
-  If you only backport the fix for this CVE, these master branch git commits
-  should be backported:
-    52f5cb8cedf22fb3e14c744814ec8af7614146c7
-    46ee71edcd13e1dad50815ad65c28779aa6f7503
-    752c9a52798f11d3b765b673ebaa3058eb25316e
-
-  Thanks to Tobias Stoeckmann for discovering this issue.
-
-* Ignore reported optimal IO size if not aligned to minimal page size.
-
-  Some USB enclosures report bogus block device topology (see lsblk -t) that
-  prevents LUKS2 format with 4k sector size (reported values are not correctly
-  aligned). The code now ignores such values and uses the default alignment.
-
-* Added support for new no_read/write_wrokqueue dm-crypt options (kernel 5.9).
-
-  These performance options, introduced in kernel 5.9, configure dm-crypt
-  to bypass read or write workqueues and run encryption synchronously.
-
-  Use --perf-no_read_workqueue or --perf-no_write_workqueue cryptsetup arguments
-  to use these dm-crypt flags.
-
-  These options are available only for low-level dm-crypt performance tuning,
-  use only if you need a change to default dm-crypt behavior.
-
-  For LUKS2, these flags can be persistently stored in metadata with
-  the --persistent option.
-
-* Added support panic_on_corruption option for dm-verity devices (kernel 5.9).
-
-  Veritysetup now supports --panic-on-corruption argument that configures
-  the dm-verity device to panics kernel if a corruption is detected.
-
-  This option is intended for specific configurations, do not use it in
-  standard configurations.
-
-* Support --master-key-file option for online LUKS2 reencryption
-
-  This can be used for reencryption of devices that uses protected key AES cipher
-  on some mainframes crypto accelerators.
-
-* Always return EEXIST error code if a device already exists.
-
-  Some libcryptsetup functions (activate_by*) now return EEXIST error code,
-  so the caller can distinguish that call fails because some parallel process
-  already activated the device.
-  Previously all fails returned EINVAL (invalid value).
-
-* Fix a problem in integritysetup if a hash algorithm has dash in the name.
-
-  If users want to use blake2b/blake2s, the kernel algorithm name includes
-  a dash (like "blake2s-256").
-  These algorithms can now be used for integritysetup devices.
-
-* Fix crypto backend to properly handle ECB mode.
-
-  Even though it should never be used, it should still work for testing :)
-  This fixes a bug introduced in cryptsetup version 2.3.2.
-
-* TrueCrypt/VeraCrypt compatible mode now supports the activation of devices
-  with a larger sector.
-
-  TrueCrypt/VeraCrypt always uses 512-byte sector for encryption, but for devices
-  with a larger native sector, it stores this value in the header.
-
-  This patch allows activation of such devices, basically ignoring
-  the mentioned sector size.
-
-* LUKS2: Do not create excessively large headers.
-
-  When creating a LUKS2 header with a specified --offset larger than
-  the LUKS2 header size, do not create a larger file than needed.
-
-* Fix unspecified sector size for BitLocker compatible mode.
-
-  Some BitLocker devices can contain zeroed sector size in the header.
-  In this case, the 512-byte sector should be used.
-  The bug was introduced in version 2.3.3.
-
-* Fix reading key data size in metadata for BitLocker compatible mode.
-
-  Such devices with an unexpected entry in metadata can now be activated.
-
-  Thanks to all users reporting these problems, BitLocker metadata documentation
-  is not publicly available, and we depend only on these reports.
-
-* Fix typos in documentation.

docs/v2.3.5-ReleaseNotes

@@ -1,181 +0,0 @@
-Cryptsetup 2.3.5 Release Notes
-==============================
-Stable bug-fix release with minor extensions.
-
-All users of cryptsetup 2.x and later should upgrade to this version.
-
-Changes since version 2.3.4
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* Fix partial reads of passphrase from an interactive terminal.
-  Some stable kernels (5.3.11) started to return buffer from a terminal
-  in parts of maximal size 64 bytes.
-  This breaks the reading of passphrases longer than 64 characters
-  entered through an interactive terminal. The change is already fixed
-  in later kernel releases, but tools now support such partial read from
-  terminal properly.
-
-* Fix maximal length of password entered through a terminal.
-  Now the maximal interactive passphrase length is exactly
-  512 characters (not 511).
-
-* integritysetup: support new dm-integrity HMAC recalculation options.
-
-  In older kernels (since version 4.19), an attacker can force
-  an automatic recalculation of integrity tags by modifying
-  the dm-integrity superblock.
-  This is a problem with a keyed algorithms (HMAC), where it expects
-  nobody can trigger such recalculation without the key.
-  (Automatic recalculation will start after the next activation.)
-
-  Note that dm-integrity in standalone mode was *not* supposed
-  to provide cryptographic data integrity protection.
-  Despite that, we try to keep the system secure if keyed algorithms
-  are used.
-  Thank Daniel Glöckner for the original report of this problem.
-
-  Authenticated encryption that provides data integrity protection (in
-  combination with dm-crypt and LUKS2) is not affected by this problem.
-
-  The fix in the kernel for this problem contains two parts.
-
-  Firstly, the dm-integrity kernel module disables integrity
-  recalculation if keyed algorithms (HMAC) are used.
-  This change is included in long-term stable kernels.
-
-  Secondly, since the kernel version 5.11, dm-integrity introduces
-  modified protection where a journal-integrity algorithm guards
-  superblock; also, journal sections are protected. An attacker cannot
-  copy sectors from one journal section to another, and the superblock
-  also contains salt to prevent header replacement from another device.
-
-  If you want to protect data with HMAC, you should always also use HMAC
-  for --journal-integrity. Keys can be independent.
-  If HMAC is used for data but not for the journal, the recalculation
-  option is disabled.
-
-  If you need to use (insecure) backward compatibility implementation,
-  two new integritysetup options are introduced:
-    - Use --integrity-legacy-recalc (instead of --integrity-recalc)
-      to allow recalculation on legacy devices.
-    - Use --integrity-legacy-hmac in format action to force old insecure
-      HMAC format.
-
-  Libcryptsetup API also introduces flags
-    CRYPT_COMPAT_LEGACY_INTEGRITY_HMAC and
-    CRYPT_COMPAT_LEGACY_INTEGRITY_RECALC
-  to set these through crypt_set_compatibility() call.
-
-* integritysetup: display of recalculating sector in dump command.
-
-* veritysetup: fix verity FEC if stored in the same image with hashes.
-
-  Optional FEC (Forward Error Correction) data should cover the whole
-  data area, hashes (Merkle tree), and optionally additional metadata
-  (located after hash area).
-
-  Unfortunately, if FEC data is stored in the same file as hash,
-  the calculation wrongly used the whole file size, thus overlaps with
-  the FEC area itself. This produced unusable and too large FEC data.
-  There is no problem if the FEC image is a separate image.
-
-  The problem is now fixed, introducing FEC blocks calculation as:
-    - If the hash device is in a separate image, metadata covers the
-      whole rest of the image after the hash area. (Unchanged behavior.)
-    - If hash and FEC device is in the image, metadata ends on the FEC
-      area offset.
-
-  Note: there is also a fix for FEC in the dm-verity kernel (on the way
-  to stable kernels) that fixes error correction with larger RS roots.
-
-* veritysetup: run FEC repair check even if root hash fails.
-
-  Note: The userspace FEC verify command reports are only informational
-  for now. Code does not check verity hash after FEC recovery in
-  userspace. The Reed-Solomon decoder can then report the possibility
-  that it fixed data even if parity is too damaged.
-  This will be fixed in the next major release.
-
-* veritysetup: do not process hash image if hash area is empty.
-
-  Sometimes the device is so small that there is only a root hash
-  needed, and the hash area is not used.
-  Also, the size of the hash image is not increased for hash block
-  alignment in this case.
-
-* veritysetup: store verity hash algorithm in superblock in lowercase.
-
-  Otherwise, the kernel could refuse the activation of the device.
-
-* bitlk: fix a crash if the device disappears during BitLocker scan.
-
-* bitlk: show a better error when trying to open an NTFS device.
-
-  Both BitLocker version 1 and NTFS have the same signature.
-  If a user opens an NTFS device without BitLocker, it now correctly
-  informs that it is not a BITLK device.
-
-* bitlk: add support for startup key protected VMKs.
-
-  The startup key can be provided in --key-file option for open command.
-
-* Fix LUKS1 repair code (regression since version 1.7.x).
-
-  We cannot trust possibly broken keyslots metadata in repair, so the
-  code recalculates them instead.
-  This makes the repair code working again when the master boot record
-  signature overwrites the LUKS header.
-
-* Fix luksKeyChange for LUKS2 with assigned tokens.
-
-  The token references are now correctly assigned to the new keyslot
-  number.
-
-* Fix cryptsetup resize using LUKS2 tokens.
-
-  Code needlessly asked for passphrase even though volume key was
-  already unlocked via LUKS2 token.
-
-* Print a visible error if device resize is not supported.
-
-* Add error message when suspending wrong non-LUKS device.
-
-* Fix default XTS mode key size in reencryption.
-
-  The same luksFormat logic (double key size because XTS uses two keys)
-  is applied in the reencryption code.
-
-* Rephrase missing locking directory warning and move it to debug level.
-
-  The system should later provide a safe transition to tempdir
-  configuration, so creating locking directory inside libcryptsetup
-  call is safe.
-
-* Many fixes for the use of cipher_null (empty debug cipher).
-
-  Support for this empty cipher was intended as a debug feature and for
-  measuring performance overhead. Unfortunately, many systems started to
-  use it as an "empty shell" for LUKS (to enable encryption later).
-
-  This use is very dangerous and it creates a false sense of security.
-
-  Anyway, to not break such systems, we try to support these
-  configurations.
-  Using cipher_null in any production system is strongly discouraged!
-
-  Fixes include:
-   - allow LUKS resume for a device with cipher_null.
-   - do not upload key in keyring when data cipher is null.
-   - switch to default cipher when reencrypting cipher_null device.
-   - replace possible bogus cipher_null keyslots before reencryption.
-   - fix broken detection of null cipher in LUKS2.
-     cipher_null is no longer possible to be used in keyslot encryption
-     in LUKS2, it can be used only for data for debugging purposes.
-
-* Fixes for libpasswdqc 2.0.x (optional passphrase quality check).
-
-* Fixes for problems discovered by various tools for code analysis.
-
-  Fixes include a rework of libpopt command line option string leaks.
-
-* Various fixes to man pages.

docs/v2.3.6-ReleaseNotes

@@ -1,56 +0,0 @@
-Cryptsetup 2.3.6 Release Notes
-==============================
-Stable bug-fix release with minor extensions.
-
-All users of cryptsetup 2.x and later should upgrade to this version.
-
-Changes since version 2.3.5
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* integritysetup: Fix possible dm-integrity mapping table truncation.
-
-  While integritysetup in standalone mode (no encryption) was not
-  designed to provide keyed (and cryptographically strong) data
-  integrity protection, some options can use such algorithms (HMAC).
-
-  If a key is used, it is directly sent to the kernel dm-integrity as
-  a mapping table option (no key derivation is performed).
-  For HMAC, such a key could be quite long (up to 4096 bytes in
-  integritysetup CLI).
-
-  Unfortunately, due to fixed buffers and not correctly checking string
-  truncation, some parameter combinations could cause truncation
-  of the dm-integrity mapping table.
-  In most cases, the table was rejected by the kernel.
-  The worst possible case was key truncation for HMAC options
-  (internal_hash and journal_mac dm-integrity table options).
-
-  This release fixes possible truncation and also adds more sanity
-  checks to reject truncated options.
-  Also, integritysetup now mentions maximal allowed key size
-  in --help output.
-
-  For old standalone dm-integrity devices where the key length was
-  truncated, you have to modify (shorten) --integrity-key-size
-  resp. --journal-integrity-key-size option now.
-
-  This bug is _not_ present for dm-crypt/LUKS, LUKS2 (including
-  integrity protection), or dm-verity devices; it affects only
-  standalone dm-integrity with HMAC integrity protection.
-
-* cryptsetup: Backup header can be used to activate TCRYPT device.
-  Use --header option to specify the header.
-
-* cryptsetup: Avoid LUKS2 decryption without detached header.
-  This feature will be added later and is currently not supported.
-
-* Additional fixes and workarounds for common warnings produced
-  by some static analysis tools (like gcc-11 analyzer) and additional
-  code hardening.
-
-* Fix standalone libintl detection for compiled tests.
-
-* Add Blake2b and Blake2s hash support for crypto backends.
-  Kernel and gcrypt crypto backend support all variants.
-  OpenSSL supports only Blake2b-512 and Blake2s-256.
-  Crypto backend supports kernel notation e.g. "blake2b-512".

docs/v2.4.0-ReleaseNotes

@@ -1,302 +0,0 @@
-Cryptsetup 2.4.0 Release Notes
-==============================
-Stable release with new features and bug fixes.
-
-This version introduces support for external libraries
-(plugins) for handling LUKS2 token objects.
-
-Changes since version 2.3.6
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* External LUKS token plugins
-
-  A LUKS2 token is an object that can describe how to get a passphrase
-  to unlock a particular keyslot. The generic metadata format is part
-  of the LUKS2 specification.
-
-  Cryptsetup 2.4 adds the possibility to implement token handlers
-  in external libraries (possibly provided by other projects).
-
-  A token library allows cryptsetup to understand metadata and provide
-  basic operations. Currently external tokens may be used to unlock
-  keyslots for following CLI actions: open (luksOpen),
-  refresh (open --refresh), resize and dump (prints token specific
-  content).
-
-  LUKS2 devices cannot be resumed (luksResume action) via tokens yet.
-  Support for resume and other actions will be added later.
-
-  The library now provides an interface that automatically tries to load
-  an external library for a token object in LUKS2 metadata.
-
-  Token libraries should be installed in the cryptsetup subdirectory
-  (usually /lib*/cryptsetup). This path is configurable through
-  --with-luks2-external-tokens-path configure option.
-
-  The external plugin loading can be compiled entirely out if
-  --disable-external-tokens configure option is used. The external token
-  interface can also be disabled runtime on the command line by
-  --disable-external-tokens cryptsetup switch or by calling
-  crypt_token_external_disable() API function.
-
-  The name of the loaded token library is determined from the JSON LUKS
-  metadata token object type. For example, "ssh" token will load library
-  "libcryptsetup-token-ssh.so".
-
-  External projects can use this interface to handle specific hardware
-  without introducing additional dependencies to libcryptsetup core.
-
-  As of cryptsetup 2.4.0 release systemd project already merged upstream
-  native cryptsetup token handler for its systemd-tpm2 LUKS2 token
-  released originally in systemd-v248. The token can be created using
-  systemd-cryptenroll utility and devices may be manipulated either by
-  systemd-cryptsetup cli or by cryptsetup for actions listed above.
-
-  Other tokens like systemd-fido2 and systemd-pkcs11 are currently
-  in-review.
-
-* Experimental SSH token
-
-  As a demonstration of the external LUKS2 token interface, a new SSH
-  token handler and cryptsetup-ssh utility is now provided and compiled
-  by default.
-
-  Crypsetup SSH token allows using remote keyfile through SSH protocol
-  (it will authenticate through SSH certificates).
-
-  You can disable the build of this token library with
-  --disable-ssh-token configure option.
-
-To configure the token metadata, you need cryptsetup-ssh utility.
-
-Activation of the device is then performed by the cryptsetup utility.
-
-Example (how to activate LUKS2 through remote keyfile):
-
-  - configure existing LUKS2 device with keyslot activated by a keyfile
-   # cryptsetup luksAddKey <device> keyfile --key-slot 2
-
-   - store that keyfile on a remote system accessible through SSH
-
-   - configure SSH to use certificate for authentication
-
-   - add a LUKS2 token with cryptsetup-ssh utility:
-   # cryptsetup-ssh add <device>1 --key-slot 2 \
-      --ssh-server test-vm \
-      --ssh-user test \
-      --ssh-path /home/test/keyfile \
-      --ssh-keypath  /home/test/.ssh/test_rsa_key
-
-  - you should see token metadata now with "cryptsetup luksDump ..."
-   ...
-   Tokens:
-   0: ssh
-        ssh_server: test-vm
-        ssh_user: test
-        ssh_path: /home/test/keyfile
-        ssh_key_path: /home/test/.ssh/test_rsa_key
-        Keyslot:    2
-
-
-  - activation now should be automatic
-  # cryptsetup open <device> test --verbose
-    SSH token initiating ssh session.
-    Key slot 2 unlocked.
-    Command successful.
-
-  - to remove a token, you can use "cryptsetup token remove" command
-  (no plugin library required)
-
-  Please note SSH token is just demonstration of plugin interface API,
-  it is an EXPERIMENTAL feature.
-
-* Add cryptsetup --token-type parameter.
-
-  It restricts token type to the parameter value in case no specific
-  token-id is selected.
-
-* Support for token based activation with PIN.
-
-  If specific token requires PIN to unlock keyslot passphrase and
-  --token-only parameter was used cryptsetup asks for additional
-  token PIN.
-
-* Respect keyslot priority with token-based activation.
-
-* Default LUKS2 PBKDF is now Argon2id
-
-  Cryptsetup LUKS2 was using Argon2 while there were two versions,
-  data-independent (Argon2i) suitable for the KDF use case and
-  Argon2d (data-dependent). Later Argon2id was introduced as a new
-  mandatory algorithm.
-
-  We switched the password-based key derivation algorithms
-  following the latest version of Argon2 RFC draft
-  (https://datatracker.ietf.org/doc/draft-irtf-cfrg-argon2/) to Argon2id
-  (from Argon2i) as it is the mandatory and primary version
-  of the Argon2 algorithm.
-
-  There is no need to modify older containers; the main reason is that
-  RFC makes Argon2id the primary variant, while Argon2i subvariant is
-  only optional.
-  Argon2id provides better protection to side-channel attacks while
-  still providing protection to time-memory tradeoffs.
-
-  We will switch to OpenSSL implementation once it is available.
-  With a crystal ball as a reference, it could happen early in
-  OpenSSL 3.1 release.
-  Watch https://github.com/openssl/openssl/issues/4091.
-
-* Increase minimal memory cost for Argon2 benchmark to 64MiB.
-
-  This patch increases the benchmarking value to 64 MiB (as minimal
-  suggested values in Argon2 RFC). For compatibility reasons, we still
-  allow older limits if set by a parameter.
-
-  NOTE: Argon2 RFC draft defines suggested parameters for disk
-  encryption, but the LUKS2 approach is slightly different. We need to
-  provide platform-independent values. The values in the draft expect
-  64bit systems (suggesting using 6 GiB of RAM). In comparison, we need
-  to provide compatibility with all 32bit systems, so allocating more
-  than 4GiB memory is not an option for LUKS2.
-
-  The maximal limit in LUKS2 stays for 4 GiB, and by default LUKS2 PBKDF
-  benchmarking sets maximum to 1 GIB, preferring an increase of CPU cost
-  while running benchmark
-
-* Autodetect optimal encryption sector size on LUKS2 format.
-
-  While the support for larger encryption sectors is supported
-  for several releases, it required an additional parameter.
-
-  Code now uses automatic detection of 4096-bytes native sector devices
-  and automatically enables 4096-bytes encryption size for LUKS2.
-
-  If no setor size option is used, sector size is detected
-  automatically by cryptsetup. For libcryptsetup API, autodetection
-  happens once you specify sector_size to 0.
-
-  NOTE: crypt_format() function runs autodetection ONLY if you
-  recompile your application to the new API symbol version.
-  For backward compatibility, older applications ignore this parameter.
-
-* Use VeraCrypt option by default and add --disable-veracrypt option.
-
-  While TrueCrypt is no longer developed and supported since 2014,
-  VeraCrypt devices (a successor of TrueCrypt) are much more used today.
-
-  Default is now to support VeraCrypt format (in addition to TrueCrypt),
-  making the --veracrypt option obsolete (ignored as it is the default).
-
-  If you need to disable VeraCrypt support, use the new option
-  --disable-veracrypt.
-
-  This option increases the time to recognize wrong passwords because
-  some VeraCrypt modes use a high PBKDF2 iteration count, and the code
-  must try all variants. This could be limited by using --hash and
-  --cipher options mentioned below.
-
-* Support --hash and --cipher to limit opening time for TCRYPT type
-
-  If a user knows which particular PBKDF2 hash or cipher is used for
-  TrueCrypt/VeraCrypt container,  TCRYPT format now supports --hash and
-  --cipher option.
-
-  Note the value means substring (all cipher chains containing
-  the cipher substring are tried).
-
-  For example, you can use
-      # cryptsetup tcryptDump --hash sha512 <container>
-
-  Note: to speed up the scan, the hash option (used for PBKDF)2 matters.
-  Cipher variants are scanned very quickly.
-
-  Use with care.
-  It can reveal some sensitive attributes of the container!
-
-* Fixed default OpenSSL crypt backend support for OpenSSL3.
-
-  For OpenSSL version 3, we need to load legacy provider for older hash
-  and ciphers. For example, RIPEMD160 and Whirlpool hash algorithms are
-  no longer available by default.
-
-  NOTE: the plain format still uses RIPEMD160 for password hashing by
-  default. Changing the default would cause incompatibilities for many
-  old systems. Nevertheless, such a change will be needed very soon.
-
-* integritysetup: add integrity-recalculate-reset flag.
-
-  The new dm-integrity option in kernel 5.13 can restart recalculation
-  from the beginning of the device.
-  It can be used to change the integrity checksum function.
-
-  New integritysetup --integrity-recalculate-reset option is added to
-  integritysetup, and CRYPT_ACTIVATE_RECALCULATE_RESET flag to API.
-
-* cryptsetup: retains keyslot number in luksChangeKey for LUKS2.
-
-    In LUKS1, any change in keyslot means keyslot number change.
-
-    In LUKS2, we can retain the keyslot number.
-    Now luksKeyChange and crypt_keyslot_change_by_passphrase() API
-    retains keyslot number for LUKS2 by default.
-
-* Fix cryptsetup resize using LUKS2 tokens.
-
-  Fix a bug where cryptsetup needlessly asked for a passphrase even
-  though the volume key was already unlocked via LUKS2 token.
-
-* Add close --deferred and --cancel-deferred options.
-
-  All command-line utilities now understand deferred options for the
-  close command. Deferred close means that the device is removed
-  automagically after the last user closed the device.
-  Cancel deferred means to cancel this operation (so the device remains
-  active even if there a no longer active users).
-
-  CRYPT_DEACTIVATE_DEFERRED and CRYPT_DEACTIVATE_DEFERRED_CANCEL flags
-  are now available for API.
-
-* Rewritten command-line option parsing to avoid libpopt arguments
-  memory leaks.
-
-  Note: some distributions use patched lipopt that still leaks memory
-  inside internal code (see Debian bug 941814).
-
-* Add --test-args option.
-
-  New --test-args option can be used for syntax checking for valid
-  command-line arguments with no actions performed.
-  Note that it cannot detect unknown algorithm names and similar where
-  we need call API functions.
-
-* veritysetup: add --root-hash-file option
-  Allow passing the root hash via a file, rather than verbatim on
-  the command line, for the open, verify, and format actions.
-
-* libcryptsetup C API extensions (see libcryptsetup.h for details)
-
-  - crypt_logf - a printf like log function
-  - crypt_dump_json - dump LUKS2 metadata in JSON format
-  - crypt_header_is_detached - check if context use detached header
-  - crypt_token_max - get maximal tokens number
-  - crypt_token_external_path - get path for plugins (or NULL)
-  - crypt_token_external_disable - disable runtime support for plugins
-  - crypt_activate_by_token_pin - activate by token with additional PIN
-  - crypt_reencrypt_run - fixed API for deprecated crypt_reencrypt
-
-  The token plugin library interface cosists from these versioned
-  exported symbols (for details see header file and SSH token example):
-     cryptsetup_token_open
-     cryptsetup_token_open_pin
-     cryptsetup_token_buffer_free
-     cryptsetup_token_validate
-     cryptsetup_token_dump
-     cryptsetup_token_version
-
- Since version 2.4 libcryptsetup uses exact symbol versioning
- Newly introduced functions have CRYPTSETUP_2.4 namespace (the old
- symbol always used CRYPTSETUP_2.0).
- There is no change in soname (the library is backward compatible).
-
- * Many fixes and additions to documentation and man pages.

docs/v2.4.1-ReleaseNotes

@@ -1,47 +0,0 @@
-Cryptsetup 2.4.1 Release Notes
-==============================
-Stable bug-fix release with minor extensions.
-
-All users of cryptsetup 2.4.0 should upgrade to this version.
-
-Changes since version 2.4.0
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* Fix compilation for libc implementations without dlvsym().
-
-  Some alternative libc implementations (like musl) do not provide
-  versioned symbols dlvsym function. Code now fallbacks to dlsym
-  operation for dynamic LUKS2 token load.
-  It is up to maintainers to ensure that LUKS2 token plugins are
-  compiled for the supported version.
-
-* Fix compilation and tests on systems with non-standard libraries
-  (standalone argp library, external gettext library, BusyBox
-  implementations of standard tools).
-
-* Try to workaround some issues on systems without udev support.
-  NOTE: non-udev systems cannot provide all functionality for kernel
-  device-mapper, and some operations can fail.
-
-* Fixes for OpenSSL3 crypto backend (including FIPS mode).
-  Because cryptsetup still requires some hash functions implemented
-  in OpenSSL3 legacy provider, crypto backend now uses its library
-  context and tries to load both default and legacy OpenSSL3 providers.
-
-  If FIPS mode is detected, no library context is used, and it is up
-  to the OpenSSL system-wide policy to load proper providers.
-
-  NOTE: We still use some deprecated API in the OpenSSL3 backend,
-  and there are some known problems in OpenSSL 3.0.0.
-
-* Print error message when assigning a token to an inactive keyslot.
-
-* Fix offset bug in LUKS2 encryption code if --offset option was used.
-
-* Do not allow LUKS2 decryption for devices with data offset.
-  Such devices cannot be used after decryption.
-
-* Fix LUKS1 cryptsetup repair command for some specific problems.
-  Repair code can now fix wrongly used initialization vector
-  specification in ECB mode (that is insecure anyway!) and repair
-  the upper-case hash specification in the LUKS1 header.

docs/v2.4.2-ReleaseNotes

@@ -1,37 +0,0 @@
-Cryptsetup 2.4.2 Release Notes
-==============================
-Stable bug-fix release.
-
-All users of cryptsetup 2.4.1 should upgrade to this version.
-
-Changes since version 2.4.1
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* Fix possible large memory allocation if LUKS2 header size is invalid.
-  LUKS2 code read the full header to buffer to verify the checksum.
-  The maximal supported header size now limits the memory allocation.
-
-* Fix memory corruption in debug message printing LUKS2 checksum.
-
-* veritysetup: remove link to the UUID library for the static build.
-
-* Remove link to pwquality library for integritysetup and veritysetup.
-  These tools do not read passphrases.
-
-* OpenSSL3 backend: avoid remaining deprecated calls in API.
-  Crypto backend no longer use API deprecated in OpenSSL 3.0
-
-
-* Check if kernel device-mapper create device failed in an early phase.
-  This happens when a concurrent creation of device-mapper devices
-  meets in the very early state.
-
-* Do not set compiler optimization flag for Argon2 KDF if the memory
-  wipe is implemented in libc.
-
-* Do not attempt to unload LUKS2 tokens if external tokens are disabled.
-  This allows building a static binary with  --disable-external-tokens.
-
-* LUKS convert: also check sysfs for device activity.
-  If udev symlink is missing, code fallbacks to sysfs scan to prevent
-  data corruption for the active device.

docs/v2.4.3-ReleaseNotes

@@ -1,101 +0,0 @@
-Cryptsetup 2.4.3 Release Notes
-==============================
-Stable security bug-fix release that fixes CVE-2021-4122.
-
-All users of cryptsetup 2.4.x must upgrade to this version.
-
-Changes since version 2.4.2
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* Fix possible attacks against data confidentiality through LUKS2 online
-  reencryption extension crash recovery (CVE-2021-4122).
-
-  An attacker can modify on-disk metadata to simulate decryption in
-  progress with crashed (unfinished) reencryption step and persistently
-  decrypt part of the LUKS device.
-
-  This attack requires repeated physical access to the LUKS device but
-  no knowledge of user passphrases.
-
-  The decryption step is performed after a valid user activates
-  the device with a correct passphrase and modified metadata.
-  There are no visible warnings for the user that such recovery happened
-  (except using the luksDump command). The attack can also be reversed
-  afterward (simulating crashed encryption from a plaintext) with
-  possible modification of revealed plaintext.
-
-  The size of possible decrypted data depends on configured LUKS2 header
-  size (metadata size is configurable for LUKS2).
-  With the default parameters (16 MiB LUKS2 header) and only one
-  allocated keyslot (512 bit key for AES-XTS), simulated decryption with
-  checksum resilience SHA1 (20 bytes checksum for 4096-byte blocks),
-  the maximal decrypted size can be over 3GiB.
-
-  The attack is not applicable to LUKS1 format, but the attacker can
-  update metadata in place to LUKS2 format as an additional step.
-  For such a converted LUKS2 header, the keyslot area is limited to
-  decrypted size (with SHA1 checksums) over 300 MiB.
-
-  The issue is present in all cryptsetup releases since 2.2.0.
-  Versions 1.x, 2.0.x, and 2.1.x are not affected, as these do not
-  contain LUKS2 reencryption extension.
-
-  The problem was caused by reusing a mechanism designed for actual
-  reencryption operation without reassessing the security impact for new
-  encryption and decryption operations. While the reencryption requires
-  calculating and verifying both key digests, no digest was needed to
-  initiate decryption recovery if the destination is plaintext (no
-  encryption key). Also, some metadata (like encryption cipher) is not
-  protected, and an attacker could change it. Note that LUKS2 protects
-  visible metadata only when a random change occurs. It does not protect
-  against intentional modification but such modification must not cause
-  a violation of data confidentiality.
-
-  The fix introduces additional digest protection of reencryption
-  metadata. The digest is calculated from known keys and critical
-  reencryption metadata. Now an attacker cannot create correct metadata
-  digest without knowledge of a passphrase for used keyslots.
-  For more details, see LUKS2 On-Disk Format Specification version 1.1.0.
-
-  The former reencryption operation (without the additional digest) is no
-  longer supported (reencryption with the digest is not backward
-  compatible). You need to finish in-progress reencryption before
-  updating to new packages. The alternative approach is to perform
-  a repair command from the updated package to recalculate reencryption
-  digest and fix metadata.
-  The reencryption repair operation always require a user passphrase.
-
-  WARNING: Devices with older reencryption in progress can be no longer
-  activated without performing the action mentioned above.
-
-  Encryption in progress can be detected by running the luksDump command
-  (output includes reencrypt keyslot with reencryption parameters). Also,
-  during the active reencryption, no keyslot operations are available
-  (change of passphrases, etc.).
-
-  The issue was found by Milan Broz as cryptsetup maintainer.
-
-Other changes
-~~~~~~~~~~~~~
-* Add configure option --disable-luks2-reencryption to completely disable
-  LUKS2 reencryption code.
-
-  When used, the libcryptsetup library can read metadata with
-  reencryption code, but all reencryption API calls and cryptsetup
-  reencrypt commands are disabled.
-
-  Devices with online reencryption in progress cannot be activated.
-  This option can cause some incompatibilities. Please use with care.
-
-* Improve internal metadata validation code for reencryption metadata.
-
-* Add updated documentation for LUKS2 On-Disk Format Specification
-  version 1.1.0 (with reencryption extension description and updated
-  metadata description). See docs/on-disk-format-luks2.pdf or online
-  version in https://gitlab.com/cryptsetup/LUKS2-docs repository.
-
-* Fix support for bitlk (BitLocker compatible) startup key with new
-  metadata entry introduced in Windows 11.
-
-* Fix space restriction for LUKS2 reencryption with data shift.
-  The code required more space than was needed.

docs/v2.5.0-ReleaseNotes

@@ -1,291 +0,0 @@
-Cryptsetup 2.5.0 Release Notes
-==============================
-Stable release with new features and bug fixes.
-
-Changes since version 2.4.3
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* Split manual pages into per-action pages and use AsciiDoc format.
-
-  Manual pages are now generated from AsciiDoc format, allowing easy
-  conditional modifications for per-action options.
-
-  Generation of man pages requires the asciidoctor tool installed.
-
-  Pre-generated man pages are also included in the distribution tarball.
-  You can use --disable-asciidoc configure option to skip man page
-  generation completely. In this case, pre-generated man pages will be
-  used for installation.
-
-  For cryptsetup, there is main man page (cryptsetup.8) that references
-  separate man pages for each command (for example, cryptsetup-open.8).
-  You can open such a man page by simply running "man cryptsetup open".
-  Also, man pages for action aliases are available (cryptsetup-luksOpen.8
-  is an alias for cryptsetup-open.8, etc.)
-
-LUKS volume reencryption changes
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* Remove cryptsetup-reencrypt tool from the project and move reencryption
-  to already existing "cryptsetup reencrypt" command.
-
-  Cryptsetup reencrypt now handles both LUKS1 and LUKS2 reencryption,
-  encryption, and decryption.
-
-  If you need to emulate the old cryptsetup-reencrypt binary, use simple
-  wrappers script running "exec cryptsetup reencrypt $@".
-
-  All command line options should be compatible. An exception is the
-  reencryption of LUKS2 volumes with old LUKS1 reencryption code that was
-  replaced by native and more resilient LUKS2 reencryption.
-
-* LUKS2: implement --decryption option that allows LUKS removal. The
-  operation can run online or offline and supports the data shift option.
-
-  During the initialization, the LUKS2 header is exported to a file.
-  The first data segment is moved to the head of the data device in place
-  of the original header.
-
-  The feature internally introduces several new resilience modes
-  (combination of existing modes datashift and "checksum" or "journal").
-  Datashift resilience mode is applied for data moved towards the first
-  segment, and the first segment is then decrypted in place.
-
-  This decryption mode is not backward compatible with prior LUKS2
-  reencryption. Interrupted operations in progress cannot be resumed
-  using older cryptsetup releases.
-
-* Reencryption metadata options that are not compatible with recent code
-  (features implemented in more recent releases) are now only read, but
-  code will not activate or modify such metadata.
-  Reencryption metadata contains a version that is validated when
-  reencryption is resumed.
-  For more info, see the updated LUKS2 on-disk format specification.
-
-  Safe operation of reencryption is to always finish the operation with
-  only one version of the tools.
-
-* Fix decryption operation with --active-name option and restrict
-  it to be used only with LUKS2.
-
-* Do not refresh reencryption digest when not needed.
-  This should speed up the reencryption resume process.
-
-* Store proper resilience data in LUKS2 reencrypt initialization.
-  Resuming reencryption now does not require specification of resilience
-  type parameters if these are the same as during initialization.
-
-* Properly wipe the unused area after reencryption with datashift in
-  the forward direction.
-
-* Check datashift value against larger sector size.
-  For example, it could cause an issue if misaligned 4K sector appears
-  during decryption.
-
-* Do not allow sector size increase reencryption in offline mode.
-  The eventual logical block size increase on the dm-crypt device above
-  may lead to an unusable filesystem. Do not allow offline reencryption
-  when sector size increase is requested.
-
-  You can use --force-offline-reencrypt option to override this check
-  (and potentially destroy the data).
-
-* Do not allow dangerous sector size change during reencryption.
-  By changing the encryption sector size during reencryption, a user
-  may increase the effective logical block size for the dm-crypt active
-  device.
-
-  Do not allow encryption sector size to be increased over the value
-  provided by fs superblock in BLOCK_SIZE property.
-
-* Ask the user for confirmation before resuming reencryption.
-  The prompt is not shown in batch mode or when the user explicitly asks
-  for a reencryption resume via --resume-only.
-
-* Do not resume reencryption with conflicting parameters.
-  For example, if the operation was initialized as --encrypt, do not
-  allow resume with opposing parameter --decrypt and vice versa.
-  Also, the code now checks for conflicting resilience parameters
-  (datashift cannot be changed after initialization).
-
-* Add --force-offline-reencrypt option.
-  It can be used to enforce offline reencryption in batch mode when
-  the device is a regular file; therefore, cryptsetup cannot detect
-  properly active devices using it.
-  Also, it may be useful to override the active device auto-detection
-  for specific storage configurations (dangerous!).
-
-* Do not allow nested encryption in LUKS reencrypt.
-  Avoid accidental nested encryption via cryptsetup reencrypt --encrypt.
-
-* Fix --test-passphrase when the device is in reencryption.
-
-* Do not upload keys in keyring during offline reencryption.
-  Reencryption runs in userspace, so the kernel does not need the key.
-
-* Support all options allowed with luksFormat with encrypt action.
-
-* Add prompt if LUKS2 decryption is run with a detached header.
-
-* Add warning for reencryption of file image and mention
-  the possible use of --force-offline-reencrypt option.
-
-Other changes
-~~~~~~~~~~~~~
-
-* Add resize action to integritysetup.
-  This allows resizing of standalone integrity devices.
-
-* Support --device-size option (that allows unit specification) for plain
-  devices (existing --size option requires 512-byte sectors units).
-
-* Fix detection of encryption sector size if a detached header is used.
-
-* Remove obsolete dracut plugin reencryption example.
-
-* Fix possible keyslot area size overflow during conversion to LUKS2.
-  If keyslots are not sorted according to binary area offset, the area
-  size calculation was wrong and could overflow.
-
-* Hardening and fixes to LUKS2 validation functions:
-
-  * Log a visible error if convert fails due to validation check.
-
-  * Check for interval (keyslot and segment area) overflow.
-
-  * Check cipher availability before LUKS conversion to LUKS2.
-    Some historic incompatibilities are ignored for LUKS1 but do not
-    work for LUKS2.
-
-  * Add empty string check to LUKS2 metadata JSON validation.
-    Most of the LUKS2 fields cannot be empty.
-
-  * Fix JSON objects validation to check JSON object type properly.
-
-* TCRYPT: Properly apply retry count and continue if some PBKDF variant
-  is unavailable.
-
-* BITLK: Add a warning when activating a device with the wrong size
-  stored in metadata.
-
-* BITLK: Add BitLocker volume size to dump command.
-
-* BITLK: Fix possible UTF16 buffer overflow in volume key dump.
-
-* BITLK: Skip question if the batch mode is set for volume key dump.
-
-* BITLK: Check dm-zero availability in the kernel.
-  Bitlocker compatible mode uses dm-zero to mask metadata area.
-  The device cannot be activated if dm-zero is not available.
-
-* Fix error message for LUKS2-only cryptsetup commands to explicitly
-  state LUKS2 version is required.
-
-* Fix error message for incompatible dm-integrity metadata.
-  If the integritysetup tool is too old, kernel dm-integrity may use
-  a more recent version of dm-integrity metadata.
-
-* Properly deactivate the integrity device even if the LUKS2 header
-  is no longer available.
-  If LUKS2 is used with integrity protection, there is always
-  a dm-integrity device underneath that must be deactivated.
-
-* Allow use of --header option for cryptsetup close.
-  This can be used to check that the activated device has the same UUID.
-
-* Fix activation of LUKS2 device with integrity and detached header.
-  The kernel-parsed dm-integrity superblock is always located on the
-  data device, the incorrectly used detached header device here.
-
-* Add ZEROOUT IOCTL support for crypt_wipe API call.
-  For block devices, we can use optimized in-kernel BLKZEROOUT ioctl.
-
-* VERITY: set loopback sector size according to dm-verity block sizes.
-  Verity block size has the same limits, so we can optimize the loop
-  device to increase performance.
-
-* Other Documentation and man page improvements:
-
-  * Update LUKS2 on-disk format description.
-
-  * Add per-keyslot LUKS2 options to the man page.
-    Some options were missing for LUKS2 luksAddKey and luksChangeKey.
-
-  * Fix cryptsetup manpage to use PBKDF consistently.
-
-  * Add compile info to README. This information was lost when we removed
-    the default automake INSTALL file.
-
-  * Use volume key consistently in FAQ and man pages.
-
-  * Use markdown version of FAQ directly for installation.
-
-  * Clarify graceful reencryption interruption.
-    Currently, it can be interrupted by both SIGINT and SIGTERM signals.
-
-  * Add new mailing list info.
-
-  * Mention non-cryptographic xxhash64 hash for integrity protection.
-
-* veritysetup: dump device sizes.
-  Calculating device sizes for verity devices is a little bit tricky.
-  Data, hash, and FEC can share devices or be separate devices.
-  Now dump command prints used device sizes, but it requires that
-  the user specifies all values that are not stored in superblock
-  (like FEC device and FEC roots).
-
-* Fix check for argp_usage in configure if argp-standalone lib is used.
-
-* Add constant time memcmp and hexa print implementation and use it for
-  cryptographic keys handling.
-
-* Display progress when wiping the end of the resized device.
-
-* LUKS2 token: prefer token PIN query before passphrase in some cases.
-  When a user provides --token-type or specific --token-id, a token PIN
-  query is preferred to a passphrase query.
-
-* LUKS2 token: allow tokens to be replaced with --token-replace option
-  for cryptsetup token command.
-
-* LUKS2 token: do not continue operation when interrupted in PIN prompt.
-
-* Add --progress-json parameter to utilities.
-  Progress data can now be printed out in JSON format suitable for
-  machine processing.
-
-* Embedded Argon2 PBKDF: optimize and simplify thread exit.
-
-* Avoid using SHA1 in tests and fix new enforcements introduced in FIPS
-  provider for OpenSSL3 (like minimal parameters for PBKDF2).
-
-* Use custom UTF conversion and avoid linking to iconv as a dependency.
-
-* Reimplement BASE64 with simplified code instead of coreutils version.
-
-* Fix regression when warning messages were not displayed
-  if some kernel feature is not supported (2.4.2).
-
-* Add support for --key-slot option in luksResume action.
-
-Libcryptsetup API extensions and changes
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* Properly define uint32_t constants in API.
-  This is not a real change, but it avoids strict compiler warnings.
-
-* crypt_resume_by_token_pin() - Resume crypt device using LUKS2 token.
-
-* crypt_get_label() - Get the label of the LUKS2 device.
-
-* crypt_get_subsystem() - Get the subsystem label of the LUKS2 device.
-
-* Make CRYPT_WIPE_ENCRYPTED_ZERO crypt_wipe() option obsolete.
-  It was never implemented (the idea was to speed up wipe), but with
-  the recent RNG performance changes, it makes no longer sense.
-
-* Add struct crypt_params_reencrypt changes related to decryption.
-
-* Improve crypt_reencrypt_status() return values.
-  Empty or any non-LUKS types now returns CRYPT_REENCRYPT_INVALID status.
-  For LUKS1 devices, it returns CRYPT_REENCRYPT_NONE.

docs/v2.6.0-ReleaseNotes

@@ -1,236 +0,0 @@
-Cryptsetup 2.6.0 Release Notes
-==============================
-Stable release with new features and bug fixes.
-
-Changes since version 2.5.0
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* Introduce support for handling macOS FileVault2 devices (FVAULT2).
-
-  Cryptsetup now supports the mapping of FileVault2 full-disk encryption
-  by Apple for the macOS operating system using a native Linux kernel.
-  You can open an existing USB FileVault portable device and (with
-  the hfsplus filesystem driver) access the native data read/write.
-
-  Cryptsetup supports only (legacy) FileVault2 based on Core Storage
-  and HFS+ filesystem (introduced in MacOS X 10.7 Lion).
-  It does NOT support the new version of FileVault based on the APFS
-  filesystem used in recent macOS versions.
-
-  Header formatting and changes are not supported; cryptsetup never
-  changes the metadata on the device.
-
-  FVAULT2 extension requires kernel userspace crypto API and kernel
-  driver for HFS+ (hfsplus) filesystem (available on most systems today).
-
-  Example of using FileVault2 formatted USB device:
-
-  A typical encrypted device contains three partitions; the FileVault
-  encrypted partition is here sda2:
-
-  $ lsblk -o NAME,FSTYPE,LABEL /dev/sda
-    NAME   FSTYPE  LABEL
-    sda
-    |-sda1 vfat    EFI
-    |-sda2
-    `-sda3 hfsplus Boot OS X
-
-  Note: blkid does not recognize FileVault2 format yet.
-
-  To dump metadata information about the device, you can use
-  the fvault2Dump command:
-
-  $ cryptsetup fvault2Dump /dev/sda2
-    Header information for FVAULT2 device /dev/sda2.
-    Physical volume UUID:   6f353c05-daae-4e76-a0ee-6a9569a22d81
-    Family UUID:            f82cceb0-a788-4815-945a-53d57fcd55a8
-    Logical volume offset:  67108864 [bytes]
-    Logical volume size:    3288334336 [bytes]
-    Cipher:                 aes
-    Cipher mode:            xts-plain64
-    PBKDF2 iterations:      97962
-    PBKDF2 salt:            173a4ec7447662ec79ca7a47df6c2a01
-
- To activate the device, use open --type fvault2 option:
-
- $ cryptsetup open --type fvault2 /dev/sda2 test
-   Enter passphrase for /dev/sda2: ...
-
- And check the status of the active device:
-
- $ cryptsetup status test
-   /dev/mapper/test is active.
-   type:    FVAULT2
-   cipher:  aes-xts-plain64
-   keysize: 256 bits
-   key location: dm-crypt
-   device:  /dev/sda2
-   sector size:  512
-   offset:  131072 sectors
-   size:    6422528 sectors
-   mode:    read/write
-
- Now, if the kernel contains hfsplus filesystem driver, you can mount
- decrypted content:
-
- $ mount /dev/mapper/test /mnt/test
-
- For more info about implementation, please refer to the master thesis
- by Pavel Tobias, which was the source for this extension.
- https://is.muni.cz/th/p0aok/?lang=en
-
-* libcryptsetup: no longer use global memory locking through mlockall()
-
-  For many years, libcryptsetup locked all memory (including dependent
-  library address space) to prevent swapping sensitive content outside
-  of RAM.
-
-  This strategy no longer works as the locking of basic libraries exceeds
-  the memory locking limit if running as a non-root user.
-
-  Libcryptsetup now locks only memory ranges containing sensitive
-  material (keys) through crypt_safe_alloc() calls.
-
-  This change solves many reported mysterious problems of unexpected
-  failures. If the initial lock was still under the limit and succeeded,
-  some following memory allocation could fail later as it exceeded
-  the locking limit. If the initial locking fails,  memory locking
-  was quietly ignored completely.
-
-  The whole crypt_memory_lock() API call is deprecated; it no longer
-  calls memlockall().
-
-* libcryptsetup: process priority is increased only for key derivation
-  (PBKDF) calls.
-
-  Increasing priority was tight to memory locking and works only if
-  running under superuser.
-  Only PBKDF calls and benchmarking now increase the process priority.
-
-* Add new LUKS keyslot context handling functions and API.
-
-  In practice, the luksAddKey action does two operations.
-  It unlocks the existing device volume key and stores the unlocked
-  volume key in a new keyslot.
-  Previously the options were limited to key files and passphrases.
-
-  Newly available methods (keyslot contexts) are passphrase, keyfile,
-  key (binary representation), and LUKS2 token.
-
-  To unlock a keyslot user may:
-    - provide existing passphrase via interactive prompt (default method)
-    - use --key-file option to provide a file with a valid passphrase
-    - provide volume key directly via --volume-key-file
-    - unlock keyslot via all available LUKS2 tokens by --token-only
-    - unlock keyslot via specific token with --token-id
-    - unlock keyslot via specific token type by --token-type
-
-  To provide the passphrase for a new keyslot, a user may:
-    - provide existing passphrase via interactive prompt (default method)
-    - use --new-keyfile to read the passphrase from the file
-    - use --new-token-id to select LUKS2 token to get passphrase
-      for new keyslot. The new keyslot is assigned to the selected token
-      id if the operation is successful.
-
-* The volume key may now be extracted using a passphrase, keyfile, or
-  token. For LUKS devices, it also returns the volume key after
-  a successful crypt_format call.
-
-* Fix --disable-luks2-reencryption configuration option.
-
-* cryptsetup: Print a better error message and warning if the format
-  produces an image without space available for data.
-
-  Activation now fails early with a more descriptive message.
-
-* Print error if anti-forensic LUKS2 hash setting is not available.
-  If the specified hash was not available, activation quietly failed.
-
-* Fix internal crypt segment compare routine if the user
-  specified cipher in kernel format (capi: prefix).
-
-* cryptsetup: Add token unassign action.
-
-  This action allows removing token binding on specific keyslot.
-
-* veritysetup: add support for --use-tasklets option.
-
-  This option sets try_verify_in_tasklet kernel dm-verity option
-  (available since Linux kernel 6.0) to allow some performance
-  improvement on specific systems.
-
-* Provide pkgconfig Require.private settings.
-
-  While we do not completely provide static build on udev systems,
-  it helps produce statically linked binaries in certain situations.
-
-* Always update automake library files if autogen.sh is run.
-
-  For several releases, we distributed older automake scripts by mistake.
-
-* reencryption: Fix user defined moved segment size in LUKS2 decryption.
-
-  The --hotzone-size argument was ignored in cases where the actual data
-  size was less than the original LUKS2 data offset.
-
-* Delegate FIPS mode detection to configured crypto backend.
-  System FIPS mode check no longer depends on /etc/system-fips file.
-
-* tests: externally provided systemd plugin is now optionally compiled
-  from systemd git and tested with cryptsetup
-
-* tests: initial integration to OSS-fuzz project with basic crypt_load()
-  test for LUKS2 and JSON mutated fuzzing.
-
-  For more info, see README in tests/fuzz directory.
-
-* Update documentation, including FAQ and man pages.
-
-Libcryptsetup API extensions
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The libcryptsetup API is backward compatible with existing symbols.
-
-New symbols:
-  crypt_keyslot_context_init_by_passphrase
-  crypt_keyslot_context_init_by_keyfile
-  crypt_keyslot_context_init_by_token
-  crypt_keyslot_context_init_by_volume_key
-  crypt_keyslot_context_get_error
-  crypt_keyslot_context_set_pin
-  crypt_keyslot_context_get_type
-  crypt_keyslot_context_free
-  crypt_keyslot_add_by_keyslot_context
-  crypt_volume_key_get_by_keyslot_context
-
-New defines:
-  CRYPT_FVAULT2 "FVAULT2" (FileVault2 compatible mode)
-
-Keyslot context types:
-  CRYPT_KC_TYPE_PASSPHRASE
-  CRYPT_KC_TYPE_KEYFILE
-  CRYPT_KC_TYPE_TOKEN
-  CRYPT_KC_TYPE_KEY
-
-  CRYPT_ACTIVATE_TASKLETS (dm-verity: use tasklets activation flag)
-
-WARNING!
-~~~~~~~~
-The next version of cryptsetup will change the encryption mode and key
-derivation option for the PLAIN format.
-
-This change will cause backward incompatibility.
-For this reason, the user will have to specify the exact parameters
-for cipher, key size, and key derivation parameters for plain format.
-
-The default encryption mode will be AES-XTS with 512bit key (AES-256).
-The CBC mode is no longer considered the best default, as it allows easy
-bit-flipped ciphertext modification attacks and performance problems.
-
-For the passphrase hashing in plain mode, the encryption key is directly
-derived through iterative hashing from a user-provided passphrase
-(except a keyfile that is not hashed).
-
-The default hash is RIPEMD160, which is no longer the best default
-option. The exact change will be yet discussed but should include
-the possibility of using a password-based key derivation function
-instead of iterative hashing.

lib/Makemodule.am

@@ -1,11 +1,11 @@
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA += lib/libcryptsetup.pc
+pkgconfig_DATA = lib/libcryptsetup.pc
 
-lib_LTLIBRARIES += libcryptsetup.la
+lib_LTLIBRARIES = libcryptsetup.la
 
 noinst_LTLIBRARIES += libutils_io.la
 
-include_HEADERS += lib/libcryptsetup.h
+include_HEADERS = lib/libcryptsetup.h
 
 EXTRA_DIST += lib/libcryptsetup.pc.in lib/libcryptsetup.sym
 
@@ -15,7 +15,14 @@ libutils_io_la_SOURCES = \
 	lib/utils_io.c			\
 	lib/utils_io.h
 
-libcryptsetup_la_CPPFLAGS = $(AM_CPPFLAGS)
+libcryptsetup_la_CPPFLAGS = $(AM_CPPFLAGS) \
+	-I $(top_srcdir)/lib/crypto_backend	\
+	-I $(top_srcdir)/lib/luks1		\
+	-I $(top_srcdir)/lib/luks2		\
+	-I $(top_srcdir)/lib/loopaes		\
+	-I $(top_srcdir)/lib/verity		\
+	-I $(top_srcdir)/lib/tcrypt		\
+	-I $(top_srcdir)/lib/integrity
 
 libcryptsetup_la_DEPENDENCIES = libutils_io.la libcrypto_backend.la lib/libcryptsetup.sym
 
@@ -32,8 +39,6 @@ libcryptsetup_la_LIBADD = \
 	@LIBARGON2_LIBS@	\
 	@JSON_C_LIBS@		\
 	@BLKID_LIBS@		\
-	@DL_LIBS@		\
-	$(LTLIBINTL)		\
 	libcrypto_backend.la	\
 	libutils_io.la
 
@@ -43,8 +48,6 @@ libcryptsetup_la_SOURCES = \
 	lib/bitops.h			\
 	lib/nls.h			\
 	lib/libcryptsetup.h		\
-	lib/libcryptsetup_macros.h	\
-	lib/libcryptsetup_symver.h	\
 	lib/utils.c			\
 	lib/utils_benchmark.c		\
 	lib/utils_crypt.c		\
@@ -53,28 +56,27 @@ libcryptsetup_la_SOURCES = \
 	lib/utils_loop.h		\
 	lib/utils_devpath.c		\
 	lib/utils_wipe.c		\
+	lib/utils_fips.c		\
+	lib/utils_fips.h		\
 	lib/utils_device.c		\
 	lib/utils_keyring.c		\
 	lib/utils_keyring.h		\
 	lib/utils_device_locking.c	\
 	lib/utils_device_locking.h	\
 	lib/utils_pbkdf.c		\
-	lib/utils_safe_memory.c		\
-	lib/utils_storage_wrappers.c	\
-	lib/utils_storage_wrappers.h	\
 	lib/libdevmapper.c		\
 	lib/utils_dm.h			\
 	lib/volumekey.c			\
 	lib/random.c			\
 	lib/crypt_plain.c		\
+	lib/base64.h			\
+	lib/base64.c			\
 	lib/integrity/integrity.h	\
-	lib/integrity/integrity.c	\
+	lib/integrity/integrity.c       \
 	lib/loopaes/loopaes.h		\
 	lib/loopaes/loopaes.c		\
 	lib/tcrypt/tcrypt.h		\
 	lib/tcrypt/tcrypt.c		\
-	lib/keyslot_context.h		\
-	lib/keyslot_context.c		\
 	lib/luks1/af.h			\
 	lib/luks1/af.c			\
 	lib/luks1/keyencryption.c	\
@@ -86,7 +88,7 @@ libcryptsetup_la_SOURCES = \
 	lib/verity/verity.h		\
 	lib/verity/rs_encode_char.c	\
 	lib/verity/rs_decode_char.c	\
-	lib/verity/rs.h		\
+	lib/verity/rs.h                 \
 	lib/luks2/luks2_disk_metadata.c	\
 	lib/luks2/luks2_json_format.c	\
 	lib/luks2/luks2_json_metadata.c	\
@@ -95,17 +97,9 @@ libcryptsetup_la_SOURCES = \
 	lib/luks2/luks2_digest_pbkdf2.c	\
 	lib/luks2/luks2_keyslot.c	\
 	lib/luks2/luks2_keyslot_luks2.c	\
-	lib/luks2/luks2_keyslot_reenc.c	\
-	lib/luks2/luks2_reencrypt.c	\
-	lib/luks2/luks2_reencrypt_digest.c	\
-	lib/luks2/luks2_segment.c	\
 	lib/luks2/luks2_token_keyring.c	\
 	lib/luks2/luks2_token.c		\
 	lib/luks2/luks2_internal.h	\
 	lib/luks2/luks2.h		\
 	lib/utils_blkid.c		\
-	lib/utils_blkid.h		\
-	lib/bitlk/bitlk.h		\
-	lib/bitlk/bitlk.c		\
-	lib/fvault2/fvault2.h		\
-	lib/fvault2/fvault2.c
+	lib/utils_blkid.h

lib/base64.c

@@ -0,0 +1,605 @@
+/* base64.c -- Encode binary data using printable characters.
+   Copyright (C) 1999-2001, 2004-2006, 2009-2018 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Simon Josefsson.  Partially adapted from GNU MailUtils
+ * (mailbox/filter_trans.c, as of 2004-11-28).  Improved by review
+ * from Paul Eggert, Bruno Haible, and Stepan Kasal.
+ *
+ * See also RFC 4648 <https://www.ietf.org/rfc/rfc4648.txt>.
+ *
+ * Be careful with error checking.  Here is how you would typically
+ * use these functions:
+ *
+ * bool ok = base64_decode_alloc (in, inlen, &out, &outlen);
+ * if (!ok)
+ *   FAIL: input was not valid base64
+ * if (out == NULL)
+ *   FAIL: memory allocation error
+ * OK: data in OUT/OUTLEN
+ *
+ * size_t outlen = base64_encode_alloc (in, inlen, &out);
+ * if (out == NULL && outlen == 0 && inlen != 0)
+ *   FAIL: input too long
+ * if (out == NULL)
+ *   FAIL: memory allocation error
+ * OK: data in OUT/OUTLEN.
+ *
+ */
+
+#include <config.h>
+
+/* Get prototype. */
+#include "base64.h"
+
+/* Get malloc. */
+#include <stdlib.h>
+
+/* Get UCHAR_MAX. */
+#include <limits.h>
+
+#include <string.h>
+
+/* C89 compliant way to cast 'char' to 'unsigned char'. */
+static unsigned char
+to_uchar (char ch)
+{
+  return ch;
+}
+
+static const char b64c[64] =
+  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+/* Base64 encode IN array of size INLEN into OUT array. OUT needs
+   to be of length >= BASE64_LENGTH(INLEN), and INLEN needs to be
+   a multiple of 3.  */
+static void
+base64_encode_fast (const char *restrict in, size_t inlen, char *restrict out)
+{
+  while (inlen)
+    {
+      *out++ = b64c[to_uchar (in[0]) >> 2];
+      *out++ = b64c[((to_uchar (in[0]) << 4) + (to_uchar (in[1]) >> 4)) & 0x3f];
+      *out++ = b64c[((to_uchar (in[1]) << 2) + (to_uchar (in[2]) >> 6)) & 0x3f];
+      *out++ = b64c[to_uchar (in[2]) & 0x3f];
+
+      inlen -= 3;
+      in += 3;
+    }
+}
+
+/* Base64 encode IN array of size INLEN into OUT array of size OUTLEN.
+   If OUTLEN is less than BASE64_LENGTH(INLEN), write as many bytes as
+   possible.  If OUTLEN is larger than BASE64_LENGTH(INLEN), also zero
+   terminate the output buffer. */
+void
+base64_encode (const char *restrict in, size_t inlen,
+               char *restrict out, size_t outlen)
+{
+  /* Note this outlen constraint can be enforced at compile time.
+     I.E. that the output buffer is exactly large enough to hold
+     the encoded inlen bytes.  The inlen constraints (of corresponding
+     to outlen, and being a multiple of 3) can change at runtime
+     at the end of input.  However the common case when reading
+     large inputs is to have both constraints satisfied, so we depend
+     on both in base_encode_fast().  */
+  if (outlen % 4 == 0 && inlen == outlen / 4 * 3)
+    {
+      base64_encode_fast (in, inlen, out);
+      return;
+    }
+
+  while (inlen && outlen)
+    {
+      *out++ = b64c[to_uchar (in[0]) >> 2];
+      if (!--outlen)
+        break;
+      *out++ = b64c[((to_uchar (in[0]) << 4)
+                       + (--inlen ? to_uchar (in[1]) >> 4 : 0))
+                      & 0x3f];
+      if (!--outlen)
+        break;
+      *out++ =
+        (inlen
+         ? b64c[((to_uchar (in[1]) << 2)
+                   + (--inlen ? to_uchar (in[2]) >> 6 : 0))
+                  & 0x3f]
+         : '=');
+      if (!--outlen)
+        break;
+      *out++ = inlen ? b64c[to_uchar (in[2]) & 0x3f] : '=';
+      if (!--outlen)
+        break;
+      if (inlen)
+        inlen--;
+      if (inlen)
+        in += 3;
+    }
+
+  if (outlen)
+    *out = '\0';
+}
+
+/* Allocate a buffer and store zero terminated base64 encoded data
+   from array IN of size INLEN, returning BASE64_LENGTH(INLEN), i.e.,
+   the length of the encoded data, excluding the terminating zero.  On
+   return, the OUT variable will hold a pointer to newly allocated
+   memory that must be deallocated by the caller.  If output string
+   length would overflow, 0 is returned and OUT is set to NULL.  If
+   memory allocation failed, OUT is set to NULL, and the return value
+   indicates length of the requested memory block, i.e.,
+   BASE64_LENGTH(inlen) + 1. */
+size_t
+base64_encode_alloc (const char *in, size_t inlen, char **out)
+{
+  size_t outlen = 1 + BASE64_LENGTH (inlen);
+
+  /* Check for overflow in outlen computation.
+   *
+   * If there is no overflow, outlen >= inlen.
+   *
+   * If the operation (inlen + 2) overflows then it yields at most +1, so
+   * outlen is 0.
+   *
+   * If the multiplication overflows, we lose at least half of the
+   * correct value, so the result is < ((inlen + 2) / 3) * 2, which is
+   * less than (inlen + 2) * 0.66667, which is less than inlen as soon as
+   * (inlen > 4).
+   */
+  if (inlen > outlen)
+    {
+      *out = NULL;
+      return 0;
+    }
+
+  *out = malloc (outlen);
+  if (!*out)
+    return outlen;
+
+  base64_encode (in, inlen, *out, outlen);
+
+  return outlen - 1;
+}
+
+/* With this approach this file works independent of the charset used
+   (think EBCDIC).  However, it does assume that the characters in the
+   Base64 alphabet (A-Za-z0-9+/) are encoded in 0..255.  POSIX
+   1003.1-2001 require that char and unsigned char are 8-bit
+   quantities, though, taking care of that problem.  But this may be a
+   potential problem on non-POSIX C99 platforms.
+
+   IBM C V6 for AIX mishandles "#define B64(x) ...'x'...", so use "_"
+   as the formal parameter rather than "x".  */
+#define B64(_)                                  \
+  ((_) == 'A' ? 0                               \
+   : (_) == 'B' ? 1                             \
+   : (_) == 'C' ? 2                             \
+   : (_) == 'D' ? 3                             \
+   : (_) == 'E' ? 4                             \
+   : (_) == 'F' ? 5                             \
+   : (_) == 'G' ? 6                             \
+   : (_) == 'H' ? 7                             \
+   : (_) == 'I' ? 8                             \
+   : (_) == 'J' ? 9                             \
+   : (_) == 'K' ? 10                            \
+   : (_) == 'L' ? 11                            \
+   : (_) == 'M' ? 12                            \
+   : (_) == 'N' ? 13                            \
+   : (_) == 'O' ? 14                            \
+   : (_) == 'P' ? 15                            \
+   : (_) == 'Q' ? 16                            \
+   : (_) == 'R' ? 17                            \
+   : (_) == 'S' ? 18                            \
+   : (_) == 'T' ? 19                            \
+   : (_) == 'U' ? 20                            \
+   : (_) == 'V' ? 21                            \
+   : (_) == 'W' ? 22                            \
+   : (_) == 'X' ? 23                            \
+   : (_) == 'Y' ? 24                            \
+   : (_) == 'Z' ? 25                            \
+   : (_) == 'a' ? 26                            \
+   : (_) == 'b' ? 27                            \
+   : (_) == 'c' ? 28                            \
+   : (_) == 'd' ? 29                            \
+   : (_) == 'e' ? 30                            \
+   : (_) == 'f' ? 31                            \
+   : (_) == 'g' ? 32                            \
+   : (_) == 'h' ? 33                            \
+   : (_) == 'i' ? 34                            \
+   : (_) == 'j' ? 35                            \
+   : (_) == 'k' ? 36                            \
+   : (_) == 'l' ? 37                            \
+   : (_) == 'm' ? 38                            \
+   : (_) == 'n' ? 39                            \
+   : (_) == 'o' ? 40                            \
+   : (_) == 'p' ? 41                            \
+   : (_) == 'q' ? 42                            \
+   : (_) == 'r' ? 43                            \
+   : (_) == 's' ? 44                            \
+   : (_) == 't' ? 45                            \
+   : (_) == 'u' ? 46                            \
+   : (_) == 'v' ? 47                            \
+   : (_) == 'w' ? 48                            \
+   : (_) == 'x' ? 49                            \
+   : (_) == 'y' ? 50                            \
+   : (_) == 'z' ? 51                            \
+   : (_) == '0' ? 52                            \
+   : (_) == '1' ? 53                            \
+   : (_) == '2' ? 54                            \
+   : (_) == '3' ? 55                            \
+   : (_) == '4' ? 56                            \
+   : (_) == '5' ? 57                            \
+   : (_) == '6' ? 58                            \
+   : (_) == '7' ? 59                            \
+   : (_) == '8' ? 60                            \
+   : (_) == '9' ? 61                            \
+   : (_) == '+' ? 62                            \
+   : (_) == '/' ? 63                            \
+   : -1)
+
+static const signed char b64[0x100] = {
+  B64 (0), B64 (1), B64 (2), B64 (3),
+  B64 (4), B64 (5), B64 (6), B64 (7),
+  B64 (8), B64 (9), B64 (10), B64 (11),
+  B64 (12), B64 (13), B64 (14), B64 (15),
+  B64 (16), B64 (17), B64 (18), B64 (19),
+  B64 (20), B64 (21), B64 (22), B64 (23),
+  B64 (24), B64 (25), B64 (26), B64 (27),
+  B64 (28), B64 (29), B64 (30), B64 (31),
+  B64 (32), B64 (33), B64 (34), B64 (35),
+  B64 (36), B64 (37), B64 (38), B64 (39),
+  B64 (40), B64 (41), B64 (42), B64 (43),
+  B64 (44), B64 (45), B64 (46), B64 (47),
+  B64 (48), B64 (49), B64 (50), B64 (51),
+  B64 (52), B64 (53), B64 (54), B64 (55),
+  B64 (56), B64 (57), B64 (58), B64 (59),
+  B64 (60), B64 (61), B64 (62), B64 (63),
+  B64 (64), B64 (65), B64 (66), B64 (67),
+  B64 (68), B64 (69), B64 (70), B64 (71),
+  B64 (72), B64 (73), B64 (74), B64 (75),
+  B64 (76), B64 (77), B64 (78), B64 (79),
+  B64 (80), B64 (81), B64 (82), B64 (83),
+  B64 (84), B64 (85), B64 (86), B64 (87),
+  B64 (88), B64 (89), B64 (90), B64 (91),
+  B64 (92), B64 (93), B64 (94), B64 (95),
+  B64 (96), B64 (97), B64 (98), B64 (99),
+  B64 (100), B64 (101), B64 (102), B64 (103),
+  B64 (104), B64 (105), B64 (106), B64 (107),
+  B64 (108), B64 (109), B64 (110), B64 (111),
+  B64 (112), B64 (113), B64 (114), B64 (115),
+  B64 (116), B64 (117), B64 (118), B64 (119),
+  B64 (120), B64 (121), B64 (122), B64 (123),
+  B64 (124), B64 (125), B64 (126), B64 (127),
+  B64 (128), B64 (129), B64 (130), B64 (131),
+  B64 (132), B64 (133), B64 (134), B64 (135),
+  B64 (136), B64 (137), B64 (138), B64 (139),
+  B64 (140), B64 (141), B64 (142), B64 (143),
+  B64 (144), B64 (145), B64 (146), B64 (147),
+  B64 (148), B64 (149), B64 (150), B64 (151),
+  B64 (152), B64 (153), B64 (154), B64 (155),
+  B64 (156), B64 (157), B64 (158), B64 (159),
+  B64 (160), B64 (161), B64 (162), B64 (163),
+  B64 (164), B64 (165), B64 (166), B64 (167),
+  B64 (168), B64 (169), B64 (170), B64 (171),
+  B64 (172), B64 (173), B64 (174), B64 (175),
+  B64 (176), B64 (177), B64 (178), B64 (179),
+  B64 (180), B64 (181), B64 (182), B64 (183),
+  B64 (184), B64 (185), B64 (186), B64 (187),
+  B64 (188), B64 (189), B64 (190), B64 (191),
+  B64 (192), B64 (193), B64 (194), B64 (195),
+  B64 (196), B64 (197), B64 (198), B64 (199),
+  B64 (200), B64 (201), B64 (202), B64 (203),
+  B64 (204), B64 (205), B64 (206), B64 (207),
+  B64 (208), B64 (209), B64 (210), B64 (211),
+  B64 (212), B64 (213), B64 (214), B64 (215),
+  B64 (216), B64 (217), B64 (218), B64 (219),
+  B64 (220), B64 (221), B64 (222), B64 (223),
+  B64 (224), B64 (225), B64 (226), B64 (227),
+  B64 (228), B64 (229), B64 (230), B64 (231),
+  B64 (232), B64 (233), B64 (234), B64 (235),
+  B64 (236), B64 (237), B64 (238), B64 (239),
+  B64 (240), B64 (241), B64 (242), B64 (243),
+  B64 (244), B64 (245), B64 (246), B64 (247),
+  B64 (248), B64 (249), B64 (250), B64 (251),
+  B64 (252), B64 (253), B64 (254), B64 (255)
+};
+
+#if UCHAR_MAX == 255
+# define uchar_in_range(c) true
+#else
+# define uchar_in_range(c) ((c) <= 255)
+#endif
+
+/* Return true if CH is a character from the Base64 alphabet, and
+   false otherwise.  Note that '=' is padding and not considered to be
+   part of the alphabet.  */
+bool
+isbase64 (char ch)
+{
+  return uchar_in_range (to_uchar (ch)) && 0 <= b64[to_uchar (ch)];
+}
+
+/* Initialize decode-context buffer, CTX.  */
+void
+base64_decode_ctx_init (struct base64_decode_context *ctx)
+{
+  ctx->i = 0;
+}
+
+/* If CTX->i is 0 or 4, there are four or more bytes in [*IN..IN_END), and
+   none of those four is a newline, then return *IN.  Otherwise, copy up to
+   4 - CTX->i non-newline bytes from that range into CTX->buf, starting at
+   index CTX->i and setting CTX->i to reflect the number of bytes copied,
+   and return CTX->buf.  In either case, advance *IN to point to the byte
+   after the last one processed, and set *N_NON_NEWLINE to the number of
+   verified non-newline bytes accessible through the returned pointer.  */
+static const char *
+get_4 (struct base64_decode_context *ctx,
+       char const *restrict *in, char const *restrict in_end,
+       size_t *n_non_newline)
+{
+  if (ctx->i == 4)
+    ctx->i = 0;
+
+  if (ctx->i == 0)
+    {
+      char const *t = *in;
+      if (4 <= in_end - *in && memchr (t, '\n', 4) == NULL)
+        {
+          /* This is the common case: no newline.  */
+          *in += 4;
+          *n_non_newline = 4;
+          return (const char *) t;
+        }
+    }
+
+  {
+    /* Copy non-newline bytes into BUF.  */
+    char const *p = *in;
+    while (p < in_end)
+      {
+        char c = *p++;
+        if (c != '\n')
+          {
+            ctx->buf[ctx->i++] = c;
+            if (ctx->i == 4)
+              break;
+          }
+      }
+
+    *in = p;
+    *n_non_newline = ctx->i;
+    return ctx->buf;
+  }
+}
+
+#define return_false                            \
+  do                                            \
+    {                                           \
+      *outp = out;                              \
+      return false;                             \
+    }                                           \
+  while (false)
+
+/* Decode up to four bytes of base64-encoded data, IN, of length INLEN
+   into the output buffer, *OUT, of size *OUTLEN bytes.  Return true if
+   decoding is successful, false otherwise.  If *OUTLEN is too small,
+   as many bytes as possible are written to *OUT.  On return, advance
+   *OUT to point to the byte after the last one written, and decrement
+   *OUTLEN to reflect the number of bytes remaining in *OUT.  */
+static bool
+decode_4 (char const *restrict in, size_t inlen,
+          char *restrict *outp, size_t *outleft)
+{
+  char *out = *outp;
+  if (inlen < 2)
+    return false;
+
+  if (!isbase64 (in[0]) || !isbase64 (in[1]))
+    return false;
+
+  if (*outleft)
+    {
+      *out++ = ((b64[to_uchar (in[0])] << 2)
+                | (b64[to_uchar (in[1])] >> 4));
+      --*outleft;
+    }
+
+  if (inlen == 2)
+    return_false;
+
+  if (in[2] == '=')
+    {
+      if (inlen != 4)
+        return_false;
+
+      if (in[3] != '=')
+        return_false;
+    }
+  else
+    {
+      if (!isbase64 (in[2]))
+        return_false;
+
+      if (*outleft)
+        {
+          *out++ = (((b64[to_uchar (in[1])] << 4) & 0xf0)
+                    | (b64[to_uchar (in[2])] >> 2));
+          --*outleft;
+        }
+
+      if (inlen == 3)
+        return_false;
+
+      if (in[3] == '=')
+        {
+          if (inlen != 4)
+            return_false;
+        }
+      else
+        {
+          if (!isbase64 (in[3]))
+            return_false;
+
+          if (*outleft)
+            {
+              *out++ = (((b64[to_uchar (in[2])] << 6) & 0xc0)
+                        | b64[to_uchar (in[3])]);
+              --*outleft;
+            }
+        }
+    }
+
+  *outp = out;
+  return true;
+}
+
+/* Decode base64-encoded input array IN of length INLEN to output array
+   OUT that can hold *OUTLEN bytes.  The input data may be interspersed
+   with newlines.  Return true if decoding was successful, i.e. if the
+   input was valid base64 data, false otherwise.  If *OUTLEN is too
+   small, as many bytes as possible will be written to OUT.  On return,
+   *OUTLEN holds the length of decoded bytes in OUT.  Note that as soon
+   as any non-alphabet, non-newline character is encountered, decoding
+   is stopped and false is returned.  If INLEN is zero, then process
+   only whatever data is stored in CTX.
+
+   Initially, CTX must have been initialized via base64_decode_ctx_init.
+   Subsequent calls to this function must reuse whatever state is recorded
+   in that buffer.  It is necessary for when a quadruple of base64 input
+   bytes spans two input buffers.
+
+   If CTX is NULL then newlines are treated as garbage and the input
+   buffer is processed as a unit.  */
+
+bool
+base64_decode_ctx (struct base64_decode_context *ctx,
+                   const char *restrict in, size_t inlen,
+                   char *restrict out, size_t *outlen)
+{
+  size_t outleft = *outlen;
+  bool ignore_newlines = ctx != NULL;
+  bool flush_ctx = false;
+  unsigned int ctx_i = 0;
+
+  if (ignore_newlines)
+    {
+      ctx_i = ctx->i;
+      flush_ctx = inlen == 0;
+    }
+
+
+  while (true)
+    {
+      size_t outleft_save = outleft;
+      if (ctx_i == 0 && !flush_ctx)
+        {
+          while (true)
+            {
+              /* Save a copy of outleft, in case we need to re-parse this
+                 block of four bytes.  */
+              outleft_save = outleft;
+              if (!decode_4 (in, inlen, &out, &outleft))
+                break;
+
+              in += 4;
+              inlen -= 4;
+            }
+        }
+
+      if (inlen == 0 && !flush_ctx)
+        break;
+
+      /* Handle the common case of 72-byte wrapped lines.
+         This also handles any other multiple-of-4-byte wrapping.  */
+      if (inlen && *in == '\n' && ignore_newlines)
+        {
+          ++in;
+          --inlen;
+          continue;
+        }
+
+      /* Restore OUT and OUTLEFT.  */
+      out -= outleft_save - outleft;
+      outleft = outleft_save;
+
+      {
+        char const *in_end = in + inlen;
+        char const *non_nl;
+
+        if (ignore_newlines)
+          non_nl = get_4 (ctx, &in, in_end, &inlen);
+        else
+          non_nl = in;  /* Might have nl in this case. */
+
+        /* If the input is empty or consists solely of newlines (0 non-newlines),
+           then we're done.  Likewise if there are fewer than 4 bytes when not
+           flushing context and not treating newlines as garbage.  */
+        if (inlen == 0 || (inlen < 4 && !flush_ctx && ignore_newlines))
+          {
+            inlen = 0;
+            break;
+          }
+        if (!decode_4 (non_nl, inlen, &out, &outleft))
+          break;
+
+        inlen = in_end - in;
+      }
+    }
+
+  *outlen -= outleft;
+
+  return inlen == 0;
+}
+
+/* Allocate an output buffer in *OUT, and decode the base64 encoded
+   data stored in IN of size INLEN to the *OUT buffer.  On return, the
+   size of the decoded data is stored in *OUTLEN.  OUTLEN may be NULL,
+   if the caller is not interested in the decoded length.  *OUT may be
+   NULL to indicate an out of memory error, in which case *OUTLEN
+   contains the size of the memory block needed.  The function returns
+   true on successful decoding and memory allocation errors.  (Use the
+   *OUT and *OUTLEN parameters to differentiate between successful
+   decoding and memory error.)  The function returns false if the
+   input was invalid, in which case *OUT is NULL and *OUTLEN is
+   undefined. */
+bool
+base64_decode_alloc_ctx (struct base64_decode_context *ctx,
+                         const char *in, size_t inlen, char **out,
+                         size_t *outlen)
+{
+  /* This may allocate a few bytes too many, depending on input,
+     but it's not worth the extra CPU time to compute the exact size.
+     The exact size is 3 * (inlen + (ctx ? ctx->i : 0)) / 4, minus 1 if the
+     input ends with "=" and minus another 1 if the input ends with "==".
+     Dividing before multiplying avoids the possibility of overflow.  */
+  size_t needlen = 3 * (inlen / 4) + 3;
+
+  *out = malloc (needlen);
+  if (!*out)
+    return true;
+
+  if (!base64_decode_ctx (ctx, in, inlen, *out, &needlen))
+    {
+      free (*out);
+      *out = NULL;
+      return false;
+    }
+
+  if (outlen)
+    *outlen = needlen;
+
+  return true;
+}

lib/base64.h

@@ -0,0 +1,68 @@
+/* base64.h -- Encode binary data using printable characters.
+   Copyright (C) 2004-2006, 2009-2018 Free Software Foundation, Inc.
+   Written by Simon Josefsson.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
+
+#ifndef BASE64_H
+# define BASE64_H
+
+/* Get size_t. */
+# include <stddef.h>
+
+/* Get bool. */
+# include <stdbool.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+/* This uses that the expression (n+(k-1))/k means the smallest
+   integer >= n/k, i.e., the ceiling of n/k.  */
+# define BASE64_LENGTH(inlen) ((((inlen) + 2) / 3) * 4)
+
+struct base64_decode_context
+{
+  unsigned int i;
+  char buf[4];
+};
+
+extern bool isbase64 (char ch) __attribute__ ((__const__));
+
+extern void base64_encode (const char *restrict in, size_t inlen,
+                           char *restrict out, size_t outlen);
+
+extern size_t base64_encode_alloc (const char *in, size_t inlen, char **out);
+
+extern void base64_decode_ctx_init (struct base64_decode_context *ctx);
+
+extern bool base64_decode_ctx (struct base64_decode_context *ctx,
+                               const char *restrict in, size_t inlen,
+                               char *restrict out, size_t *outlen);
+
+extern bool base64_decode_alloc_ctx (struct base64_decode_context *ctx,
+                                     const char *in, size_t inlen,
+                                     char **out, size_t *outlen);
+
+#define base64_decode(in, inlen, out, outlen) \
+        base64_decode_ctx (NULL, in, inlen, out, outlen)
+
+#define base64_decode_alloc(in, inlen, out, outlen) \
+        base64_decode_alloc_ctx (NULL, in, inlen, out, outlen)
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif /* BASE64_H */

lib/bitlk/bitlk.h

@@ -1,148 +0,0 @@
-/*
- * BITLK (BitLocker-compatible) header definition
- *
- * Copyright (C) 2019-2022 Red Hat, Inc. All rights reserved.
- * Copyright (C) 2019-2022 Milan Broz
- * Copyright (C) 2019-2022 Vojtech Trefny
- *
- * This file is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This file is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef _CRYPTSETUP_BITLK_H
-#define _CRYPTSETUP_BITLK_H
-
-#include <stddef.h>
-#include <stdint.h>
-#include <stdbool.h>
-
-struct crypt_device;
-struct device;
-struct volume_key;
-
-#define BITLK_NONCE_SIZE 12
-#define BITLK_SALT_SIZE 16
-#define BITLK_VMK_MAC_TAG_SIZE 16
-
-#define BITLK_STATE_NORMAL 0x0004
-
-typedef enum {
-	BITLK_ENCRYPTION_TYPE_NORMAL = 0,
-	BITLK_ENCRYPTION_TYPE_EOW,
-	BITLK_ENCRYPTION_TYPE_UNKNOWN,
-} BITLKEncryptionType;
-
-typedef enum {
-	BITLK_PROTECTION_CLEAR_KEY = 0,
-	BITLK_PROTECTION_TPM,
-	BITLK_PROTECTION_STARTUP_KEY,
-	BITLK_PROTECTION_TPM_PIN,
-	BITLK_PROTECTION_RECOVERY_PASSPHRASE,
-	BITLK_PROTECTION_PASSPHRASE,
-	BITLK_PROTECTION_SMART_CARD,
-	BITLK_PROTECTION_UNKNOWN,
-} BITLKVMKProtection;
-
-typedef enum {
-	BITLK_ENTRY_TYPE_PROPERTY = 0x0000,
-	BITLK_ENTRY_TYPE_VMK = 0x0002,
-	BITLK_ENTRY_TYPE_FVEK = 0x0003,
-	BITLK_ENTRY_TYPE_STARTUP_KEY = 0x0006,
-	BITLK_ENTRY_TYPE_DESCRIPTION = 0x0007,
-	BITLK_ENTRY_TYPE_VOLUME_HEADER = 0x000f,
-	BITLK_ENTRY_TYPE_VOLUME_GUID = 0x0019,
-} BITLKFVEEntryType;
-
-typedef enum {
-	BITLK_ENTRY_VALUE_ERASED = 0x0000,
-	BITLK_ENTRY_VALUE_KEY = 0x0001,
-	BITLK_ENTRY_VALUE_STRING = 0x0002,
-	BITLK_ENTRY_VALUE_STRETCH_KEY = 0x0003,
-	BITLK_ENTRY_VALUE_USE_KEY = 0x0004,
-	BITLK_ENTRY_VALUE_ENCRYPTED_KEY = 0x0005,
-	BITLK_ENTRY_VALUE_TPM_KEY = 0x0006,
-	BITLK_ENTRY_VALUE_VALIDATION = 0x0007,
-	BITLK_ENTRY_VALUE_VMK = 0x0008,
-	BITLK_ENTRY_VALUE_EXTERNAL_KEY = 0x0009,
-	BITLK_ENTRY_VALUE_OFFSET_SIZE = 0x000f,
-	BITLK_ENTRY_VALUE_RECOVERY_TIME = 0x015,
-	BITLK_ENTRY_VALUE_GUID = 0x0017,
-} BITLKFVEEntryValue;
-
-struct bitlk_vmk {
-	char *guid;
-	char *name;
-	BITLKVMKProtection protection;
-	uint8_t salt[BITLK_SALT_SIZE];
-	uint8_t mac_tag[BITLK_VMK_MAC_TAG_SIZE];
-	uint8_t nonce[BITLK_NONCE_SIZE];
-	struct volume_key *vk;
-	struct bitlk_vmk *next;
-};
-
-struct bitlk_fvek {
-	uint8_t mac_tag[BITLK_VMK_MAC_TAG_SIZE];
-	uint8_t nonce[BITLK_NONCE_SIZE];
-	struct volume_key *vk;
-};
-
-struct bitlk_metadata {
-	uint16_t sector_size;
-	uint64_t volume_size;
-	bool togo;
-	bool state;
-	BITLKEncryptionType type;
-	const char *cipher;
-	const char *cipher_mode;
-	uint16_t key_size;
-	char *guid;
-	uint64_t creation_time;
-	char *description;
-	uint64_t metadata_offset[3];
-	uint32_t metadata_version;
-	uint64_t volume_header_offset;
-	uint64_t volume_header_size;
-	struct bitlk_vmk *vmks;
-	struct bitlk_fvek *fvek;
-};
-
-int BITLK_read_sb(struct crypt_device *cd, struct bitlk_metadata *params);
-
-int BITLK_dump(struct crypt_device *cd, struct device *device, struct bitlk_metadata *params);
-
-int BITLK_get_volume_key(struct crypt_device *cd,
-			 const char *password,
-			 size_t passwordLen,
-			 const struct bitlk_metadata *params,
-			 struct volume_key **open_fvek_key);
-
-int BITLK_activate_by_passphrase(struct crypt_device *cd,
-				 const char *name,
-				 const char *password,
-				 size_t passwordLen,
-				 const struct bitlk_metadata *params,
-				 uint32_t flags);
-
-int BITLK_activate_by_volume_key(struct crypt_device *cd,
-				 const char *name,
-				 const char *volume_key,
-				 size_t volume_key_size,
-				 const struct bitlk_metadata *params,
-				 uint32_t flags);
-
-void BITLK_bitlk_fvek_free(struct bitlk_fvek *fvek);
-void BITLK_bitlk_vmk_free(struct bitlk_vmk *vmk);
-void BITLK_bitlk_metadata_free(struct bitlk_metadata *params);
-
-#endif

lib/crypt_plain.c

@@ -1,9 +1,9 @@
 /*
  * cryptsetup plain device helper functions
  *
- * Copyright (C) 2004 Jana Saout <jana@saout.de>
- * Copyright (C) 2010-2022 Red Hat, Inc. All rights reserved.
- * Copyright (C) 2010-2022 Milan Broz
+ * Copyright (C) 2004, Jana Saout <jana@saout.de>
+ * Copyright (C) 2010-2018 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2010-2018, Milan Broz
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -64,7 +64,7 @@ static int hash(const char *hash_name, size_t key_size, char *key,
 
 #define PLAIN_HASH_LEN_MAX 256
 
-int crypt_plain_hash(struct crypt_device *cd,
+int crypt_plain_hash(struct crypt_device *ctx __attribute__((unused)),
 		     const char *hash_name,
 		     char *key, size_t key_size,
 		     const char *passphrase, size_t passphrase_size)
@@ -73,7 +73,7 @@ int crypt_plain_hash(struct crypt_device *cd,
 	size_t hash_size, pad_size;
 	int r;
 
-	log_dbg(cd, "Plain: hashing passphrase using %s.", hash_name);
+	log_dbg("Plain: hashing passphrase using %s.", hash_name);
 
 	if (strlen(hash_name) >= PLAIN_HASH_LEN_MAX)
 		return -EINVAL;
@@ -85,11 +85,11 @@ int crypt_plain_hash(struct crypt_device *cd,
 		*s = '\0';
 		s++;
 		if (!*s || sscanf(s, "%zd", &hash_size) != 1) {
-			log_dbg(cd, "Hash length is not a number");
+			log_dbg("Hash length is not a number");
 			return -EINVAL;
 		}
 		if (hash_size > key_size) {
-			log_dbg(cd, "Hash length %zd > key length %zd",
+			log_dbg("Hash length %zd > key length %zd",
 				hash_size, key_size);
 			return -EINVAL;
 		}
@@ -102,7 +102,7 @@ int crypt_plain_hash(struct crypt_device *cd,
 	/* No hash, copy passphrase directly */
 	if (!strcmp(hash_name_buf, "plain")) {
 		if (passphrase_size < hash_size) {
-			log_dbg(cd, "Too short plain passphrase.");
+			log_dbg("Too short plain passphrase.");
 			return -EINVAL;
 		}
 		memcpy(key, passphrase, hash_size);

lib/crypto_backend/Makemodule.am

@@ -4,16 +4,12 @@ libcrypto_backend_la_CFLAGS = $(AM_CFLAGS) @CRYPTO_CFLAGS@
 
 libcrypto_backend_la_SOURCES = \
 	lib/crypto_backend/crypto_backend.h \
-	lib/crypto_backend/crypto_backend_internal.h \
 	lib/crypto_backend/crypto_cipher_kernel.c \
 	lib/crypto_backend/crypto_storage.c \
 	lib/crypto_backend/pbkdf_check.c \
 	lib/crypto_backend/crc32.c \
-	lib/crypto_backend/base64.c \
-	lib/crypto_backend/utf8.c \
 	lib/crypto_backend/argon2_generic.c \
-	lib/crypto_backend/cipher_generic.c \
-	lib/crypto_backend/cipher_check.c
+	lib/crypto_backend/cipher_generic.c
 
 if CRYPTO_BACKEND_GCRYPT
 libcrypto_backend_la_SOURCES += lib/crypto_backend/crypto_gcrypt.c

lib/crypto_backend/argon2/argon2.c

@@ -8,8 +8,8 @@
  * License/Waiver or the Apache Public License 2.0, at your option. The terms of
  * these licenses can be found at:
  *
- * - CC0 1.0 Universal : https://creativecommons.org/publicdomain/zero/1.0
- * - Apache 2.0        : https://www.apache.org/licenses/LICENSE-2.0
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
  *
  * You should have received a copy of both of these licenses along with this
  * software. If not, they may be obtained at the above URLs.
@@ -274,7 +274,6 @@ int argon2_verify(const char *encoded, const void *pwd, const size_t pwdlen,
     }
 
     /* No field can be longer than the encoded length */
-    /* coverity[strlen_assign] */
     max_field_len = (uint32_t)encoded_len;
 
     ctx.saltlen = max_field_len;
@@ -450,8 +449,6 @@ const char *argon2_error_message(int error_code) {
 
 size_t argon2_encodedlen(uint32_t t_cost, uint32_t m_cost, uint32_t parallelism,
                          uint32_t saltlen, uint32_t hashlen, argon2_type type) {
-  if (!argon2_type2string(type, 0))
-      return 0;
   return strlen("$$v=$m=,t=,p=$$") + strlen(argon2_type2string(type, 0)) +
          numlen(t_cost) + numlen(m_cost) + numlen(parallelism) +
          b64len(saltlen) + b64len(hashlen) + numlen(ARGON2_VERSION_NUMBER) + 1;

lib/crypto_backend/argon2/argon2.h

@@ -8,8 +8,8 @@
  * License/Waiver or the Apache Public License 2.0, at your option. The terms of
  * these licenses can be found at:
  *
- * - CC0 1.0 Universal : https://creativecommons.org/publicdomain/zero/1.0
- * - Apache 2.0        : https://www.apache.org/licenses/LICENSE-2.0
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
  *
  * You should have received a copy of both of these licenses along with this
  * software. If not, they may be obtained at the above URLs.

lib/crypto_backend/argon2/blake2/blake2-impl.h

@@ -8,8 +8,8 @@
  * License/Waiver or the Apache Public License 2.0, at your option. The terms of
  * these licenses can be found at:
  *
- * - CC0 1.0 Universal : https://creativecommons.org/publicdomain/zero/1.0
- * - Apache 2.0        : https://www.apache.org/licenses/LICENSE-2.0
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
  *
  * You should have received a copy of both of these licenses along with this
  * software. If not, they may be obtained at the above URLs.

lib/crypto_backend/argon2/blake2/blake2.h

@@ -8,8 +8,8 @@
  * License/Waiver or the Apache Public License 2.0, at your option. The terms of
  * these licenses can be found at:
  *
- * - CC0 1.0 Universal : https://creativecommons.org/publicdomain/zero/1.0
- * - Apache 2.0        : https://www.apache.org/licenses/LICENSE-2.0
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
  *
  * You should have received a copy of both of these licenses along with this
  * software. If not, they may be obtained at the above URLs.

lib/crypto_backend/argon2/blake2/blake2b.c

@@ -8,8 +8,8 @@
  * License/Waiver or the Apache Public License 2.0, at your option. The terms of
  * these licenses can be found at:
  *
- * - CC0 1.0 Universal : https://creativecommons.org/publicdomain/zero/1.0
- * - Apache 2.0        : https://www.apache.org/licenses/LICENSE-2.0
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
  *
  * You should have received a copy of both of these licenses along with this
  * software. If not, they may be obtained at the above URLs.

lib/crypto_backend/argon2/blake2/blamka-round-opt.h

@@ -8,8 +8,8 @@
  * License/Waiver or the Apache Public License 2.0, at your option. The terms of
  * these licenses can be found at:
  *
- * - CC0 1.0 Universal : https://creativecommons.org/publicdomain/zero/1.0
- * - Apache 2.0        : https://www.apache.org/licenses/LICENSE-2.0
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
  *
  * You should have received a copy of both of these licenses along with this
  * software. If not, they may be obtained at the above URLs.

lib/crypto_backend/argon2/blake2/blamka-round-ref.h

@@ -8,8 +8,8 @@
  * License/Waiver or the Apache Public License 2.0, at your option. The terms of
  * these licenses can be found at:
  *
- * - CC0 1.0 Universal : https://creativecommons.org/publicdomain/zero/1.0
- * - Apache 2.0        : https://www.apache.org/licenses/LICENSE-2.0
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
  *
  * You should have received a copy of both of these licenses along with this
  * software. If not, they may be obtained at the above URLs.

lib/crypto_backend/argon2/core.c

@@ -8,8 +8,8 @@
  * License/Waiver or the Apache Public License 2.0, at your option. The terms of
  * these licenses can be found at:
  *
- * - CC0 1.0 Universal : https://creativecommons.org/publicdomain/zero/1.0
- * - Apache 2.0        : https://www.apache.org/licenses/LICENSE-2.0
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
  *
  * You should have received a copy of both of these licenses along with this
  * software. If not, they may be obtained at the above URLs.
@@ -120,24 +120,18 @@ void free_memory(const argon2_context *context, uint8_t *memory,
     }
 }
 
-#if defined(_MSC_VER) && VC_GE_2005(_MSC_VER)
-void secure_wipe_memory(void *v, size_t n) {
-    SecureZeroMemory(v, n);
-}
-#elif defined memset_s
-void secure_wipe_memory(void *v, size_t n) {
-    memset_s(v, n, 0, n);
-}
-#elif defined(HAVE_EXPLICIT_BZERO)
-void secure_wipe_memory(void *v, size_t n) {
-    explicit_bzero(v, n);
-}
-#else
 void NOT_OPTIMIZED secure_wipe_memory(void *v, size_t n) {
+#if defined(_MSC_VER) && VC_GE_2005(_MSC_VER)
+    SecureZeroMemory(v, n);
+#elif defined memset_s
+    memset_s(v, n, 0, n);
+#elif defined(__OpenBSD__)
+    explicit_bzero(v, n);
+#else
     static void *(*const volatile memset_sec)(void *, int, size_t) = &memset;
     memset_sec(v, 0, n);
-}
 #endif
+}
 
 /* Memory clear flag defaults to true. */
 int FLAG_clear_internal_memory = 1;
@@ -279,6 +273,7 @@ static void *fill_segment_thr(void *thread_data)
 {
     argon2_thread_data *my_data = thread_data;
     fill_segment(my_data->instance_ptr, my_data->pos);
+    argon2_thread_exit();
     return 0;
 }
 
@@ -304,7 +299,7 @@ static int fill_memory_blocks_mt(argon2_instance_t *instance) {
 
     for (r = 0; r < instance->passes; ++r) {
         for (s = 0; s < ARGON2_SYNC_POINTS; ++s) {
-            uint32_t l, ll;
+            uint32_t l;
 
             /* 2. Calling threads */
             for (l = 0; l < instance->lanes; ++l) {
@@ -329,9 +324,6 @@ static int fill_memory_blocks_mt(argon2_instance_t *instance) {
                        sizeof(argon2_position_t));
                 if (argon2_thread_create(&thread[l], &fill_segment_thr,
                                          (void *)&thr_data[l])) {
-                    /* Wait for already running threads */
-                    for (ll = 0; ll < l; ++ll)
-                        argon2_thread_join(thread[ll]);
                     rc = ARGON2_THREAD_FAIL;
                     goto fail;
                 }

lib/crypto_backend/argon2/core.h

@@ -8,8 +8,8 @@
  * License/Waiver or the Apache Public License 2.0, at your option. The terms of
  * these licenses can be found at:
  *
- * - CC0 1.0 Universal : https://creativecommons.org/publicdomain/zero/1.0
- * - Apache 2.0        : https://www.apache.org/licenses/LICENSE-2.0
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
  *
  * You should have received a copy of both of these licenses along with this
  * software. If not, they may be obtained at the above URLs.

lib/crypto_backend/argon2/encoding.c

@@ -8,8 +8,8 @@
  * License/Waiver or the Apache Public License 2.0, at your option. The terms of
  * these licenses can be found at:
  *
- * - CC0 1.0 Universal : https://creativecommons.org/publicdomain/zero/1.0
- * - Apache 2.0        : https://www.apache.org/licenses/LICENSE-2.0
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
  *
  * You should have received a copy of both of these licenses along with this
  * software. If not, they may be obtained at the above URLs.

lib/crypto_backend/argon2/encoding.h

@@ -8,8 +8,8 @@
  * License/Waiver or the Apache Public License 2.0, at your option. The terms of
  * these licenses can be found at:
  *
- * - CC0 1.0 Universal : https://creativecommons.org/publicdomain/zero/1.0
- * - Apache 2.0        : https://www.apache.org/licenses/LICENSE-2.0
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
  *
  * You should have received a copy of both of these licenses along with this
  * software. If not, they may be obtained at the above URLs.

lib/crypto_backend/argon2/opt.c

@@ -8,8 +8,8 @@
  * License/Waiver or the Apache Public License 2.0, at your option. The terms of
  * these licenses can be found at:
  *
- * - CC0 1.0 Universal : https://creativecommons.org/publicdomain/zero/1.0
- * - Apache 2.0        : https://www.apache.org/licenses/LICENSE-2.0
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
  *
  * You should have received a copy of both of these licenses along with this
  * software. If not, they may be obtained at the above URLs.

lib/crypto_backend/argon2/ref.c

@@ -8,8 +8,8 @@
  * License/Waiver or the Apache Public License 2.0, at your option. The terms of
  * these licenses can be found at:
  *
- * - CC0 1.0 Universal : https://creativecommons.org/publicdomain/zero/1.0
- * - Apache 2.0        : https://www.apache.org/licenses/LICENSE-2.0
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
  *
  * You should have received a copy of both of these licenses along with this
  * software. If not, they may be obtained at the above URLs.

lib/crypto_backend/argon2/thread.c

@@ -8,8 +8,8 @@
  * License/Waiver or the Apache Public License 2.0, at your option. The terms of
  * these licenses can be found at:
  *
- * - CC0 1.0 Universal : https://creativecommons.org/publicdomain/zero/1.0
- * - Apache 2.0        : https://www.apache.org/licenses/LICENSE-2.0
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
  *
  * You should have received a copy of both of these licenses along with this
  * software. If not, they may be obtained at the above URLs.
@@ -46,4 +46,12 @@ int argon2_thread_join(argon2_thread_handle_t handle) {
 #endif
 }
 
+void argon2_thread_exit(void) {
+#if defined(_WIN32)
+    _endthreadex(0);
+#else
+    pthread_exit(NULL);
+#endif
+}
+
 #endif /* ARGON2_NO_THREADS */

lib/crypto_backend/argon2/thread.h

@@ -8,8 +8,8 @@
  * License/Waiver or the Apache Public License 2.0, at your option. The terms of
  * these licenses can be found at:
  *
- * - CC0 1.0 Universal : https://creativecommons.org/publicdomain/zero/1.0
- * - Apache 2.0        : https://www.apache.org/licenses/LICENSE-2.0
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
  *
  * You should have received a copy of both of these licenses along with this
  * software. If not, they may be obtained at the above URLs.
@@ -58,5 +58,10 @@ int argon2_thread_create(argon2_thread_handle_t *handle,
 */
 int argon2_thread_join(argon2_thread_handle_t handle);
 
+/* Terminate the current thread. Must be run inside a thread created by
+ * argon2_thread_create.
+*/
+void argon2_thread_exit(void);
+
 #endif /* ARGON2_NO_THREADS */
 #endif

lib/crypto_backend/argon2_generic.c

@@ -1,8 +1,8 @@
 /*
  * Argon2 PBKDF2 library wrapper
  *
- * Copyright (C) 2016-2022 Red Hat, Inc. All rights reserved.
- * Copyright (C) 2016-2022 Milan Broz
+ * Copyright (C) 2016-2018, Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2016-2018, Milan Broz
  *
  * This file is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
  */
 
 #include <errno.h>
-#include "crypto_backend_internal.h"
+#include "crypto_backend.h"
 #if HAVE_ARGON2_H
 #include <argon2.h>
 #else
@@ -77,3 +77,117 @@ int argon2(const char *type, const char *password, size_t password_length,
 	return r;
 #endif
 }
+
+#if 0
+#include <stdio.h>
+
+struct test_vector {
+	argon2_type type;
+	unsigned int memory;
+	unsigned int iterations;
+	unsigned int parallelism;
+	const char *password;
+	unsigned int password_length;
+	const char *salt;
+	unsigned int salt_length;
+	const char *key;
+	unsigned int key_length;
+	const char *ad;
+	unsigned int ad_length;
+	const char *output;
+	unsigned int output_length;
+};
+
+struct test_vector test_vectors[] = {
+	/* Argon2 RFC */
+	{
+		Argon2_i, 32, 3, 4,
+		"\x01\x01\x01\x01\x01\x01\x01\x01"
+		"\x01\x01\x01\x01\x01\x01\x01\x01"
+		"\x01\x01\x01\x01\x01\x01\x01\x01"
+		"\x01\x01\x01\x01\x01\x01\x01\x01", 32,
+		"\x02\x02\x02\x02\x02\x02\x02\x02"
+		"\x02\x02\x02\x02\x02\x02\x02\x02", 16,
+		"\x03\x03\x03\x03\x03\x03\x03\x03", 8,
+		"\x04\x04\x04\x04\x04\x04\x04\x04"
+		"\x04\x04\x04\x04", 12,
+		"\xc8\x14\xd9\xd1\xdc\x7f\x37\xaa"
+		"\x13\xf0\xd7\x7f\x24\x94\xbd\xa1"
+		"\xc8\xde\x6b\x01\x6d\xd3\x88\xd2"
+		"\x99\x52\xa4\xc4\x67\x2b\x6c\xe8", 32
+	},
+	{
+		Argon2_id, 32, 3, 4,
+		"\x01\x01\x01\x01\x01\x01\x01\x01"
+		"\x01\x01\x01\x01\x01\x01\x01\x01"
+		"\x01\x01\x01\x01\x01\x01\x01\x01"
+		"\x01\x01\x01\x01\x01\x01\x01\x01", 32,
+		"\x02\x02\x02\x02\x02\x02\x02\x02"
+		"\x02\x02\x02\x02\x02\x02\x02\x02", 16,
+		"\x03\x03\x03\x03\x03\x03\x03\x03", 8,
+		"\x04\x04\x04\x04\x04\x04\x04\x04"
+		"\x04\x04\x04\x04", 12,
+		"\x0d\x64\x0d\xf5\x8d\x78\x76\x6c"
+		"\x08\xc0\x37\xa3\x4a\x8b\x53\xc9"
+		"\xd0\x1e\xf0\x45\x2d\x75\xb6\x5e"
+		"\xb5\x25\x20\xe9\x6b\x01\xe6\x59", 32
+	}
+};
+
+static void printhex(const char *s, const char *buf, size_t len)
+{
+	size_t i;
+
+	printf("%s: ", s);
+	for (i = 0; i < len; i++)
+		printf("\\x%02x", (unsigned char)buf[i]);
+	printf("\n");
+	fflush(stdout);
+}
+
+static int argon2_test_vectors(void)
+{
+	char result[64];
+	int i, r;
+	struct test_vector *vec;
+	argon2_context context;
+
+	printf("Argon2 running test vectors\n");
+
+	for (i = 0; i < (sizeof(test_vectors) / sizeof(*test_vectors)); i++) {
+		vec = &test_vectors[i];
+		memset(result, 0, sizeof(result));
+		memset(&context, 0, sizeof(context));
+
+		context.flags = ARGON2_DEFAULT_FLAGS;
+		context.version = ARGON2_VERSION_NUMBER;
+		context.out = (uint8_t *)result;
+		context.outlen = (uint32_t)vec->output_length;
+		context.pwd = (uint8_t *)vec->password;
+		context.pwdlen = (uint32_t)vec->password_length;
+		context.salt = (uint8_t *)vec->salt;
+		context.saltlen = (uint32_t)vec->salt_length;
+		context.secret = (uint8_t *)vec->key;
+		context.secretlen = (uint32_t)vec->key_length;;
+		context.ad = (uint8_t *)vec->ad;
+		context.adlen = (uint32_t)vec->ad_length;
+		context.t_cost = vec->iterations;
+		context.m_cost = vec->memory;
+		context.lanes = vec->parallelism;
+		context.threads = vec->parallelism;
+
+		r = argon2_ctx(&context, vec->type);
+		if (r != ARGON2_OK) {
+			printf("Argon2 failed %i, vector %d\n", r, i);
+			return -EINVAL;
+		}
+		if (memcmp(result, vec->output, vec->output_length) != 0) {
+			printf("vector %u\n", i);
+			printhex(" got", result, vec->output_length);
+			printhex("want", vec->output, vec->output_length);
+			return -EINVAL;
+		}
+	}
+	return 0;
+}
+#endif

lib/crypto_backend/base64.c

@@ -1,276 +0,0 @@
-/*
- * Base64 "Not encryption" helpers, copied and adapted from systemd project.
- *
- * Copyright (C) 2010 Lennart Poettering
- *
- * cryptsetup related changes
- * Copyright (C) 2021-2022 Milan Broz
- *
- * This file is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This file is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <errno.h>
-#include <stdlib.h>
-#include <limits.h>
-
-#include "crypto_backend.h"
-
-#define WHITESPACE " \t\n\r"
-
-/* https://tools.ietf.org/html/rfc4648#section-4 */
-static char base64char(int x)
-{
-	static const char table[64] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-				      "abcdefghijklmnopqrstuvwxyz"
-				      "0123456789+/";
-	return table[x & 63];
-}
-
-static int unbase64char(char c)
-{
-	unsigned offset;
-
-	if (c >= 'A' && c <= 'Z')
-		return c - 'A';
-
-	offset = 'Z' - 'A' + 1;
-
-	if (c >= 'a' && c <= 'z')
-		return c - 'a' + offset;
-
-	offset += 'z' - 'a' + 1;
-
-	if (c >= '0' && c <= '9')
-		return c - '0' + offset;
-
-	offset += '9' - '0' + 1;
-
-	if (c == '+')
-		return offset;
-
-	offset++;
-
-	if (c == '/')
-		return offset;
-
-	return -EINVAL;
-}
-
-int crypt_base64_encode(char **out, size_t *out_length, const char *in, size_t in_length)
-{
-	char *r, *z;
-	const uint8_t *x;
-
-	assert(in || in_length == 0);
-	assert(out);
-
-	/* three input bytes makes four output bytes, padding is added so we must round up */
-	z = r = malloc(4 * (in_length + 2) / 3 + 1);
-	if (!r)
-		return -ENOMEM;
-
-	for (x = (const uint8_t *)in; x < (const uint8_t*)in + (in_length / 3) * 3; x += 3) {
-		/* x[0] == XXXXXXXX; x[1] == YYYYYYYY; x[2] == ZZZZZZZZ */
-		*(z++) = base64char(x[0] >> 2);                    /* 00XXXXXX */
-		*(z++) = base64char((x[0] & 3) << 4 | x[1] >> 4);  /* 00XXYYYY */
-		*(z++) = base64char((x[1] & 15) << 2 | x[2] >> 6); /* 00YYYYZZ */
-		*(z++) = base64char(x[2] & 63);                    /* 00ZZZZZZ */
-	}
-
-	switch (in_length % 3) {
-	case 2:
-		*(z++) = base64char(x[0] >> 2);                   /* 00XXXXXX */
-		*(z++) = base64char((x[0] & 3) << 4 | x[1] >> 4); /* 00XXYYYY */
-		*(z++) = base64char((x[1] & 15) << 2);            /* 00YYYY00 */
-		*(z++) = '=';
-
-		break;
-	case 1:
-		*(z++) = base64char(x[0] >> 2);        /* 00XXXXXX */
-		*(z++) = base64char((x[0] & 3) << 4);  /* 00XX0000 */
-		*(z++) = '=';
-		*(z++) = '=';
-
-		break;
-	}
-
-	*z = 0;
-	*out = r;
-	if (out_length)
-		*out_length = z - r;
-	return 0;
-}
-
-static int unbase64_next(const char **p, size_t *l)
-{
-	int ret;
-
-	assert(p);
-	assert(l);
-
-	/* Find the next non-whitespace character, and decode it. If we find padding, we return it as INT_MAX. We
-	 * greedily skip all preceding and all following whitespace. */
-
-	for (;;) {
-		if (*l == 0)
-			return -EPIPE;
-
-		if (!strchr(WHITESPACE, **p))
-			break;
-
-		/* Skip leading whitespace */
-		(*p)++, (*l)--;
-	}
-
-	if (**p == '=')
-		ret = INT_MAX; /* return padding as INT_MAX */
-	else {
-		ret = unbase64char(**p);
-		if (ret < 0)
-			return ret;
-	}
-
-	for (;;) {
-		(*p)++, (*l)--;
-
-		if (*l == 0)
-			break;
-		if (!strchr(WHITESPACE, **p))
-			break;
-
-		/* Skip following whitespace */
-	}
-
-	return ret;
-}
-
-int crypt_base64_decode(char **out, size_t *out_length, const char *in, size_t in_length)
-{
-	uint8_t *buf = NULL;
-	const char *x;
-	uint8_t *z;
-	size_t len;
-	int r;
-
-	assert(in || in_length == 0);
-	assert(out);
-	assert(out_length);
-
-	if (in_length == (size_t) -1)
-		in_length = strlen(in);
-
-	/* A group of four input bytes needs three output bytes, in case of padding we need to add two or three extra
-	 * bytes. Note that this calculation is an upper boundary, as we ignore whitespace while decoding */
-	len = (in_length / 4) * 3 + (in_length % 4 != 0 ? (in_length % 4) - 1 : 0);
-
-	buf = malloc(len + 1);
-	if (!buf)
-		return -ENOMEM;
-
-	for (x = in, z = buf;;) {
-		int a, b, c, d; /* a == 00XXXXXX; b == 00YYYYYY; c == 00ZZZZZZ; d == 00WWWWWW */
-
-		a = unbase64_next(&x, &in_length);
-		if (a == -EPIPE) /* End of string */
-			break;
-		if (a < 0) {
-			r = a;
-			goto err;
-		}
-		if (a == INT_MAX) { /* Padding is not allowed at the beginning of a 4ch block */
-			r = -EINVAL;
-			goto err;
-		}
-
-		b = unbase64_next(&x, &in_length);
-		if (b < 0) {
-			r = b;
-			goto err;
-		}
-		if (b == INT_MAX) { /* Padding is not allowed at the second character of a 4ch block either */
-			r = -EINVAL;
-			goto err;
-		}
-
-		c = unbase64_next(&x, &in_length);
-		if (c < 0) {
-			r = c;
-			goto err;
-		}
-
-		d = unbase64_next(&x, &in_length);
-		if (d < 0) {
-			r = d;
-			goto err;
-		}
-
-		if (c == INT_MAX) { /* Padding at the third character */
-
-			if (d != INT_MAX) { /* If the third character is padding, the fourth must be too */
-				r = -EINVAL;
-				goto err;
-			}
-
-			/* b == 00YY0000 */
-			if (b & 15) {
-				r = -EINVAL;
-				goto err;
-			}
-
-			if (in_length > 0) { /* Trailing rubbish? */
-				r = -ENAMETOOLONG;
-				goto err;
-			}
-
-			*(z++) = (uint8_t) a << 2 | (uint8_t) (b >> 4); /* XXXXXXYY */
-			break;
-		}
-
-		if (d == INT_MAX) {
-			/* c == 00ZZZZ00 */
-			if (c & 3) {
-				r = -EINVAL;
-				goto err;
-			}
-
-			if (in_length > 0) { /* Trailing rubbish? */
-				r = -ENAMETOOLONG;
-				goto err;
-			}
-
-			*(z++) = (uint8_t) a << 2 | (uint8_t) b >> 4; /* XXXXXXYY */
-			*(z++) = (uint8_t) b << 4 | (uint8_t) c >> 2; /* YYYYZZZZ */
-			break;
-		}
-
-		*(z++) = (uint8_t) a << 2 | (uint8_t) b >> 4; /* XXXXXXYY */
-		*(z++) = (uint8_t) b << 4 | (uint8_t) c >> 2; /* YYYYZZZZ */
-		*(z++) = (uint8_t) c << 6 | (uint8_t) d;      /* ZZWWWWWW */
-	}
-
-	*z = 0;
-
-	*out_length = (size_t) (z - buf);
-	*out = (char *)buf;
-	return 0;
-err:
-	free(buf);
-
-	/* Ignore other errors in crypt_backend */
-	if (r != -ENOMEM)
-		r = -EINVAL;
-
-	return r;
-}