From 8f1a892f1f98e47f72573b93a9275b5072dd1c5d Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sun, 27 Aug 2017 23:02:40 +0200 Subject: [PATCH] change autocrypt param according to updated spec --- .../src/main/java/com/fsck/k9/crypto/AutocryptOperations.java | 2 +- k9mail/src/test/resources/autocrypt/rsa2048-broken-base64.eml | 2 +- k9mail/src/test/resources/autocrypt/rsa2048-explicit-type.eml | 2 +- k9mail/src/test/resources/autocrypt/rsa2048-simple-to-bot.eml | 2 +- k9mail/src/test/resources/autocrypt/rsa2048-simple.eml | 2 +- .../src/test/resources/autocrypt/rsa2048-unknown-critical.eml | 2 +- .../test/resources/autocrypt/rsa2048-unknown-non-critical.eml | 2 +- k9mail/src/test/resources/autocrypt/unknown-type.eml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/k9mail/src/main/java/com/fsck/k9/crypto/AutocryptOperations.java b/k9mail/src/main/java/com/fsck/k9/crypto/AutocryptOperations.java index 03bb9bd4c..ffdd1555a 100644 --- a/k9mail/src/main/java/com/fsck/k9/crypto/AutocryptOperations.java +++ b/k9mail/src/main/java/com/fsck/k9/crypto/AutocryptOperations.java @@ -22,7 +22,7 @@ public class AutocryptOperations { private static final String AUTOCRYPT_HEADER = "Autocrypt"; 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_TYPE_1 = "1"; diff --git a/k9mail/src/test/resources/autocrypt/rsa2048-broken-base64.eml b/k9mail/src/test/resources/autocrypt/rsa2048-broken-base64.eml index e61e7f348..b2a984d0a 100644 --- a/k9mail/src/test/resources/autocrypt/rsa2048-broken-base64.eml +++ b/k9mail/src/test/resources/autocrypt/rsa2048-broken-base64.eml @@ -1,7 +1,7 @@ From: Alice To: Bob Subject: an INBOME RSA test -Autocrypt: addr=alice@testsuite.autocrypt.org; key= +Autocrypt: addr=alice@testsuite.autocrypt.org; keydata= m!@#$%hVF+ABCADu17FBUgA3mCemeKbNaBTyWe3VGxjbu7fUyHgdLK7i3tnd7IRtxQy/AEN2t6Vq 0/xeZEAKYRInsHI/HjvmhqPeWFzipk71jRQ02WUY1pZytFjYNIrTdMk4eLYdC1N0go83PU33V4R8 fc2fWHD8N5JPsDH2xOB6WNWkMPxgMbtGIa0QTx7TINhDif4/1/VcrX3wz1gZ6xYI+sujbC54iBZo diff --git a/k9mail/src/test/resources/autocrypt/rsa2048-explicit-type.eml b/k9mail/src/test/resources/autocrypt/rsa2048-explicit-type.eml index 1a2c1141e..72a6b95e6 100644 --- a/k9mail/src/test/resources/autocrypt/rsa2048-explicit-type.eml +++ b/k9mail/src/test/resources/autocrypt/rsa2048-explicit-type.eml @@ -1,7 +1,7 @@ From: Alice To: Bob 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 0/xeZEAKYRInsHI/HjvmhqPeWFzipk71jRQ02WUY1pZytFjYNIrTdMk4eLYdC1N0go83PU33V4R8 fc2fWHD8N5JPsDH2xOB6WNWkMPxgMbtGIa0QTx7TINhDif4/1/VcrX3wz1gZ6xYI+sujbC54iBZo diff --git a/k9mail/src/test/resources/autocrypt/rsa2048-simple-to-bot.eml b/k9mail/src/test/resources/autocrypt/rsa2048-simple-to-bot.eml index 452ea7fc8..09241ab37 100644 --- a/k9mail/src/test/resources/autocrypt/rsa2048-simple-to-bot.eml +++ b/k9mail/src/test/resources/autocrypt/rsa2048-simple-to-bot.eml @@ -1,7 +1,7 @@ From: Alice To: Autocrypt-Bot Subject: an INBOME RSA test -INBOME: to=alice@testsuite.autocrypt.org; key= +INBOME: to=alice@testsuite.autocrypt.org; keydata= mQENBFhVF+ABCADu17FBUgA3mCemeKbNaBTyWe3VGxjbu7fUyHgdLK7i3tnd7IRtxQy/AEN2t6Vq 0/xeZEAKYRInsHI/HjvmhqPeWFzipk71jRQ02WUY1pZytFjYNIrTdMk4eLYdC1N0go83PU33V4R8 fc2fWHD8N5JPsDH2xOB6WNWkMPxgMbtGIa0QTx7TINhDif4/1/VcrX3wz1gZ6xYI+sujbC54iBZo diff --git a/k9mail/src/test/resources/autocrypt/rsa2048-simple.eml b/k9mail/src/test/resources/autocrypt/rsa2048-simple.eml index 512506209..56417bc11 100644 --- a/k9mail/src/test/resources/autocrypt/rsa2048-simple.eml +++ b/k9mail/src/test/resources/autocrypt/rsa2048-simple.eml @@ -1,7 +1,7 @@ From: Alice To: Bob Subject: an INBOME RSA test -Autocrypt: addr=alice@testsuite.autocrypt.org; key= +Autocrypt: addr=alice@testsuite.autocrypt.org; keydata= mQENBFhVF+ABCADu17FBUgA3mCemeKbNaBTyWe3VGxjbu7fUyHgdLK7i3tnd7IRtxQy/AEN2t6Vq 0/xeZEAKYRInsHI/HjvmhqPeWFzipk71jRQ02WUY1pZytFjYNIrTdMk4eLYdC1N0go83PU33V4R8 fc2fWHD8N5JPsDH2xOB6WNWkMPxgMbtGIa0QTx7TINhDif4/1/VcrX3wz1gZ6xYI+sujbC54iBZo diff --git a/k9mail/src/test/resources/autocrypt/rsa2048-unknown-critical.eml b/k9mail/src/test/resources/autocrypt/rsa2048-unknown-critical.eml index 7f06f9e27..05edf2437 100644 --- a/k9mail/src/test/resources/autocrypt/rsa2048-unknown-critical.eml +++ b/k9mail/src/test/resources/autocrypt/rsa2048-unknown-critical.eml @@ -1,7 +1,7 @@ From: Alice To: Bob 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 zJ6l3BXiYM/8qXU/F04UA5BP05SgIqXjqT5I13blrydjKtUbZFchK7lJU7cyDbar+TH70DZURSQm MusCj0+fdx6hx8y4LSOM68rjwVeq7JXAPU78QQsYgMrbtkf5mZWUquDdb7tEoxU+PcNifvtvuHF2 diff --git a/k9mail/src/test/resources/autocrypt/rsa2048-unknown-non-critical.eml b/k9mail/src/test/resources/autocrypt/rsa2048-unknown-non-critical.eml index 3d91cc250..f5e046be7 100644 --- a/k9mail/src/test/resources/autocrypt/rsa2048-unknown-non-critical.eml +++ b/k9mail/src/test/resources/autocrypt/rsa2048-unknown-non-critical.eml @@ -1,7 +1,7 @@ From: Alice To: Bob 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 0/xeZEAKYRInsHI/HjvmhqPeWFzipk71jRQ02WUY1pZytFjYNIrTdMk4eLYdC1N0go83PU33V4R8 fc2fWHD8N5JPsDH2xOB6WNWkMPxgMbtGIa0QTx7TINhDif4/1/VcrX3wz1gZ6xYI+sujbC54iBZo diff --git a/k9mail/src/test/resources/autocrypt/unknown-type.eml b/k9mail/src/test/resources/autocrypt/unknown-type.eml index 7b423cfdc..bf79de092 100644 --- a/k9mail/src/test/resources/autocrypt/unknown-type.eml +++ b/k9mail/src/test/resources/autocrypt/unknown-type.eml @@ -1,7 +1,7 @@ From: Alice To: Bob 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 zJ6l3BXiYM/8qXU/F04UA5BP05SgIqXjqT5I13blrydjKtUbZFchK7lJU7cyDbar+TH70DZURSQm MusCj0+fdx6hx8y4LSOM68rjwVeq7JXAPU78QQsYgMrbtkf5mZWUquDdb7tEoxU+PcNifvtvuHF2