Skip to content

Commit

Permalink
Merge pull request #240 from autocrypt/drop-bad-import
Browse files Browse the repository at this point in the history
Refer to GnuPG bug report instead of tracking it in Autocrypt
  • Loading branch information
hpk42 committed Nov 13, 2017
2 parents f5bb262 + 39c4258 commit d47b529
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 105 deletions.
101 changes: 0 additions & 101 deletions doc/bad-import.rst

This file was deleted.

8 changes: 4 additions & 4 deletions doc/level1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -938,12 +938,12 @@ import it to enable Autocrypt. If the user agrees to do so:
If there is no ``Passphrase-Format`` header, or the value is unknown,
then the MUA MUST provide a plain UTF-8 string text entry.

* The MUA should try decrypting the message with the supplied
Setup Code. The Code serves both for decryption as well as
* The MUA should try decrypting the message with the supplied Setup
Code. The Code serves both for decryption as well as
authenticating the message. Extra care needs to be taken with some
PGP implementations that the Setup Code is actually used for
decryption. See :doc:`bad-import` for more explanation and an
example.
decryption. For example, `this is difficult to do correctly with
GnuPG <https://dev.gnupg.org/T3277>`_.

* If it decrypts, then the MUA SHOULD update ``accounts[addr]``
according to the contents of the decrypted message, as discussed in
Expand Down

0 comments on commit d47b529

Please sign in to comment.