subshare / subshare

Synchronize files between devices & store them in the cloud; secure with strong encryption.
GNU Affero General Public License v3.0
2 stars 1 forks source link

Fix merging of PGP-key-rings #70

Closed nlmarco closed 6 years ago

nlmarco commented 6 years ago

Upgrading to BouncyCastle 161b03 due to #61 revealed a bug in BcWithLocalGnuPgPgp.mergePublicKey(...) (and also in some tests, which doesn't matter and is already fixed). This bug easily causes master-key and sub-keys to be torn apart. The merge logic should be fixed to ensure the master-key and its sub-keys always stay together.

nlmarco commented 6 years ago

The merging-bug was already partially solved yesterday (and checked-in in the scope of #61). Today, I improved it even more (added support for hopefully all merging-scenarios).