~vpa1977/ubuntu/+source/cryptsetup:merge-lp2004423-lunar
Last commit made on
2023-02-13
- Get this branch:
-
git clone
-b merge-lp2004423-lunar
https://git.launchpad.net/~vpa1977/ubuntu/+source/cryptsetup
Only
Vladimir Petko
can upload to this branch. If you are
Vladimir Petko
please log in for upload directions.
Branch merges
Propose for merging
Merged
into
ubuntu/+source/cryptsetup:debian/sid
at
revision bde91aa4f4b7b1eb3978bdf83d5b58e5df2155ca
- Canonical Server Core Reviewers: Pending requested
- Canonical Server: Pending requested
- git-ubuntu import: Pending requested
-
Diff: 2624 lines (+2003/-27)15 files modifieddebian/changelog (+1826/-0)
debian/control (+7/-5)
debian/functions (+9/-1)
debian/initramfs/cryptroot-unlock (+12/-6)
debian/initramfs/hooks/cryptroot (+5/-3)
debian/patches/decrease_memlock_ulimit.patch (+49/-0)
debian/patches/series (+1/-0)
debian/rules (+2/-0)
debian/tests/control (+3/-2)
debian/tests/cryptroot-lvm.d/mock (+7/-2)
debian/tests/cryptroot-nested.d/config (+7/-0)
debian/tests/cryptroot-sysvinit.d/config (+7/-2)
debian/tests/initramfs-hook (+16/-2)
debian/tests/utils/cryptroot-common (+27/-3)
debian/tests/utils/mock.pm (+25/-1)
Superseded
for merging
into
ubuntu/+source/cryptsetup:ubuntu/devel
- git-ubuntu import: Pending requested
-
Diff: 60499 lines (+25488/-8727) (has conflicts)230 files modified.github/workflows/cibuild-setup-ubuntu.sh (+1/-1)
.gitignore (+1/-0)
.gitlab-ci.yml (+3/-0)
.gitlab/ci/alpinelinux.yml (+4/-2)
.gitlab/ci/centos.yml (+4/-0)
.gitlab/ci/cibuild-setup-ubuntu.sh (+1/-1)
.gitlab/ci/cifuzz.yml (+46/-0)
.gitlab/ci/compilation-various-disables.yml (+21/-0)
.gitlab/ci/debian.yml (+11/-8)
.gitlab/ci/fedora.yml (+6/-1)
.gitlab/ci/rhel.yml (+10/-0)
.gitlab/ci/ubuntu-32bit.yml (+41/-0)
FAQ.md (+25/-0)
Makefile.am (+12/-1)
README.md (+93/-61)
autogen.sh (+1/-1)
configure.ac (+32/-2)
debian/README.Debian (+1/-1)
debian/changelog (+83/-0)
debian/clean (+5/-0)
debian/control (+11/-2)
debian/copyright (+26/-17)
debian/cryptsetup-bin.manpages (+2/-0)
debian/doc/crypttab.xml (+16/-2)
debian/functions (+4/-0)
debian/initramfs/hooks/cryptgnupg-sc (+11/-1)
debian/libcryptsetup12.symbols (+11/-0)
debian/patches/decrease_memlock_ulimit.patch (+20/-0)
debian/rules (+4/-0)
debian/upstream/metadata (+3/-2)
dev/null (+0/-55)
docs/examples/crypt_log_usage.c (+1/-1)
docs/examples/crypt_luks_usage.c (+1/-1)
docs/v2.6.0-ReleaseNotes (+236/-0)
docs/v2.6.1-ReleaseNotes (+50/-0)
lib/Makemodule.am (+5/-3)
lib/bitlk/bitlk.c (+87/-41)
lib/bitlk/bitlk.h (+3/-3)
lib/crypt_plain.c (+2/-2)
lib/crypto_backend/argon2_generic.c (+2/-2)
lib/crypto_backend/base64.c (+1/-2)
lib/crypto_backend/cipher_check.c (+2/-2)
lib/crypto_backend/cipher_generic.c (+2/-2)
lib/crypto_backend/crc32.c (+70/-1)
lib/crypto_backend/crypto_backend.h (+9/-3)
lib/crypto_backend/crypto_backend_internal.h (+2/-2)
lib/crypto_backend/crypto_cipher_kernel.c (+2/-2)
lib/crypto_backend/crypto_gcrypt.c (+19/-3)
lib/crypto_backend/crypto_kernel.c (+7/-2)
lib/crypto_backend/crypto_nettle.c (+7/-2)
lib/crypto_backend/crypto_nss.c (+7/-2)
lib/crypto_backend/crypto_openssl.c (+37/-2)
lib/crypto_backend/crypto_storage.c (+1/-1)
lib/crypto_backend/pbkdf2_generic.c (+2/-2)
lib/crypto_backend/pbkdf_check.c (+2/-2)
lib/crypto_backend/utf8.c (+1/-2)
lib/fvault2/fvault2.c (+1057/-0)
lib/fvault2/fvault2.h (+80/-0)
lib/integrity/integrity.c (+1/-1)
lib/integrity/integrity.h (+1/-1)
lib/internal.h (+4/-5)
lib/keyslot_context.c (+488/-0)
lib/keyslot_context.h (+111/-0)
lib/libcryptsetup.h (+228/-3)
lib/libcryptsetup.pc.in (+1/-0)
lib/libcryptsetup.sym (+14/-0)
lib/libcryptsetup_macros.h (+2/-2)
lib/libcryptsetup_symver.h (+3/-3)
lib/libdevmapper.c (+30/-91)
lib/loopaes/loopaes.c (+2/-2)
lib/loopaes/loopaes.h (+2/-2)
lib/luks1/af.c (+1/-1)
lib/luks1/af.h (+1/-1)
lib/luks1/keyencryption.c (+2/-2)
lib/luks1/keymanage.c (+19/-8)
lib/luks1/luks.h (+1/-1)
lib/luks2/luks2.h (+16/-4)
lib/luks2/luks2_digest.c (+2/-2)
lib/luks2/luks2_digest_pbkdf2.c (+2/-2)
lib/luks2/luks2_disk_metadata.c (+2/-4)
lib/luks2/luks2_internal.h (+4/-2)
lib/luks2/luks2_json_format.c (+6/-3)
lib/luks2/luks2_json_metadata.c (+94/-26)
lib/luks2/luks2_keyslot.c (+2/-2)
lib/luks2/luks2_keyslot_luks2.c (+19/-5)
lib/luks2/luks2_keyslot_reenc.c (+2/-2)
lib/luks2/luks2_luks1_convert.c (+3/-3)
lib/luks2/luks2_reencrypt.c (+82/-67)
lib/luks2/luks2_reencrypt_digest.c (+3/-4)
lib/luks2/luks2_segment.c (+2/-2)
lib/luks2/luks2_token.c (+116/-28)
lib/luks2/luks2_token_keyring.c (+7/-4)
lib/random.c (+2/-2)
lib/setup.c (+594/-390)
lib/tcrypt/tcrypt.c (+2/-3)
lib/tcrypt/tcrypt.h (+2/-2)
lib/utils.c (+27/-37)
lib/utils_benchmark.c (+8/-5)
lib/utils_blkid.c (+1/-1)
lib/utils_blkid.h (+1/-1)
lib/utils_crypt.c (+81/-2)
lib/utils_crypt.h (+10/-5)
lib/utils_device.c (+6/-4)
lib/utils_device_locking.c (+3/-4)
lib/utils_device_locking.h (+2/-2)
lib/utils_devpath.c (+2/-2)
lib/utils_dm.h (+3/-2)
lib/utils_io.c (+3/-2)
lib/utils_io.h (+2/-2)
lib/utils_keyring.c (+4/-6)
lib/utils_keyring.h (+2/-2)
lib/utils_loop.c (+2/-2)
lib/utils_loop.h (+2/-2)
lib/utils_pbkdf.c (+2/-2)
lib/utils_safe_memory.c (+25/-9)
lib/utils_storage_wrappers.c (+1/-1)
lib/utils_storage_wrappers.h (+1/-1)
lib/utils_wipe.c (+4/-4)
lib/verity/rs.h (+1/-1)
lib/verity/rs_decode_char.c (+1/-1)
lib/verity/rs_encode_char.c (+1/-1)
lib/verity/verity.c (+1/-1)
lib/verity/verity.h (+1/-1)
lib/verity/verity_fec.c (+1/-1)
lib/verity/verity_hash.c (+1/-1)
lib/volumekey.c (+1/-1)
m4/ax_check_compile_flag.m4 (+53/-0)
man/Makemodule.am (+3/-0)
man/common_options.adoc (+109/-27)
man/cryptsetup-fvault2Dump.8.adoc (+34/-0)
man/cryptsetup-luksAddKey.8.adoc (+39/-9)
man/cryptsetup-open.8.adoc (+21/-4)
man/cryptsetup-token.8.adoc (+5/-2)
man/cryptsetup.8.adoc (+45/-1)
man/veritysetup.8.adoc (+5/-1)
po/LINGUAS (+2/-0)
po/POTFILES.in (+1/-1)
po/cryptsetup.pot (+699/-621)
po/cs.po (+750/-651)
po/de.po (+749/-652)
po/fr.po (+749/-652)
po/ja.po (+736/-717)
po/ka.po (+3756/-0)
po/pl.po (+700/-613)
po/ro.po (+3874/-0)
po/ru.po (+749/-651)
po/sr.po (+1315/-1039)
po/sv.po (+1315/-1045)
po/uk.po (+748/-651)
src/cryptsetup.c (+389/-72)
src/cryptsetup.h (+2/-3)
src/cryptsetup_arg_list.h (+9/-3)
src/cryptsetup_args.h (+7/-3)
src/integritysetup.c (+2/-2)
src/integritysetup_arg_list.h (+2/-2)
src/integritysetup_args.h (+2/-2)
src/utils_arg_macros.h (+2/-2)
src/utils_arg_names.h (+6/-2)
src/utils_args.c (+2/-2)
src/utils_blockdev.c (+2/-2)
src/utils_luks.c (+3/-3)
src/utils_luks.h (+3/-3)
src/utils_password.c (+4/-5)
src/utils_progress.c (+2/-2)
src/utils_reencrypt.c (+40/-8)
src/utils_reencrypt_luks1.c (+8/-8)
src/utils_tools.c (+19/-14)
src/veritysetup.c (+9/-5)
src/veritysetup_arg_list.h (+4/-2)
src/veritysetup_args.h (+3/-2)
tests/Makefile.am (+38/-9)
tests/Makefile.localtest (+8/-0)
tests/align-test (+28/-2)
tests/align-test2 (+17/-1)
tests/all-symbols-test.c (+1/-1)
tests/api-test-2.c (+344/-62)
tests/api-test.c (+263/-13)
tests/api_test.h (+23/-4)
tests/bitlk-compat-test (+3/-3)
tests/compat-test (+50/-15)
tests/compat-test2 (+131/-31)
tests/crypto-vectors.c (+1/-1)
tests/device-test (+17/-1)
tests/differ.c (+1/-1)
tests/discards-test (+16/-0)
tests/fake_systemd_tpm_path.c (+17/-0)
tests/fuzz/FuzzerInterface.h (+81/-0)
tests/fuzz/LUKS2.proto (+379/-0)
tests/fuzz/LUKS2_plain_JSON.proto (+190/-0)
tests/fuzz/Makefile.am (+122/-0)
tests/fuzz/README.md (+66/-0)
tests/fuzz/crypt2_load_fuzz.cc (+112/-0)
tests/fuzz/crypt2_load_fuzz.dict (+130/-0)
tests/fuzz/crypt2_load_ondisk_fuzz.cc (+64/-0)
tests/fuzz/crypt2_load_ondisk_fuzz.dict (+9/-0)
tests/fuzz/crypt2_load_proto_fuzz.cc (+30/-7)
tests/fuzz/crypt2_load_proto_plain_json_fuzz.cc (+51/-0)
tests/fuzz/crypt2_load_proto_plain_json_fuzz.dict (+72/-0)
tests/fuzz/json_proto_converter.cc (+87/-0)
tests/fuzz/json_proto_converter.h (+43/-0)
tests/fuzz/oss-fuzz-build.sh (+152/-0)
tests/fuzz/plain_json_proto_to_luks2.cc (+75/-0)
tests/fuzz/plain_json_proto_to_luks2_converter.cc (+153/-0)
tests/fuzz/plain_json_proto_to_luks2_converter.h (+58/-0)
tests/fuzz/proto_to_luks2.cc (+75/-0)
tests/fuzz/proto_to_luks2_converter.cc (+604/-0)
tests/fuzz/proto_to_luks2_converter.h (+91/-0)
tests/fuzz/unpoison-mutated-buffers-from-libfuzzer.patch (+29/-0)
tests/fvault2-compat-test (+134/-0)
tests/keyring-compat-test (+18/-2)
tests/loopaes-test (+16/-0)
tests/luks1-compat-test (+27/-12)
tests/luks2-integrity-test (+16/-0)
tests/luks2-reencryption-mangle-test (+2/-1)
tests/luks2-reencryption-test (+43/-19)
tests/mode-test (+20/-2)
tests/password-hash-test (+16/-0)
tests/reencryption-compat-test (+42/-2)
tests/ssh-test-plugin (+27/-2)
tests/systemd-test-plugin (+150/-0)
tests/tcrypt-compat-test (+3/-3)
tests/test_utils.c (+66/-9)
tests/unit-utils-crypt.c (+1/-1)
tests/unit-utils-io.c (+1/-1)
tests/unit-wipe.c (+1/-1)
tests/verity-compat-test (+6/-0)
tokens/ssh/cryptsetup-ssh.c (+2/-2)
tokens/ssh/libcryptsetup-token-ssh.c (+8/-2)
tokens/ssh/ssh-utils.c (+2/-2)
tokens/ssh/ssh-utils.h (+2/-2)
Branch information
- Name:
- merge-lp2004423-lunar
- Repository:
- lp:~vpa1977/ubuntu/+source/cryptsetup