Skip to content

Fix PKESK issue. #2372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ronaldtse merged 2 commits into from
Nov 21, 2025
Merged

Fix PKESK issue. #2372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c535ed
FIx PKESK CEK generation
ronaldtse Nov 20, 2025
729450f
Add test for PKESK checks
ni4 Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/librepgp/stream-write.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,12 +756,13 @@ encrypted_add_password_v5(pgp_dest_encrypted_param_t & param,
}

static bool
encrypted_build_skesk(pgp_dest_encrypted_param_t &param,
rnp::secure_bytes & key,
const size_t keylen)
encrypted_build_cek(pgp_dest_encrypted_param_t &param,
rnp::secure_bytes & key,
const size_t keylen)
{
auto &ctx = param.ctx;
if (ctx.passwords.empty()) {
ctx.sec_ctx.rng.get(key.data(), keylen);
return true;
}

Expand Down Expand Up @@ -1036,7 +1037,7 @@ init_encrypted_dst(rnp_ctx_t &ctx, pgp_dest_t &dst, pgp_dest_t &writedst)

/* Build SKESK and generate CEK */
rnp_result_t ret = RNP_ERROR_BAD_PARAMETERS;
if (!encrypted_build_skesk(*param, enckey, keylen)) {
if (!encrypted_build_cek(*param, enckey, keylen)) {
goto finish;
}

Expand Down
31 changes: 31 additions & 0 deletions src/tests/cli_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5000,6 +5000,37 @@ def test_decrypt_signonly_key(self):
self.assertNotEqual(ret, 0)
self.assertRegex(err, r'(?s)^.*failed to obtain decrypting key or password.*')

def test_encryption_cek(self):
RNPDIR2 = RNPDIR + '2'
os.mkdir(RNPDIR2, 0o700)
GPGHOME2 = GPGHOME + '2'
GPGDIR2 = GPGDIR + '2'
os.mkdir(GPGDIR2, 0o700)
# Generate default key
ret, _, _ = run_proc(RNPK, ['--homedir', RNPDIR2, '--generate', '--userid', 'test_cek', '--password', PASSWORD])
self.assertEqual(ret, 0)
# Import key by GnuPG
ret, _, _ = run_proc(GPG, ['--batch', '--homedir', GPGHOME2, GPG_LOOPBACK, '--passphrase', PASSWORD, '--import', RNPDIR2 + '/secring.gpg'])
# Encrypt some data
src, enc = reg_workfiles('cleartext', '.txt', '.enc')
random_text(src, 2000)
pattern = re.compile(r'(?s)gpg: encrypted with.*test_cek.*session key: \'[\d]+:([0-9A-F]{64})\'.*')
keys = set()

for _ in range(10):
ret, _, _ = run_proc(RNP, ['--homedir', RNPDIR2, '-r', 'test_cek', '-e', src, '--overwrite', '--output', enc])
self.assertEqual(ret, 0)
ret, _, err = run_proc(GPG, ['--batch', '--homedir', GPGHOME2, '--show-session-key', GPG_LOOPBACK, '--passphrase', PASSWORD, '--output', '/dev/null', '-d', enc])
self.assertEqual(ret, 0)
m = pattern.match(err)
self.assertTrue(m)
key = m.group(1)
self.assertNotIn(key, keys)
keys.add(key)

shutil.rmtree(RNPDIR2, ignore_errors=True)
shutil.rmtree(GPGDIR2, ignore_errors=True)

class Compression(unittest.TestCase):
@classmethod
def setUpClass(cls):
Expand Down
Loading