openGemini · chenhuansome · Aug 13, 2025
diff --git a/GnuPG/bin/gpg-agent.exe b/GnuPG/bin/gpg-agent.exe
diff --git a/GnuPG/bin/gpg-card.exe b/GnuPG/bin/gpg-card.exe
diff --git a/GnuPG/bin/gpg-check-pattern.exe b/GnuPG/bin/gpg-check-pattern.exe
diff --git a/GnuPG/bin/gpg-connect-agent.exe b/GnuPG/bin/gpg-connect-agent.exe
diff --git a/GnuPG/bin/gpg-disable-keyboxd.bat b/GnuPG/bin/gpg-disable-keyboxd.bat
@@ -0,0 +1,31 @@
+@echo off
+setlocal EnableDelayedExpansion
+
+echo --- Migrating your OpenPGP Certificates (Public Keys) from Keyboxd to the old format ---
+echo --- If this fails or produces empty results your certificates are in the state where you migrated to keybox in the first place ---
+echo Shutting down Kleopatra...
+TASKKILL /F /IM kleopatra.exe 2>NUL
+echo Shutting down background processes...
+gpgconf --kill all
+FOR /F "tokens=*" %%g IN ('gpgconf -L homedir') do (set GPGH=%%~g)
+if "!GPGH!" == "" echo Failed to find homedir && exit /b 1
+echo Using "!GPGH!" as GnuPG Homedir.
+echo Exporting OpenPGP certificates to !GPGH!\pubring-migration-bkp-openpgp.gpg"
+gpg --export-options backup --export > "!GPGH!\pubring-migration-bkp-openpgp.gpg" || echo Failed to export OpenPGP certs && exit /B 1
+echo Exporting X509 certificates to !GPGH!\pubring-migration-bkp-x509.pem"
+gpgsm --export -a > "!GPGH!\pubring-migration-bkp-x509.pem" || echo Failed to export X509 certs && exit /B 1
+
+echo Disabling keyboxd by deleting common.conf
+del "!GPGH!\common.conf"
+
+echo Importing OpenPGP certificates... this might take a while
+rem in tests with larger keyrings error handling resulted in too many false positive errors see: T6596
+gpg --no-auto-check-trustdb --import-options keep-ownertrust,bulk-import,restore --import "!GPGH!\pubring-migration-bkp-openpgp.gpg"
+rem || echo Failed to import OpenPGP keys. Please report this to https://dev.gnupg.org/u/rgpg4win && del "!GPGH!\common.conf" && exit /B 1
+echo Importing X509 certificates... this might take a while
+gpgsm --disable-dirmngr --import "!GPGH!\pubring-migration-bkp-X509.pem"
+rem || echo Failed to import X509 certs. Please report the output to https://dev.gnupg.org/u/rgpg4win && del "!GPGH!\common.conf" && exit /B 1
+
+echo Checking database..
+gpg --check-trustdb
+echo All done.
diff --git a/GnuPG/bin/gpg-enable-keyboxd.bat b/GnuPG/bin/gpg-enable-keyboxd.bat
@@ -0,0 +1,39 @@
+@echo off
+setlocal EnableDelayedExpansion
+
+echo --- Migrating your OpenPGP Certificates (Public Keys) to the new Keyboxd format ---
+echo Shutting down Kleopatra...
+TASKKILL /F /IM kleopatra.exe 2>NUL
+echo Shutting down background processes...
+gpgconf --kill all
+FOR /F "tokens=*" %%g IN ('gpgconf -L homedir') do (set GPGH=%%~g)
+if "!GPGH!" == "" echo Failed to find homedir && exit /b 1
+echo Using "!GPGH!" as GnuPG Homedir.
+echo Exporting OpenPGP certificates to !GPGH!\keyboxd-migration-bkp-openpgp.gpg"
+gpg --export-options backup --export > "!GPGH!\keyboxd-migration-bkp-openpgp.gpg" || echo Failed to export OpenPGP certs && exit /B 1
+echo Exporting X509 certificates to !GPGH!\keyboxd-migration-bkp-x509.pem"
+gpgsm --export -a > "!GPGH!\keyboxd-migration-bkp-x509.pem" || echo Failed to export X509 certs && exit /B 1
+
+if exist "!GPGH!\common.conf" (
+    echo Backing up common.conf to common.conf_sik
+    copy /Y "!GPGH!\common.conf" "!GPGH!\common.conf_sik"
+)
+
+echo Enabling keyboxd in common.conf
+echo use-keyboxd > "!GPGH!\common.conf"
+
+echo Importing OpenPGP certificates... this might take a while
+rem in tests with larger keyrings error handling resulted in too many false positive errors see: T6596
+gpg --no-auto-check-trustdb --import-options keep-ownertrust,bulk-import,restore --import "!GPGH!\keyboxd-migration-bkp-openpgp.gpg"
+rem || echo Failed to import OpenPGP keys. Please report this to https://dev.gnupg.org/u/rgpg4win && del "!GPGH!\common.conf" && exit /B 1
+echo Importing X509 certificates... this might take a while
+gpgsm --disable-dirmngr --import "!GPGH!\keyboxd-migration-bkp-X509.pem"
+rem || echo Failed to import X509 certs. Please report the output to https://dev.gnupg.org/u/rgpg4win && del "!GPGH!\common.conf" && exit /B 1
+
+echo Checking database..
+gpg --check-trustdb
+echo All done.
+echo Your certificates are now stored in "!GPGH!\public-keys.d"
+echo Please report issues https://dev.gnupg.org/u/rgpg4win
+
+echo If you encounter issues you can switch back by using "gpg-disable-keyboxd"
diff --git a/GnuPG/bin/gpg-preset-passphrase.exe b/GnuPG/bin/gpg-preset-passphrase.exe
diff --git a/GnuPG/bin/gpg-wks-client.exe b/GnuPG/bin/gpg-wks-client.exe
diff --git a/GnuPG/bin/gpg.exe b/GnuPG/bin/gpg.exe
diff --git a/GnuPG/bin/gpgconf.exe b/GnuPG/bin/gpgconf.exe
diff --git a/GnuPG/bin/gpgme-w32spawn.exe b/GnuPG/bin/gpgme-w32spawn.exe
diff --git a/GnuPG/bin/gpgsm.exe b/GnuPG/bin/gpgsm.exe
diff --git a/GnuPG/bin/gpgtar.exe b/GnuPG/bin/gpgtar.exe
diff --git a/GnuPG/bin/gpgv.exe b/GnuPG/bin/gpgv.exe
diff --git a/GnuPG/bin/keyboxd.exe b/GnuPG/bin/keyboxd.exe
diff --git a/GnuPG/bin/libassuan-9.dll b/GnuPG/bin/libassuan-9.dll
diff --git a/GnuPG/bin/libgcrypt-20.dll b/GnuPG/bin/libgcrypt-20.dll
diff --git a/GnuPG/bin/libgpg-error-0.dll b/GnuPG/bin/libgpg-error-0.dll
diff --git a/GnuPG/bin/libgpgme-11.dll b/GnuPG/bin/libgpgme-11.dll
diff --git a/GnuPG/bin/libksba-8.dll b/GnuPG/bin/libksba-8.dll
diff --git a/GnuPG/bin/libnpth-0.dll b/GnuPG/bin/libnpth-0.dll
diff --git a/GnuPG/bin/libntbtls-0.dll b/GnuPG/bin/libntbtls-0.dll
diff --git a/GnuPG/bin/libsqlite3-0.dll b/GnuPG/bin/libsqlite3-0.dll
diff --git a/GnuPG/bin/pinentry-basic.exe b/GnuPG/bin/pinentry-basic.exe
diff --git a/GnuPG/bin/scdaemon.exe b/GnuPG/bin/scdaemon.exe
diff --git a/GnuPG/bin/zlib1.dll b/GnuPG/bin/zlib1.dll
diff --git a/GnuPG/gnupg-uninstall.exe b/GnuPG/gnupg-uninstall.exe