merge: add support for s2k dummy generation

Browse Source

if a public key gets merged into a secret one, and there are new
subkeys, the merge() routine now adds a newly generated, stripped secret
subkey instead.

...

This commit is contained in:

Vincent Breitmoser

2014-09-11 22:45:35 +02:00

parent 51d6ad4394

commit 2a6774b221

2 changed files with 4 additions and 24 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

extern/spongycastle vendored

Submodule extern/spongycastle updated: 526d23382e...375084d553