Skip to content
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.

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

make sure parsing stops after the first ascii armor ending delimiter #275

Merged
merged 1 commit into from Dec 13, 2017

Conversation

Valodim
Copy link
Contributor

@Valodim Valodim commented Dec 12, 2017

This is a slight improvement for handling autocrypt setup messages. See #267 for a discussion

@dkg dkg self-requested a review December 12, 2017 19:18
Copy link
Member

@dkg dkg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like a sensible resolution for #267 to me, because it means it's possible to stuff additional keys after the first ASCII-armored block.

@r10s
Copy link
Member

r10s commented Dec 12, 2017

Looks good to me.

Should we mention explicitly that stuff before the first ascii armor starting delimiter must also be ignored?
Just in case we decide to add sth. before later. Or do we switch to v2 then?

@dkg
Copy link
Member

dkg commented Dec 13, 2017

Right now it says that the cleartext MUST start with the ASCII-armor starting delimiter. I think that's a perfectly fine constraint, and i wouldn't want to relax it.

@dkg dkg merged commit 931d5b2 into master Dec 13, 2017
@dkg dkg deleted the first branch December 13, 2017 22:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants