From 6876b35ad6a401aa2a435f11cf69bb9a0b472a11 Mon Sep 17 00:00:00 2001 From: Steve Holme <steve_holme@hotmail.com> Date: Sun, 30 Mar 2014 12:01:15 +0100 Subject: [PATCH] tests: Replaced email authentication keywords with SASL based keywords As the email protocols implement SASL authentication rather than IMAP, POP3 and SMTP specific authentication, updated the authentication keywords to reflect this. --- tests/data/test819 | 2 +- tests/data/test820 | 2 +- tests/data/test821 | 2 +- tests/data/test822 | 2 +- tests/data/test823 | 2 +- tests/data/test824 | 2 +- tests/data/test825 | 2 +- tests/data/test826 | 2 +- tests/data/test827 | 2 +- tests/data/test828 | 2 +- tests/data/test830 | 2 +- tests/data/test831 | 2 +- tests/data/test832 | 2 +- tests/data/test833 | 4 ++-- tests/data/test834 | 4 ++-- tests/data/test835 | 4 ++-- tests/data/test865 | 2 +- tests/data/test866 | 2 +- tests/data/test867 | 2 +- tests/data/test868 | 2 +- tests/data/test869 | 2 +- tests/data/test870 | 2 +- tests/data/test871 | 2 +- tests/data/test872 | 2 +- tests/data/test873 | 2 +- tests/data/test874 | 2 +- tests/data/test876 | 2 +- tests/data/test877 | 2 +- tests/data/test878 | 2 +- tests/data/test879 | 4 ++-- tests/data/test880 | 4 ++-- tests/data/test881 | 4 ++-- tests/data/test903 | 2 +- tests/data/test904 | 2 +- tests/data/test905 | 2 +- tests/data/test906 | 2 +- tests/data/test907 | 2 +- tests/data/test908 | 2 +- tests/data/test919 | 2 +- tests/data/test920 | 2 +- tests/data/test921 | 2 +- tests/data/test922 | 2 +- tests/data/test932 | 2 +- tests/data/test933 | 2 +- tests/data/test934 | 2 +- tests/data/test935 | 4 ++-- tests/data/test936 | 4 ++-- tests/data/test937 | 4 ++-- 48 files changed, 57 insertions(+), 57 deletions(-) diff --git a/tests/data/test819 b/tests/data/test819 index 5d54811037..d0aa47ba54 100644 --- a/tests/data/test819 +++ b/tests/data/test819 @@ -2,8 +2,8 @@ <info> <keywords> IMAP -IMAP AUTH PLAIN SASL +SASL AUTH PLAIN RFC4616 </keywords> </info> diff --git a/tests/data/test820 b/tests/data/test820 index 3f06029b79..f638f1cb63 100644 --- a/tests/data/test820 +++ b/tests/data/test820 @@ -2,8 +2,8 @@ <info> <keywords> IMAP -IMAP AUTH LOGIN SASL +SASL AUTH LOGIN </keywords> </info> diff --git a/tests/data/test821 b/tests/data/test821 index 55f10633b6..aee373b9a3 100644 --- a/tests/data/test821 +++ b/tests/data/test821 @@ -2,8 +2,8 @@ <info> <keywords> IMAP -IMAP AUTH CRAM-MD5 SASL +SASL AUTH CRAM-MD5 RFC2195 </keywords> </info> diff --git a/tests/data/test822 b/tests/data/test822 index 7e420783e1..aef4fd5e4e 100644 --- a/tests/data/test822 +++ b/tests/data/test822 @@ -2,8 +2,8 @@ <info> <keywords> IMAP -IMAP AUTH NTLM SASL +SASL AUTH NTLM </keywords> </info> diff --git a/tests/data/test823 b/tests/data/test823 index d1deca22c6..5e4d59356e 100644 --- a/tests/data/test823 +++ b/tests/data/test823 @@ -2,8 +2,8 @@ <info> <keywords> IMAP -IMAP AUTH DIGEST-MD5 SASL +SASL AUTH DIGEST-MD5 RFC2831 </keywords> </info> diff --git a/tests/data/test824 b/tests/data/test824 index 3b64d1f669..242c1b4a37 100644 --- a/tests/data/test824 +++ b/tests/data/test824 @@ -2,8 +2,8 @@ <info> <keywords> IMAP -IMAP AUTH OAUTH2 SASL +SASL AUTH OAUTH2 RFC6749 </keywords> </info> diff --git a/tests/data/test825 b/tests/data/test825 index 5a31058c7f..6532b3ace7 100644 --- a/tests/data/test825 +++ b/tests/data/test825 @@ -2,8 +2,8 @@ <info> <keywords> IMAP -IMAP AUTH PLAIN SASL +SASL AUTH PLAIN SASL-IR RFC4616 </keywords> diff --git a/tests/data/test826 b/tests/data/test826 index 174b2d4c0f..0f9282945f 100644 --- a/tests/data/test826 +++ b/tests/data/test826 @@ -2,8 +2,8 @@ <info> <keywords> IMAP -IMAP AUTH LOGIN SASL +SASL AUTH LOGIN SASL-IR </keywords> </info> diff --git a/tests/data/test827 b/tests/data/test827 index f1469779ac..ed19fc67fd 100644 --- a/tests/data/test827 +++ b/tests/data/test827 @@ -2,8 +2,8 @@ <info> <keywords> IMAP -IMAP AUTH NTLM SASL +SASL AUTH NTLM SASL-IR </keywords> </info> diff --git a/tests/data/test828 b/tests/data/test828 index c4f05776fd..b2fb693ffe 100644 --- a/tests/data/test828 +++ b/tests/data/test828 @@ -2,8 +2,8 @@ <info> <keywords> IMAP -IMAP AUTH OAUTH2 SASL +SASL AUTH OAUTH2 SASL-IR RFC6749 </keywords> diff --git a/tests/data/test830 b/tests/data/test830 index 3dd58e6bce..5803bb11ed 100644 --- a/tests/data/test830 +++ b/tests/data/test830 @@ -2,8 +2,8 @@ <info> <keywords> IMAP -IMAP AUTH CRAM-MD5 SASL +SASL AUTH CRAM-MD5 SASL CANCELLATION RFC2195 </keywords> diff --git a/tests/data/test831 b/tests/data/test831 index 77471d9be3..8bff7eac0f 100644 --- a/tests/data/test831 +++ b/tests/data/test831 @@ -2,8 +2,8 @@ <info> <keywords> IMAP -IMAP AUTH NTLM SASL +SASL AUTH NTLM SASL CANCELLATION </keywords> </info> diff --git a/tests/data/test832 b/tests/data/test832 index 42ae9035dc..4873e3569b 100644 --- a/tests/data/test832 +++ b/tests/data/test832 @@ -2,8 +2,8 @@ <info> <keywords> IMAP -IMAP AUTH DIGEST-MD5 SASL +SASL AUTH DIGEST-MD5 SASL CANCELLATION RFC2831 </keywords> diff --git a/tests/data/test833 b/tests/data/test833 index a18593b9ea..b5fa03f9e0 100644 --- a/tests/data/test833 +++ b/tests/data/test833 @@ -2,9 +2,9 @@ <info> <keywords> IMAP -IMAP AUTH CRAM-MD5 -IMAP AUTH PLAIN SASL +SASL AUTH CRAM-MD5 +SASL AUTH PLAIN SASL DOWNGRADE RFC2195 </keywords> diff --git a/tests/data/test834 b/tests/data/test834 index 5a447412b2..17101ddfcf 100644 --- a/tests/data/test834 +++ b/tests/data/test834 @@ -2,9 +2,9 @@ <info> <keywords> IMAP -IMAP AUTH NTLM -IMAP AUTH PLAIN SASL +SASL AUTH NTLM +SASL AUTH PLAIN SASL DOWNGRADE </keywords> </info> diff --git a/tests/data/test835 b/tests/data/test835 index e6d8107449..2379a3abb1 100644 --- a/tests/data/test835 +++ b/tests/data/test835 @@ -2,9 +2,9 @@ <info> <keywords> IMAP -IMAP AUTH DIGEST-MD5 -IMAP AUTH PLAIN SASL +SASL AUTH DIGEST-MD5 +SASL AUTH PLAIN SASL DOWNGRADE RFC2831 </keywords> diff --git a/tests/data/test865 b/tests/data/test865 index 1aa73a5c71..6f66f82d7d 100644 --- a/tests/data/test865 +++ b/tests/data/test865 @@ -2,8 +2,8 @@ <info> <keywords> POP3 -POP3 AUTH PLAIN SASL +SASL AUTH PLAIN RFC1734 RFC4616 RFC5034 diff --git a/tests/data/test866 b/tests/data/test866 index cebb238996..8fee23ab06 100644 --- a/tests/data/test866 +++ b/tests/data/test866 @@ -2,8 +2,8 @@ <info> <keywords> POP3 -POP3 AUTH LOGIN SASL +SASL AUTH LOGIN RFC1734 RFC5034 </keywords> diff --git a/tests/data/test867 b/tests/data/test867 index ab029917a1..139b467dec 100644 --- a/tests/data/test867 +++ b/tests/data/test867 @@ -2,8 +2,8 @@ <info> <keywords> POP3 -POP3 AUTH CRAM-MD5 SASL +SASL AUTH CRAM-MD5 RFC1734 RFC2195 RFC5034 diff --git a/tests/data/test868 b/tests/data/test868 index 515dfbecbe..861e5e6795 100644 --- a/tests/data/test868 +++ b/tests/data/test868 @@ -2,8 +2,8 @@ <info> <keywords> POP3 -POP3 AUTH NTLM SASL +SASL AUTH NTLM RFC1734 RFC5034 </keywords> diff --git a/tests/data/test869 b/tests/data/test869 index 42fb9eaa13..8350373c06 100644 --- a/tests/data/test869 +++ b/tests/data/test869 @@ -2,8 +2,8 @@ <info> <keywords> POP3 -POP3 AUTH DIGEST-MD5 SASL +SASL AUTH DIGEST-MD5 RFC1734 RFC2831 RFC5034 diff --git a/tests/data/test870 b/tests/data/test870 index 73e3cd6746..885b8c1592 100644 --- a/tests/data/test870 +++ b/tests/data/test870 @@ -2,8 +2,8 @@ <info> <keywords> POP3 -POP3 AUTH OAUTH2 SASL +SASL AUTH OAUTH2 RFC1734 RFC5034 RFC6749 diff --git a/tests/data/test871 b/tests/data/test871 index 6b3d1daf8f..f4f2360416 100644 --- a/tests/data/test871 +++ b/tests/data/test871 @@ -2,8 +2,8 @@ <info> <keywords> POP3 -POP3 AUTH PLAIN SASL +SASL AUTH PLAIN SASL-IR RFC1734 RFC4616 diff --git a/tests/data/test872 b/tests/data/test872 index 08ee460574..05cb2a2061 100644 --- a/tests/data/test872 +++ b/tests/data/test872 @@ -2,8 +2,8 @@ <info> <keywords> POP3 -POP3 AUTH LOGIN SASL +SASL AUTH LOGIN SASL-IR RFC1734 RFC5034 diff --git a/tests/data/test873 b/tests/data/test873 index 0302c982cd..43f9eb87c2 100644 --- a/tests/data/test873 +++ b/tests/data/test873 @@ -2,8 +2,8 @@ <info> <keywords> POP3 -POP3 AUTH NTLM SASL +SASL AUTH NTLM SASL-IR RFC1734 RFC5034 diff --git a/tests/data/test874 b/tests/data/test874 index 4371a2fe49..de221fa91b 100644 --- a/tests/data/test874 +++ b/tests/data/test874 @@ -2,8 +2,8 @@ <info> <keywords> POP3 -POP3 AUTH OAUTH2 SASL +SASL AUTH OAUTH2 SASL-IR RFC1734 RFC5034 diff --git a/tests/data/test876 b/tests/data/test876 index 213fa775ac..6d30e538b7 100644 --- a/tests/data/test876 +++ b/tests/data/test876 @@ -2,8 +2,8 @@ <info> <keywords> POP3 -POP3 AUTH CRAM-MD5 SASL +SASL AUTH CRAM-MD5 SASL CANCELLATION RFC1734 RFC2195 diff --git a/tests/data/test877 b/tests/data/test877 index de40d32bd2..c4775942ff 100644 --- a/tests/data/test877 +++ b/tests/data/test877 @@ -2,8 +2,8 @@ <info> <keywords> POP3 -POP3 AUTH NTLM SASL +SASL AUTH NTLM SASL CANCELLATION RFC1734 RFC5034 diff --git a/tests/data/test878 b/tests/data/test878 index a5bc8c0903..9027b0b47f 100644 --- a/tests/data/test878 +++ b/tests/data/test878 @@ -2,8 +2,8 @@ <info> <keywords> POP3 -POP3 AUTH DIGEST-MD5 SASL +SASL AUTH DIGEST-MD5 SASL CANCELLATION RFC1734 RFC2831 diff --git a/tests/data/test879 b/tests/data/test879 index 70f7b157c5..681d779b2a 100644 --- a/tests/data/test879 +++ b/tests/data/test879 @@ -2,9 +2,9 @@ <info> <keywords> POP3 -POP3 AUTH CRAM-MD5 -POP3 AUTH PLAIN SASL +SASL AUTH CRAM-MD5 +SASL AUTH PLAIN SASL DOWNGRADE RFC1734 RFC2195 diff --git a/tests/data/test880 b/tests/data/test880 index 3a920fdcdc..f5eb697314 100644 --- a/tests/data/test880 +++ b/tests/data/test880 @@ -2,9 +2,9 @@ <info> <keywords> POP3 -POP3 AUTH NTLM -POP3 AUTH PLAIN SASL +SASL AUTH NTLM +SASL AUTH PLAIN SASL DOWNGRADE RFC1734 RFC5034 diff --git a/tests/data/test881 b/tests/data/test881 index 3ce5564c26..02ac8fbd87 100644 --- a/tests/data/test881 +++ b/tests/data/test881 @@ -2,9 +2,9 @@ <info> <keywords> POP3 -POP3 AUTH DIGEST-MD5 -POP3 AUTH PLAIN SASL +SASL AUTH DIGEST-MD5 +SASL AUTH PLAIN SASL DOWNGRADE RFC1734 RFC2831 diff --git a/tests/data/test903 b/tests/data/test903 index a06052d7d1..2baf5e6962 100644 --- a/tests/data/test903 +++ b/tests/data/test903 @@ -2,8 +2,8 @@ <info> <keywords> SMTP -SMTP AUTH PLAIN SASL +SASL AUTH PLAIN RFC4616 RFC4954 </keywords> diff --git a/tests/data/test904 b/tests/data/test904 index 0006897818..dd3dad09b0 100644 --- a/tests/data/test904 +++ b/tests/data/test904 @@ -2,8 +2,8 @@ <info> <keywords> SMTP -SMTP AUTH LOGIN SASL +SASL AUTH LOGIN RFC4954 </keywords> </info> diff --git a/tests/data/test905 b/tests/data/test905 index 9e239267a0..565b041369 100644 --- a/tests/data/test905 +++ b/tests/data/test905 @@ -2,8 +2,8 @@ <info> <keywords> SMTP -SMTP AUTH CRAM-MD5 SASL +SASL AUTH CRAM-MD5 RFC2195 RFC4954 </keywords> diff --git a/tests/data/test906 b/tests/data/test906 index 81dd3770e9..01f0dd2072 100644 --- a/tests/data/test906 +++ b/tests/data/test906 @@ -2,8 +2,8 @@ <info> <keywords> SMTP -SMTP AUTH NTLM SASL +SASL AUTH NTLM RFC4954 </keywords> </info> diff --git a/tests/data/test907 b/tests/data/test907 index 9f785326c3..16a4338c5a 100644 --- a/tests/data/test907 +++ b/tests/data/test907 @@ -2,8 +2,8 @@ <info> <keywords> SMTP -SMTP AUTH DIGEST-MD5 SASL +SASL AUTH DIGEST-MD5 RFC2831 RFC4954 </keywords> diff --git a/tests/data/test908 b/tests/data/test908 index e1f390161d..c471cb7b02 100644 --- a/tests/data/test908 +++ b/tests/data/test908 @@ -2,8 +2,8 @@ <info> <keywords> SMTP -SMTP AUTH OAUTH2 SASL +SASL AUTH OAUTH2 RFC4954 RFC6749 </keywords> diff --git a/tests/data/test919 b/tests/data/test919 index ecb7a30980..3e74494cbd 100644 --- a/tests/data/test919 +++ b/tests/data/test919 @@ -2,8 +2,8 @@ <info> <keywords> SMTP -SMTP AUTH PLAIN SASL +SASL AUTH PLAIN SASL-IR RFC4616 RFC4954 diff --git a/tests/data/test920 b/tests/data/test920 index bccf3cbf17..82f6c5601a 100644 --- a/tests/data/test920 +++ b/tests/data/test920 @@ -2,8 +2,8 @@ <info> <keywords> SMTP -SMTP AUTH LOGIN SASL +SASL AUTH LOGIN SASL-IR RFC4954 </keywords> diff --git a/tests/data/test921 b/tests/data/test921 index 8c3197bcc8..78ea8b6b58 100644 --- a/tests/data/test921 +++ b/tests/data/test921 @@ -2,8 +2,8 @@ <info> <keywords> SMTP -SMTP AUTH NTLM SASL +SASL AUTH NTLM SASL-IR RFC4954 </keywords> diff --git a/tests/data/test922 b/tests/data/test922 index 3d528442e0..e9e0d5f8e9 100644 --- a/tests/data/test922 +++ b/tests/data/test922 @@ -2,8 +2,8 @@ <info> <keywords> SMTP -SMTP AUTH OAUTH2 SASL +SASL AUTH OAUTH2 SASL-IR RFC4954 RFC6749 diff --git a/tests/data/test932 b/tests/data/test932 index 902193e742..13ab790d6f 100644 --- a/tests/data/test932 +++ b/tests/data/test932 @@ -2,8 +2,8 @@ <info> <keywords> SMTP -SMTP AUTH CRAM-MD5 SASL +SASL AUTH CRAM-MD5 SASL CANCELLATION RFC2195 RFC4954 diff --git a/tests/data/test933 b/tests/data/test933 index 4879f1e44c..08b4e9dd00 100644 --- a/tests/data/test933 +++ b/tests/data/test933 @@ -2,8 +2,8 @@ <info> <keywords> SMTP -SMTP AUTH NTLM SASL +SASL AUTH NTLM SASL CANCELLATION RFC4954 </keywords> diff --git a/tests/data/test934 b/tests/data/test934 index 1320ad2c1e..0be180376b 100644 --- a/tests/data/test934 +++ b/tests/data/test934 @@ -2,8 +2,8 @@ <info> <keywords> SMTP -SMTP AUTH DIGEST-MD5 SASL +SASL AUTH DIGEST-MD5 SASL CANCELLATION RFC2831 RFC4954 diff --git a/tests/data/test935 b/tests/data/test935 index 14404d50fe..3fd5c2e503 100644 --- a/tests/data/test935 +++ b/tests/data/test935 @@ -2,9 +2,9 @@ <info> <keywords> SMTP -SMTP AUTH CRAM-MD5 -SMTP AUTH PLAIN SASL +SASL AUTH CRAM-MD5 +SASL AUTH PLAIN SASL DOWNGRADE RFC2195 RFC4954 diff --git a/tests/data/test936 b/tests/data/test936 index 35cc2d8c60..88c8a937e9 100644 --- a/tests/data/test936 +++ b/tests/data/test936 @@ -2,9 +2,9 @@ <info> <keywords> SMTP -SMTP AUTH NTLM -SMTP AUTH PLAIN SASL +SASL AUTH NTLM +SASL AUTH PLAIN SASL DOWNGRADE RFC4954 </keywords> diff --git a/tests/data/test937 b/tests/data/test937 index f1e0ba7f3c..10f786c977 100644 --- a/tests/data/test937 +++ b/tests/data/test937 @@ -2,9 +2,9 @@ <info> <keywords> SMTP -SMTP AUTH DIGEST-MD5 -SMTP AUTH PLAIN SASL +SASL AUTH DIGEST-MD5 +SASL AUTH PLAIN SASL DOWNGRADE RFC2831 RFC4954 -- GitLab