wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change autocrypt param according to updated spec

Browse source
This commit is contained in:
Vincent Breitmoser 2017-08-27 23:02:40 +02:00
parent 2e7c6cf5e8
commit 8f1a892f1f
8 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
k9mail/src/main/java/com/fsck/k9/crypto/AutocryptOperations.java
View file

@ -22,7 +22,7 @@ public class AutocryptOperations {
private static final String AUTOCRYPT_HEADER = "Autocrypt"; private static final String AUTOCRYPT_HEADER = "Autocrypt";
private static final String AUTOCRYPT_PARAM_TO = "addr"; private static final String AUTOCRYPT_PARAM_TO = "addr";
private static final String AUTOCRYPT_PARAM_KEY_DATA = "key"; private static final String AUTOCRYPT_PARAM_KEY_DATA = "keydata";
private static final String AUTOCRYPT_PARAM_TYPE = "type"; private static final String AUTOCRYPT_PARAM_TYPE = "type";
private static final String AUTOCRYPT_TYPE_1 = "1"; private static final String AUTOCRYPT_TYPE_1 = "1";

2
k9mail/src/test/resources/autocrypt/rsa2048-broken-base64.eml
View file

@ -1,7 +1,7 @@
From: Alice <alice@testsuite.autocrypt.org> From: Alice <alice@testsuite.autocrypt.org>
To: Bob <bob@testsuite.autocrypt.org> To: Bob <bob@testsuite.autocrypt.org>
Subject: an INBOME RSA test Subject: an INBOME RSA test
Autocrypt: addr=alice@testsuite.autocrypt.org; key= Autocrypt: addr=alice@testsuite.autocrypt.org; keydata=
m!@#$%hVF+ABCADu17FBUgA3mCemeKbNaBTyWe3VGxjbu7fUyHgdLK7i3tnd7IRtxQy/AEN2t6Vq m!@#$%hVF+ABCADu17FBUgA3mCemeKbNaBTyWe3VGxjbu7fUyHgdLK7i3tnd7IRtxQy/AEN2t6Vq
0/xeZEAKYRInsHI/HjvmhqPeWFzipk71jRQ02WUY1pZytFjYNIrTdMk4eLYdC1N0go83PU33V4R8 0/xeZEAKYRInsHI/HjvmhqPeWFzipk71jRQ02WUY1pZytFjYNIrTdMk4eLYdC1N0go83PU33V4R8
fc2fWHD8N5JPsDH2xOB6WNWkMPxgMbtGIa0QTx7TINhDif4/1/VcrX3wz1gZ6xYI+sujbC54iBZo fc2fWHD8N5JPsDH2xOB6WNWkMPxgMbtGIa0QTx7TINhDif4/1/VcrX3wz1gZ6xYI+sujbC54iBZo

2
k9mail/src/test/resources/autocrypt/rsa2048-explicit-type.eml
View file

@ -1,7 +1,7 @@
From: Alice <alice@testsuite.autocrypt.org> From: Alice <alice@testsuite.autocrypt.org>
To: Bob <bob@testsuite.autocrypt.org> To: Bob <bob@testsuite.autocrypt.org>
Subject: inbome rsa2048 with correct type Subject: inbome rsa2048 with correct type
Autocrypt: addr=alice@testsuite.autocrypt.org; type=1; key= Autocrypt: addr=alice@testsuite.autocrypt.org; type=1; keydata=
mQENBFhVF+ABCADu17FBUgA3mCemeKbNaBTyWe3VGxjbu7fUyHgdLK7i3tnd7IRtxQy/AEN2t6Vq mQENBFhVF+ABCADu17FBUgA3mCemeKbNaBTyWe3VGxjbu7fUyHgdLK7i3tnd7IRtxQy/AEN2t6Vq
0/xeZEAKYRInsHI/HjvmhqPeWFzipk71jRQ02WUY1pZytFjYNIrTdMk4eLYdC1N0go83PU33V4R8 0/xeZEAKYRInsHI/HjvmhqPeWFzipk71jRQ02WUY1pZytFjYNIrTdMk4eLYdC1N0go83PU33V4R8
fc2fWHD8N5JPsDH2xOB6WNWkMPxgMbtGIa0QTx7TINhDif4/1/VcrX3wz1gZ6xYI+sujbC54iBZo fc2fWHD8N5JPsDH2xOB6WNWkMPxgMbtGIa0QTx7TINhDif4/1/VcrX3wz1gZ6xYI+sujbC54iBZo

2
k9mail/src/test/resources/autocrypt/rsa2048-simple-to-bot.eml
View file

@ -1,7 +1,7 @@
From: Alice <alice@testsuite.autocrypt.org> From: Alice <alice@testsuite.autocrypt.org>
To: Autocrypt-Bot <bot@autocrypt.org> To: Autocrypt-Bot <bot@autocrypt.org>
Subject: an INBOME RSA test Subject: an INBOME RSA test
INBOME: to=alice@testsuite.autocrypt.org; key= INBOME: to=alice@testsuite.autocrypt.org; keydata=
mQENBFhVF+ABCADu17FBUgA3mCemeKbNaBTyWe3VGxjbu7fUyHgdLK7i3tnd7IRtxQy/AEN2t6Vq mQENBFhVF+ABCADu17FBUgA3mCemeKbNaBTyWe3VGxjbu7fUyHgdLK7i3tnd7IRtxQy/AEN2t6Vq
0/xeZEAKYRInsHI/HjvmhqPeWFzipk71jRQ02WUY1pZytFjYNIrTdMk4eLYdC1N0go83PU33V4R8 0/xeZEAKYRInsHI/HjvmhqPeWFzipk71jRQ02WUY1pZytFjYNIrTdMk4eLYdC1N0go83PU33V4R8
fc2fWHD8N5JPsDH2xOB6WNWkMPxgMbtGIa0QTx7TINhDif4/1/VcrX3wz1gZ6xYI+sujbC54iBZo fc2fWHD8N5JPsDH2xOB6WNWkMPxgMbtGIa0QTx7TINhDif4/1/VcrX3wz1gZ6xYI+sujbC54iBZo

2
k9mail/src/test/resources/autocrypt/rsa2048-simple.eml
View file

@ -1,7 +1,7 @@
From: Alice <alice@testsuite.autocrypt.org> From: Alice <alice@testsuite.autocrypt.org>
To: Bob <bob@testsuite.autocrypt.org> To: Bob <bob@testsuite.autocrypt.org>
Subject: an INBOME RSA test Subject: an INBOME RSA test
Autocrypt: addr=alice@testsuite.autocrypt.org; key= Autocrypt: addr=alice@testsuite.autocrypt.org; keydata=
mQENBFhVF+ABCADu17FBUgA3mCemeKbNaBTyWe3VGxjbu7fUyHgdLK7i3tnd7IRtxQy/AEN2t6Vq mQENBFhVF+ABCADu17FBUgA3mCemeKbNaBTyWe3VGxjbu7fUyHgdLK7i3tnd7IRtxQy/AEN2t6Vq
0/xeZEAKYRInsHI/HjvmhqPeWFzipk71jRQ02WUY1pZytFjYNIrTdMk4eLYdC1N0go83PU33V4R8 0/xeZEAKYRInsHI/HjvmhqPeWFzipk71jRQ02WUY1pZytFjYNIrTdMk4eLYdC1N0go83PU33V4R8
fc2fWHD8N5JPsDH2xOB6WNWkMPxgMbtGIa0QTx7TINhDif4/1/VcrX3wz1gZ6xYI+sujbC54iBZo fc2fWHD8N5JPsDH2xOB6WNWkMPxgMbtGIa0QTx7TINhDif4/1/VcrX3wz1gZ6xYI+sujbC54iBZo

2
k9mail/src/test/resources/autocrypt/rsa2048-unknown-critical.eml
View file

@ -1,7 +1,7 @@
From: Alice <alice@testsuite.autocrypt.org> From: Alice <alice@testsuite.autocrypt.org>
To: Bob <bob@testsuite.autocrypt.org> To: Bob <bob@testsuite.autocrypt.org>
Subject: another inbome with rsa2048 but with an unknown critical attribute Subject: another inbome with rsa2048 but with an unknown critical attribute
Autocrypt: addr=alice@testsuite.autocrypt.org; danger=do-not-use; key= Autocrypt: addr=alice@testsuite.autocrypt.org; danger=do-not-use; keydata=
mQENBFhVGA8BCADK+qTRkAfax0LtJ6RiyxzuAFyIohBTwvtcOM2sd/tRmWq1eyNif5AGDnc1+b6X mQENBFhVGA8BCADK+qTRkAfax0LtJ6RiyxzuAFyIohBTwvtcOM2sd/tRmWq1eyNif5AGDnc1+b6X
zJ6l3BXiYM/8qXU/F04UA5BP05SgIqXjqT5I13blrydjKtUbZFchK7lJU7cyDbar+TH70DZURSQm zJ6l3BXiYM/8qXU/F04UA5BP05SgIqXjqT5I13blrydjKtUbZFchK7lJU7cyDbar+TH70DZURSQm
MusCj0+fdx6hx8y4LSOM68rjwVeq7JXAPU78QQsYgMrbtkf5mZWUquDdb7tEoxU+PcNifvtvuHF2 MusCj0+fdx6hx8y4LSOM68rjwVeq7JXAPU78QQsYgMrbtkf5mZWUquDdb7tEoxU+PcNifvtvuHF2

2
k9mail/src/test/resources/autocrypt/rsa2048-unknown-non-critical.eml
View file

@ -1,7 +1,7 @@
From: Alice <alice@testsuite.autocrypt.org> From: Alice <alice@testsuite.autocrypt.org>
To: Bob <bob@testsuite.autocrypt.org> To: Bob <bob@testsuite.autocrypt.org>
Subject: inbome: rsa 2048 with unknown non-critical attribute Subject: inbome: rsa 2048 with unknown non-critical attribute
Autocrypt: addr=alice@testsuite.autocrypt.org; _monkey=ignore; key= Autocrypt: addr=alice@testsuite.autocrypt.org; _monkey=ignore; keydata=
mQENBFhVF+ABCADu17FBUgA3mCemeKbNaBTyWe3VGxjbu7fUyHgdLK7i3tnd7IRtxQy/AEN2t6Vq mQENBFhVF+ABCADu17FBUgA3mCemeKbNaBTyWe3VGxjbu7fUyHgdLK7i3tnd7IRtxQy/AEN2t6Vq
0/xeZEAKYRInsHI/HjvmhqPeWFzipk71jRQ02WUY1pZytFjYNIrTdMk4eLYdC1N0go83PU33V4R8 0/xeZEAKYRInsHI/HjvmhqPeWFzipk71jRQ02WUY1pZytFjYNIrTdMk4eLYdC1N0go83PU33V4R8
fc2fWHD8N5JPsDH2xOB6WNWkMPxgMbtGIa0QTx7TINhDif4/1/VcrX3wz1gZ6xYI+sujbC54iBZo fc2fWHD8N5JPsDH2xOB6WNWkMPxgMbtGIa0QTx7TINhDif4/1/VcrX3wz1gZ6xYI+sujbC54iBZo

2
k9mail/src/test/resources/autocrypt/unknown-type.eml
View file

@ -1,7 +1,7 @@
From: Alice <alice@testsuite.autocrypt.org> From: Alice <alice@testsuite.autocrypt.org>
To: Bob <bob@testsuite.autocrypt.org> To: Bob <bob@testsuite.autocrypt.org>
Subject: INBOME with invalid type attribute Subject: INBOME with invalid type attribute
Autocrypt: addr=alice@testsuite.autocrypt.org; type=x; key= Autocrypt: addr=alice@testsuite.autocrypt.org; type=x; keydata=
mQENBFhVGA8BCADK+qTRkAfax0LtJ6RiyxzuAFyIohBTwvtcOM2sd/tRmWq1eyNif5AGDnc1+b6X mQENBFhVGA8BCADK+qTRkAfax0LtJ6RiyxzuAFyIohBTwvtcOM2sd/tRmWq1eyNif5AGDnc1+b6X
zJ6l3BXiYM/8qXU/F04UA5BP05SgIqXjqT5I13blrydjKtUbZFchK7lJU7cyDbar+TH70DZURSQm zJ6l3BXiYM/8qXU/F04UA5BP05SgIqXjqT5I13blrydjKtUbZFchK7lJU7cyDbar+TH70DZURSQm
MusCj0+fdx6hx8y4LSOM68rjwVeq7JXAPU78QQsYgMrbtkf5mZWUquDdb7tEoxU+PcNifvtvuHF2 MusCj0+fdx6hx8y4LSOM68rjwVeq7JXAPU78QQsYgMrbtkf5mZWUquDdb7tEoxU+PcNifvtvuHF2